Revert

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

diff --git a/yaz-config.in b/yaz-config.in
index d7b361c..1b2560f 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,15 +1,16 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.3 2000-10-11 12:24:58 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
 yaz_echo_help=no
-yaz_echo_tabs=no
 yaz_echo_source=yes
 yaz_echo_lalibs=no
+yaz_echo_comp=no
 yaz_src_root=@YAZ_SRC_ROOT@
+yaz_build_root=@YAZ_BUILD_ROOT@
 
-yazlibs="@LIBS@"
+yazextralibs="@LIBS@"
 YAZVERSION=@VERSION@
 
 usage()
@@ -22,7 +23,9 @@ Options:
        [--libs]
        [--lalibs]
        [--cflags]
-       [--tabs]
+       [--comp]
+Libraries:
+       threads
 EOF
        exit $1
 }
@@ -55,12 +58,18 @@ while test $# -gt 0; do
     --libs)
       yaz_echo_libs=yes
       ;;
-    --tabs)
-      yaz_echo_tabs=yes
-      ;;
     --lalibs)
       yaz_echo_lalibs=yes
       ;;
+    --comp)
+      yaz_echo_comp=yes
+      ;;
+    threads)
+      lib_thread=yes
+      ;;
+    malloc)
+      lib_malloc=yes
+      ;;
     -*)
       yaz_echo_help=yes
       ;;
@@ -68,20 +77,22 @@ while test $# -gt 0; do
   shift
 done
 
+lyaz="-lyaz"
+
 if test "$yaz_echo_source" = "yes"; then
-    YAZTAB=${yaz_src_root}/tab
-    YAZBIN=${yaz_src_root}/bin
-    YAZLIB="-L${yaz_src_root}/lib/.libs -lyaz $yazlibs"
-    YAZLALIB="${yaz_src_root}/lib/libyaz.la $yazlibs"
+    YAZBIN=${yaz_build_root}/bin
+    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-asncomp
 else
-    YAZTAB=$yazprefix/share/yaz/tab
-    YAZBIN=$yazprefix/bin
+    YAZBIN=${yazprefix}/bin
+    YAZCOMP=${yazprefix}/bin/yaz-asncomp
 
     if test "$yazprefix" = "/usr"; then
-       YAZLIB="-lyaz $yazlibs"
+       YAZLIB="$lyaz $yazextralibs"
     else
-       YAZLIB="-L$yazprefix/lib -lyaz $yazlibs"
+       YAZLIB="-L$yazprefix/lib $lyaz $yazextralibs"
     fi
     YAZLALIB=$YAZLIB
     if test "$yazprefix" = "/usr"; then
@@ -91,6 +102,12 @@ else
     fi
 fi
 
+YAZINC="$YAZINC @YAZ_CONF_CFLAGS@"
+
+if test "$lib_thread" = "yes"; then
+    YAZINC="$YAZINC @THREAD_CFLAGS@"
+fi
+
 if test "$yaz_echo_help" = "yes"; then
        usage 1 1>&2
 fi
@@ -100,9 +117,9 @@ 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
+if test "$yaz_echo_comp" = "yes"; then
+       echo $YAZCOMP
+fi