X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=cec991180506b3ed17f3c8a95b476ceeaccf079b;hp=2c5f686549541f5e3604ee728e5193d8bc93ca6c;hb=46692c65fdb078ebbefb8a45e159fe65f528d8d8;hpb=22f4e21c81ec94ad74eb7a329482cbe4a836cec9

diff --git a/yaz-config.in b/yaz-config.in
index 2c5f686..cec9911 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,22 +1,25 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.12 2002-03-18 12:22:00 adam Exp $
+# $Id: yaz-config.in,v 1.34 2008-01-16 12:18:51 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@
+PTHREAD_LIBS="@PTHREAD_LIBS@"
+PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
+ICU_LIBS="@ICU_LIBS@"
+ICU_CPPFLAGS="@ICU_CPPFLAGS@"
 
 yazextralibs="@LIBS@"
 YAZVERSION=@VERSION@
 
 usage()
 {
-	cat <<EOF
+    cat <<EOF
 Usage: yaz-config [OPTIONS] [LIBRARIES]
 Options:
 	[--prefix[=DIR]]
@@ -24,142 +27,143 @@ Options:
 	[--libs]
 	[--lalibs]
 	[--cflags]
-	[--tabs]
 	[--comp]
 Libraries:
 	threads
-        malloc
-        ssl
 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
-      ;;
-    --comp)
-      yaz_echo_comp=yes
-      ;;
-    threads)
-      lib_thread=yes
-      ;;
-    malloc)
-      lib_malloc=yes
-      ;;
-    ssl)
-      lib_ssl=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
+	    ;;
+	icu)
+	    if test "$ICU_CPPFLAGS"; then
+		lib_icu=yes
+	    fi
+	    ;;
+	server)
+	    lib_thread=yes
+	    lib_server=yes
+	    ;;
+	static)
+	    lib_static=yes
+	    ;;
+	-*)
+	    yaz_echo_help=yes
+	    ;;
+    esac
+    shift
 done
 
 lyaz="-lyaz"
-
-if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
-    yazextralibs="@LIBTHREAD@ $yazextralibs"
-    lyaz="-lyazthread $lyaz"
-fi 
-
-if test "$lib_malloc" = "yes"; then
-    lyaz="-lyazmalloc $lyaz"
+if test "$lib_server" = "yes"; then
+    lyaz="-lyaz_server $lyaz"
 fi
 
-if test "$lib_ssl" = "yes" -a -n "@SSL_LIBS@"; then
-    yazextralibs="@SSL_LIBS@ $yazextralibs"
-    lyaz="-lyazssl $lyaz"
+if test "$lib_icu" = "yes"; then
+    lyaz="-lyaz_icu $lyaz"
 fi
 
+YAZINC="@YAZ_CONFIG_CFLAGS@"
+
 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"
-    if test "$lib_ssl" = "yes" -a -n "$SSL_LIBS@"; then
-        YAZLALIB="${yaz_build_root}/lib/libyazssl.la"
+
+    if test "$lib_static" = "yes"; then
+        YAZLIB="${yaz_build_root}/src/.libs/libyaz.a"
+        if test "$lib_server" = "yes"; then
+    	    YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB"
+        fi
+    else
+        YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
     fi
-    if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
-        YAZLALIB="${yaz_build_root}/lib/libyazthread.la $YAZLALIB"
+    YAZLIB="$YAZLIB $yazextralibs"
+
+    YAZLALIB="${yaz_build_root}/src/libyaz.la"
+    if test "$lib_server" = "yes"; then
+	YAZLALIB="${yaz_build_root}/src/libyaz_server.la $YAZLALIB"
     fi
-    if test "$lib_malloc" = "yes"; then
-        YAZLALIB="${yaz_build_root}/lib/libyazmalloc.la $YAZLALIB"
+    if test "$lib_icu" = "yes"; then
+	YAZLALIB="${yaz_build_root}/src/libyaz_icu.la $YAZLALIB"
     fi
-    YAZINC="-I${yaz_src_root}/include"
-    YAZCOMP=${yaz_src_root}/util/yaz-comp
+    YAZLALIB="$YAZLALIB $yazextralibs"
+
+    YAZINC="-I${yaz_src_root}/include $YAZINC"
+    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"
-    else
-	YAZLIB="-L$yazprefix/lib $lyaz $yazextralibs"
+    if test "$yazprefix" != "/usr"; then
+	YAZLIB="-L$yazprefix/lib"
     fi
+    YAZLIB="$YAZLIB $lyaz $yazextralibs"
     YAZLALIB=$YAZLIB
-    if test "$yazprefix" = "/usr"; then
-	YAZINC=
-    else
-	YAZINC=-I$yazprefix/include
+    if test "$yazprefix" != "/usr"; then
+	YAZINC="-I$yazprefix/include $YAZINC"
     fi
 fi
 
 if test "$lib_thread" = "yes"; then
-    YAZINC="$YAZINC @CFLAGSTHREADS@"
+    YAZINC="$PTHREAD_CFLAGS $YAZINC"
+    YAZLIB="$YAZLIB $PTHREAD_LIBS"
+    YAZLALIB="$YAZLALIB $PTHREAD_LIBS"
 fi
 
-if test "$lib_ssl" = "yes"; then
-    YAZINC="$YAZINC @SSL_CFLAGS@"
+if test "$lib_icu" = "yes"; then
+    YAZINC="$YAZINC $ICU_CPPFLAGS"
+    YAZLIB="$YAZLIB $ICU_LIBS"
+    YAZLALIB="$YAZLALIB $ICU_LIBS"
 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
+    echo $YAZCOMP
 fi
+# Local Variables:
+# mode:shell-script
+# sh-indentation: 2
+# sh-basic-offset: 4
+# End: