X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=e1b7cd64fcde9f5a978f9373b416099be289ebc4;hp=f0ec873bc435cd0325befc44e7bfad7de4a63ee1;hb=e667f42aeb4ad7ef6c863ac9a8d888371a0ba90e;hpb=fd4adcc80d442f84c6a1894e890b1b6ccd02615e

diff --git a/yaz-config.in b/yaz-config.in
index f0ec873..e1b7cd6 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,10 +1,9 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.11 2001-11-13 23:00:42 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
 yaz_echo_help=no
-yaz_echo_tabs=no
 yaz_echo_source=yes
 yaz_echo_lalibs=no
 yaz_echo_comp=no
@@ -24,11 +23,9 @@ Options:
 	[--libs]
 	[--lalibs]
 	[--cflags]
-	[--tabs]
 	[--comp]
 Libraries:
 	threads
-        malloc
 EOF
 	exit $1
 }
@@ -61,9 +58,6 @@ while test $# -gt 0; do
     --libs)
       yaz_echo_libs=yes
       ;;
-    --tabs)
-      yaz_echo_tabs=yes
-      ;;
     --lalibs)
       yaz_echo_lalibs=yes
       ;;
@@ -90,27 +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 "$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"
+    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
-    YAZTAB=${yazprefix}/share/yaz/tab
     YAZBIN=${yazprefix}/bin
-    YAZCOMP=${yazprefix}/bin/yaz-comp
+    YAZCOMP=${yazprefix}/bin/yaz-asncomp
 
     if test "$yazprefix" = "/usr"; then
 	YAZLIB="$lyaz $yazextralibs"
@@ -125,6 +110,8 @@ else
     fi
 fi
 
+YAZINC="$YAZINC @YAZ_CONF_CFLAGS@"
+
 if test "$lib_thread" = "yes"; then
     YAZINC="$YAZINC @CFLAGSTHREADS@"
 fi
@@ -138,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