SRW, CQL, 2003

[yaz-moved-to-github.git] / yaz-config.in

diff --git a/yaz-config.in b/yaz-config.in
index f0ec873..5faf6d0 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,17 +1,16 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.11 2001-11-13 23:00:42 adam Exp $
+# $Id: yaz-config.in,v 1.15 2003-01-06 08:20:26 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@
 
-yazextralibs="@LIBS@"
+yazextralibs="@GSOAP_LIB@ @XSLT_LIB@ @LIBS@"
 YAZVERSION=@VERSION@
 
 usage()
@@ -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
       ;;
@@ -94,11 +93,18 @@ 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"
     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
@@ -108,7 +114,6 @@ if test "$yaz_echo_source" = "yes"; then
     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 +130,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 +149,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