X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=f7117be506e7244a9b5f1d2c4c2f883f27e3362b;hp=53578bb5081cd1587dcd4e951b74bc63f3addef5;hb=651ccb74d12f2968e791b3f411a6c55bca68428a;hpb=9158f8e318f25cb16171433742950236cae96d36

diff --git a/yaz-config.in b/yaz-config.in
index 53578bb..f7117be 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.9 2001-10-05 13:55:17 adam Exp $
+# $Id: yaz-config.in,v 1.13 2002-05-13 14:13:37 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -28,6 +28,8 @@ Options:
 	[--comp]
 Libraries:
 	threads
+        malloc
+        ssl
 EOF
 	exit $1
 }
@@ -72,6 +74,12 @@ while test $# -gt 0; do
     threads)
       lib_thread=yes
       ;;
+    malloc)
+      lib_malloc=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
     -*)
       yaz_echo_help=yes
       ;;
@@ -79,20 +87,35 @@ while test $# -gt 0; do
   shift
 done
 
-if test "$lib_thread" = "yes" -a -n "@LIBTHREAD@"; 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
@@ -114,10 +137,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