X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=0f7c7e4c267061201921b4b4e98ec0802215d044;hp=99e2ed22c0e08da5960d9dff9a0e56e3750f694a;hb=d0e56fdb958b43316f5ebffddd7f9dd8480978f8;hpb=083dedcf7d9f7eac974a48dc49d5a23e284d9760

diff --git a/yaz-config.in b/yaz-config.in
index 99e2ed2..0f7c7e4 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.6 2001-03-20 15:58:24 adam Exp $
+# $Id: yaz-config.in,v 1.17 2003-02-18 10:37:08 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
 yaz_echo_help=no
-yaz_echo_tabs=no
 yaz_echo_source=yes
 yaz_echo_lalibs=no
+yaz_echo_comp=no
 yaz_src_root=@YAZ_SRC_ROOT@
 yaz_build_root=@YAZ_BUILD_ROOT@
 
@@ -23,9 +23,11 @@ Options:
 	[--libs]
 	[--lalibs]
 	[--cflags]
-	[--tabs]
+	[--comp]
 Libraries:
 	threads
+        malloc
+        ssl
 EOF
 	exit $1
 }
@@ -58,15 +60,21 @@ while test $# -gt 0; do
     --libs)
       yaz_echo_libs=yes
       ;;
-    --tabs)
-      yaz_echo_tabs=yes
-      ;;
     --lalibs)
       yaz_echo_lalibs=yes
       ;;
+    --comp)
+      yaz_echo_comp=yes
+      ;;
     threads)
       lib_thread=yes
       ;;
+    malloc)
+      lib_malloc=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
     -*)
       yaz_echo_help=yes
       ;;
@@ -74,25 +82,40 @@ while test $# -gt 0; do
   shift
 done
 
-if test "$lib_thread" = "yes"; then
+lyaz="-lyaz"
+
+if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
     yazextralibs="@LIBTHREAD@ $yazextralibs"
-    lyaz="-lyazthread -lyaz"
-else
-    lyaz="-lyaz"
+    lyaz="-lyazthread $lyaz"
 fi 
+
+if test "$lib_malloc" = "yes"; then
+    lyaz="-lyazmalloc $lyaz"
+fi
+
+if test "$lib_ssl" = "yes" -a -n "@SSL_LIBS@"; then
+    yazextralibs="@SSL_LIBS@ $yazextralibs"
+    lyaz="-lyazssl $lyaz"
+fi
+
 if test "$yaz_echo_source" = "yes"; then
-    YAZTAB=${yaz_src_root}/tab
     YAZBIN=${yaz_build_root}/bin
     YAZLIB="-L${yaz_build_root}/lib/.libs $lyaz $yazextralibs"
-    if test "$lib_thread" = "yes"; then
-        YAZLALIB="${yaz_build_root}/lib/libyazthread.la ${yaz_build_root}/lib/libyaz.la $yazextralibs"
-    else
-        YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs"
+    YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs"
+    if test "$lib_ssl" = "yes" -a -n "$SSL_LIBS@"; then
+        YAZLALIB="${yaz_build_root}/lib/libyazssl.la"
+    fi
+    if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
+        YAZLALIB="${yaz_build_root}/lib/libyazthread.la $YAZLALIB"
+    fi
+    if test "$lib_malloc" = "yes"; then
+        YAZLALIB="${yaz_build_root}/lib/libyazmalloc.la $YAZLALIB"
     fi
     YAZINC="-I${yaz_src_root}/include"
+    YAZCOMP=${yaz_src_root}/util/yaz-comp
 else
-    YAZTAB=$yazprefix/share/yaz/tab
-    YAZBIN=$yazprefix/bin
+    YAZBIN=${yazprefix}/bin
+    YAZCOMP=${yazprefix}/bin/yaz-comp
 
     if test "$yazprefix" = "/usr"; then
 	YAZLIB="$lyaz $yazextralibs"
@@ -107,8 +130,14 @@ else
     fi
 fi
 
+YAZINC="$YAZINC @YAZ_CONF_CFLAGS@"
+
 if test "$lib_thread" = "yes"; then
-    YAZINC="$YAZINC -D_REENTRANT"
+    YAZINC="$YAZINC @CFLAGSTHREADS@"
+fi
+
+if test "$lib_ssl" = "yes"; then
+    YAZINC="$YAZINC @SSL_CFLAGS@"
 fi
 
 if test "$yaz_echo_help" = "yes"; then
@@ -120,9 +149,9 @@ fi
 if test "$yaz_echo_libs" = "yes"; then
 	echo $YAZLIB
 fi
-if test "$yaz_echo_tabs" = "yes"; then
-	echo $YAZTAB
-fi
 if test "$yaz_echo_lalibs" = "yes"; then
 	echo $YAZLALIB
 fi
+if test "$yaz_echo_comp" = "yes"; then
+	echo $YAZCOMP
+fi