X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz-config.in;h=ee9471076d5d4f32b5c6ace7cf2c081784800ab1;hb=832a7cfb01c097bb6afeac6f767b9a61c5355203;hp=f0ec873bc435cd0325befc44e7bfad7de4a63ee1;hpb=fd4adcc80d442f84c6a1894e890b1b6ccd02615e;p=yaz-moved-to-github.git

diff --git a/yaz-config.in b/yaz-config.in
index f0ec873..ee94710 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,10 +1,9 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.11 2001-11-13 23:00:42 adam Exp $
+# $Id: yaz-config.in,v 1.19 2004-01-05 09:45:49 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
@@ -24,11 +23,11 @@ Options:
 	[--libs]
 	[--lalibs]
 	[--cflags]
-	[--tabs]
 	[--comp]
 Libraries:
 	threads
         malloc
+        ssl
 EOF
 	exit $1
 }
@@ -61,9 +60,6 @@ while test $# -gt 0; do
     --libs)
       yaz_echo_libs=yes
       ;;
-    --tabs)
-      yaz_echo_tabs=yes
-      ;;
     --lalibs)
       yaz_echo_lalibs=yes
       ;;
@@ -76,6 +72,9 @@ while test $# -gt 0; do
     malloc)
       lib_malloc=yes
       ;;
+    ssl)
+      lib_ssl=yes
+      ;;
     -*)
       yaz_echo_help=yes
       ;;
@@ -90,25 +89,24 @@ if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
     lyaz="-lyazthread $lyaz"
 fi 
 
-if test "$lib_malloc" = "yes"; then
-    lyaz="-lyazmalloc $lyaz"
+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"
-    YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs"
-    if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
-        YAZLALIB="${yaz_build_root}/lib/libyazthread.la $YAZLALIB"
+    YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs"
+    YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs"
+    if test "$lib_ssl" = "yes" -a -n "$SSL_LIBS@"; then
+        YAZLALIB="${yaz_build_root}/src/libyazssl.la"
     fi
-    if test "$lib_malloc" = "yes"; then
-        YAZLALIB="${yaz_build_root}/lib/libyazmalloc.la $YAZLALIB"
+    if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
+        YAZLALIB="${yaz_build_root}/src/libyazthread.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
     YAZCOMP=${yazprefix}/bin/yaz-comp
 
@@ -125,10 +123,16 @@ else
     fi
 fi
 
+YAZINC="$YAZINC @YAZ_CONF_CFLAGS@"
+
 if test "$lib_thread" = "yes"; then
     YAZINC="$YAZINC @CFLAGSTHREADS@"
 fi
 
+if test "$lib_ssl" = "yes"; then
+    YAZINC="$YAZINC @SSL_CFLAGS@"
+fi
+
 if test "$yaz_echo_help" = "yes"; then
 	usage 1 1>&2
 fi
@@ -138,9 +142,6 @@ 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