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

diff --git a/yaz-config.in b/yaz-config.in
index a3a5776..2e673df 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.18 2003-10-27 12:21:21 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
@@ -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,28 +84,13 @@ 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}/src/.libs $lyaz $yazextralibs"
     YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs"
-    if test "$lib_ssl" = "yes" -a -n "$SSL_LIBS@"; then
-        YAZLALIB="${yaz_build_root}/src/libyazssl.la"
-    fi
     if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
         YAZLALIB="${yaz_build_root}/src/libyazthread.la $YAZLALIB"
     fi
-    if test "$lib_malloc" = "yes"; then
-        YAZLALIB="${yaz_build_root}/src/libyazmalloc.la $YAZLALIB"
-    fi
     YAZINC="-I${yaz_src_root}/include"
     YAZCOMP=${yaz_src_root}/util/yaz-comp
 else
@@ -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