X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz-config.in;h=2e673df5eb05e29f14a00edd142ecb437678c7e6;hb=b55ea70d15d3ffaa247cc30db0e6b8dcc4d6ac7c;hp=2c5f686549541f5e3604ee728e5193d8bc93ca6c;hpb=22f4e21c81ec94ad74eb7a329482cbe4a836cec9;p=yaz-moved-to-github.git

diff --git a/yaz-config.in b/yaz-config.in
index 2c5f686..2e673df 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,10 +1,9 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.12 2002-03-18 12:22:00 adam Exp $
+# $Id: yaz-config.in,v 1.21 2004-05-01 23:32:20 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,12 +23,9 @@ Options:
 	[--libs]
 	[--lalibs]
 	[--cflags]
-	[--tabs]
 	[--comp]
 Libraries:
 	threads
-        malloc
-        ssl
 EOF
 	exit $1
 }
@@ -62,9 +58,6 @@ while test $# -gt 0; do
     --libs)
       yaz_echo_libs=yes
       ;;
-    --tabs)
-      yaz_echo_tabs=yes
-      ;;
     --lalibs)
       yaz_echo_lalibs=yes
       ;;
@@ -77,9 +70,6 @@ while test $# -gt 0; do
     malloc)
       lib_malloc=yes
       ;;
-    ssl)
-      lib_ssl=yes
-      ;;
     -*)
       yaz_echo_help=yes
       ;;
@@ -94,33 +84,16 @@ if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
     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"
-    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
+    YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs"
+    YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs"
     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"
+        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
 
@@ -137,14 +110,12 @@ 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
@@ -154,9 +125,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