X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=e1b7cd64fcde9f5a978f9373b416099be289ebc4;hp=0f7c7e4c267061201921b4b4e98ec0802215d044;hb=c43b2d080cc557adb59b37b3d8f427871481c7e8;hpb=34203146338c5f6c89774bde4caad110345405bd

diff --git a/yaz-config.in b/yaz-config.in
index 0f7c7e4..e1b7cd6 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.17 2003-02-18 10:37:08 adam Exp $
+# $Id: yaz-config.in,v 1.22 2004-10-27 08:18:55 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -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
       ;;
@@ -89,33 +84,18 @@ 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
     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
+    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"
@@ -136,10 +116,6 @@ 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