X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz-config.in;h=ee9471076d5d4f32b5c6ace7cf2c081784800ab1;hb=983b28466be0739a9408c79624aedb47894504a3;hp=5faf6d028503d5690068fbbd86bc1f1e72a9202e;hpb=4d531a1a9131d69c3b6c27fbac42837e22cff61c;p=yaz-moved-to-github.git

diff --git a/yaz-config.in b/yaz-config.in
index 5faf6d0..ee94710 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.15 2003-01-06 08:20:26 adam Exp $
+# $Id: yaz-config.in,v 1.19 2004-01-05 09:45:49 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="@GSOAP_LIB@ @XSLT_LIB@ @LIBS@"
+yazextralibs="@LIBS@"
 YAZVERSION=@VERSION@
 
 usage()
@@ -89,10 +89,6 @@ 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"
@@ -100,16 +96,13 @@ 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"
+    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}/lib/libyazssl.la"
+        YAZLALIB="${yaz_build_root}/src/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"
+        YAZLALIB="${yaz_build_root}/src/libyazthread.la $YAZLALIB"
     fi
     YAZINC="-I${yaz_src_root}/include"
     YAZCOMP=${yaz_src_root}/util/yaz-comp