Revert

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

diff --git a/yaz-config.in b/yaz-config.in
index 7824d02..1b2560f 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.16 2003-02-12 15:06:42 adam Exp $
+# $Id: yaz-config.in,v 1.23 2005-09-09 10:34:09 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -10,7 +10,7 @@ yaz_echo_comp=no
 yaz_src_root=@YAZ_SRC_ROOT@
 yaz_build_root=@YAZ_BUILD_ROOT@
 
-yazextralibs="@XSLT_LIB@ @LIBS@"
+yazextralibs="@LIBS@"
 YAZVERSION=@VERSION@
 
 usage()
@@ -26,8 +26,6 @@ Options:
        [--comp]
 Libraries:
        threads
-        malloc
-        ssl
 EOF
        exit $1
 }
@@ -72,9 +70,6 @@ while test $# -gt 0; do
     malloc)
       lib_malloc=yes
       ;;
-    ssl)
-      lib_ssl=yes
-      ;;
     -*)
       yaz_echo_help=yes
       ;;
@@ -84,38 +79,15 @@ done
 
 lyaz="-lyaz"
 
-if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
-    yazextralibs="@LIBTHREAD@ $yazextralibs"
-    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
     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
-    if test "$lib_malloc" = "yes"; then
-        YAZLALIB="${yaz_build_root}/lib/libyazmalloc.la $YAZLALIB"
-    fi
+    YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs"
+    YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs"
     YAZINC="-I${yaz_src_root}/include"
-    YAZCOMP=${yaz_src_root}/util/yaz-comp
+    YAZCOMP=${yaz_src_root}/util/yaz-asncomp
 else
     YAZBIN=${yazprefix}/bin
-    YAZCOMP=${yazprefix}/bin/yaz-comp
+    YAZCOMP=${yazprefix}/bin/yaz-asncomp
 
     if test "$yazprefix" = "/usr"; then
        YAZLIB="$lyaz $yazextralibs"
@@ -133,11 +105,7 @@ 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@"
+    YAZINC="$YAZINC @THREAD_CFLAGS@"
 fi
 
 if test "$yaz_echo_help" = "yes"; then