X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=d2325ab37fe8600b810032c7b3609b40783043cb;hp=d4282a8eecba6d9bdd21203db20535632eb53c28;hb=a89ed3c40c9eab3721ccbd5e91919ba06208edbc;hpb=8e4eabe621f8b8195faa6625a38a2e1ae7b68aa1

diff --git a/yaz-config.in b/yaz-config.in
index d4282a8..d2325ab 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,20 +1,21 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.4 2000-11-23 10:58:32 adam Exp $
+# $Id: yaz-config.in,v 1.24 2006-06-13 15:36: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@
 
 yazextralibs="@LIBS@"
 YAZVERSION=@VERSION@
 
 usage()
 {
-	cat <<EOF
+    cat <<EOF
 Usage: yaz-config [OPTIONS] [LIBRARIES]
 Options:
 	[--prefix[=DIR]]
@@ -22,76 +23,67 @@ Options:
 	[--libs]
 	[--lalibs]
 	[--cflags]
-	[--tabs]
+	[--comp]
 Libraries:
 	threads
 EOF
 	exit $1
 }
 
-#if test $# -eq 0; then
-#	yaz_echo_help=yes
-#fi
-
 while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      yazprefix=$optarg
-      ;;
-    --prefix)
-      echo $yazprefix
-      exit 0
-      ;;
-    --version)
-      echo $YAZVERSION
-      exit 0
-      ;;
-    --cflags)
-      yaz_echo_cflags=yes
-      ;;
-    --libs)
-      yaz_echo_libs=yes
-      ;;
-    --tabs)
-      yaz_echo_tabs=yes
-      ;;
-    --lalibs)
-      yaz_echo_lalibs=yes
-      ;;
-    threads)
-      lib_thread=yes
-      ;;
-    -*)
-      yaz_echo_help=yes
-      ;;
-  esac
-  shift
+    case "$1" in
+	-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+	*) optarg= ;;
+    esac
+    
+    case $1 in
+	--prefix=*)
+	    yazprefix=$optarg
+	    ;;
+	--prefix)
+	    echo $yazprefix
+	    exit 0
+	    ;;
+	--version)
+	    echo $YAZVERSION
+	    exit 0
+	    ;;
+	--cflags)
+	    yaz_echo_cflags=yes
+	    ;;
+	--libs)
+	    yaz_echo_libs=yes
+	    ;;
+	--lalibs)
+	    yaz_echo_lalibs=yes
+	    ;;
+	--comp)
+	    yaz_echo_comp=yes
+	    ;;
+	threads)
+	    lib_thread=yes
+	    ;;
+	malloc)
+	    lib_malloc=yes
+	    ;;
+	-*)
+	    yaz_echo_help=yes
+	    ;;
+    esac
+    shift
 done
 
-if test "$lib_thread" = "yes"; then
-    yazextralibs="@LIBTHREAD@ $yazextralibs"
-    lyaz="-lyazthread -lyaz"
-else
-    lyaz="-lyaz"
-fi 
+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 $yazextralibs"
-    if test "$lib_thread" = "yes"; then
-        YAZLALIB="${yaz_src_root}/lib/libyazthread.la ${yaz_src_root}/lib/libyaz.la $yazextralibs"
-    else
-        YAZLALIB="${yaz_src_root}/lib/libyazthread.la $yazextralibs"
-    fi
+    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 $yazextralibs"
@@ -106,22 +98,29 @@ else
     fi
 fi
 
+YAZINC="$YAZINC @YAZ_CONF_CFLAGS@"
+
 if test "$lib_thread" = "yes"; then
-    YAZINC="$YAZINC -D_REENTRANT"
+    YAZINC="$YAZINC @THREAD_CFLAGS@"
 fi
 
 if test "$yaz_echo_help" = "yes"; then
-	usage 1 1>&2
+    usage 1 1>&2
 fi
 if test "$yaz_echo_cflags" = "yes"; then
-	echo $YAZINC
+    echo $YAZINC
 fi
 if test "$yaz_echo_libs" = "yes"; then
-	echo $YAZLIB
-fi
-if test "$yaz_echo_tabs" = "yes"; then
-	echo $YAZTAB
+    echo $YAZLIB
 fi
 if test "$yaz_echo_lalibs" = "yes"; then
-	echo $YAZLALIB
+    echo $YAZLALIB
+fi
+if test "$yaz_echo_comp" = "yes"; then
+    echo $YAZCOMP
 fi
+# Local Variables:
+# mode:shell-script
+# sh-indentation: 2
+# sh-basic-offset: 4
+# End: