X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=cae1175693f505e7b91baa8c207876a9ac1926be;hp=59bdb1d1a9f6fe4d3e2548b9d48520b0441823f6;hb=cf0d647d4a642af04013d09f412e8629897187c5;hpb=8d133ab04af9cc1fe4d2463fb2a0139644ecd6e2

diff --git a/yaz-config.in b/yaz-config.in
index 59bdb1d..cae1175 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,17 +1,27 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.26 2007-02-25 14:46:50 adam Exp $
-yazprefix=@prefix@
-yaz_echo_cflags=no
-yaz_echo_libs=no
-yaz_echo_help=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@
+# This file is part of the YAZ toolkit.
+# Copyright (C) 1995-2013 Index Data
 
-yazextralibs="@LIBS@"
-YAZVERSION=@VERSION@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+echo_cflags=no
+echo_libs=no
+echo_help=no
+echo_include=no
+echo_source=yes
+echo_lalibs=no
+echo_comp=no
+src_root=@abs_top_srcdir@
+build_root=@abs_top_builddir@
+ICU_LIBS="@ICU_LIBS@"
+ICU_CPPFLAGS="@ICU_CPPFLAGS@"
+SSL_LIBS="@SSL_LIBS@"
+LIBS="@LIBS@"
+VERSION=@VERSION@
+YAZVERSION=$VERSION
+VERSION_SHA1=@VERSION_SHA1@
 
 usage()
 {
@@ -23,9 +33,11 @@ Options:
 	[--libs]
 	[--lalibs]
 	[--cflags]
+	[--include]
 	[--comp]
+        [-V]
 Libraries:
-	threads
+	threads icu server static
 EOF
 	exit $1
 }
@@ -38,79 +50,144 @@ while test $# -gt 0; do
     
     case $1 in
 	--prefix=*)
-	    yazprefix=$optarg
+	    prefix=$optarg
 	    ;;
 	--prefix)
-	    echo $yazprefix
+	    echo $prefix
 	    exit 0
 	    ;;
+        -V)
+	    echo "$VERSION $VERSION_SHA1"
+	    exit 0
+            ;;
 	--version)
-	    echo $YAZVERSION
+	    echo $VERSION
 	    exit 0
 	    ;;
 	--cflags)
-	    yaz_echo_cflags=yes
+	    echo_cflags=yes
+	    ;;
+	--include)
+	    echo_include=yes
 	    ;;
 	--libs)
-	    yaz_echo_libs=yes
+	    echo_libs=yes
 	    ;;
 	--lalibs)
-	    yaz_echo_lalibs=yes
+	    echo_lalibs=yes
 	    ;;
 	--comp)
-	    yaz_echo_comp=yes
+	    echo_comp=yes
 	    ;;
 	threads)
 	    lib_thread=yes
 	    ;;
-	malloc)
-	    lib_malloc=yes
+	icu)
+	    if test "$ICU_CPPFLAGS"; then
+		lib_icu=yes
+	    fi
+	    ;;
+	ssl)
+	    lib_ssl=yes
+	    ;;
+	server)
+	    lib_thread=yes
+	    lib_server=yes
+	    ;;
+	static)
+	    lib_static=yes
 	    ;;
 	-*)
-	    yaz_echo_help=yes
+	    echo_help=yes
 	    ;;
     esac
     shift
 done
 
-lyaz="-lyaz"
+YAZLIB="-lyaz"
+if test "$lib_server" = "yes"; then
+    YAZLIB="-lyaz_server $YAZLIB"
+fi
+
+if test "$lib_icu" = "yes"; then
+    YAZLIB="-lyaz_icu $YAZLIB"
+fi
 
 YAZINC="@YAZ_CONFIG_CFLAGS@"
 
-if test "$yaz_echo_source" = "yes"; then
-    YAZBIN=${yaz_build_root}/bin
-    YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs"
-    YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs"
-    YAZINC="$YAZINC -I${yaz_src_root}/include"
-    YAZCOMP=${yaz_src_root}/util/yaz-asncomp
-else
-    YAZBIN=${yazprefix}/bin
-    YAZCOMP=${yazprefix}/bin/yaz-asncomp
+if test "$echo_source" = "yes"; then
+    YAZBIN=${build_root}/bin
 
-    if test "$yazprefix" = "/usr"; then
-	YAZLIB="$lyaz $yazextralibs"
+    if test "$lib_static" = "yes"; then
+        YAZLIB="${build_root}/src/.libs/libyaz.a"
+        if test "$lib_server" = "yes"; then
+    	    YAZLIB="${build_root}/src/.libs/libyaz_server.a $YAZLIB"
+        fi
+        if test "$lib_icu" = "yes"; then
+    	    YAZLIB="${build_root}/src/.libs/libyaz_icu.a $YAZLIB"
+        fi
     else
-	YAZLIB="-L$yazprefix/lib $lyaz $yazextralibs"
+        YAZLIB="-L${build_root}/src/.libs $YAZLIB"
+    fi
+    LIBS="${SSL_LIBS} $LIBS"
+    YAZLIB="$YAZLIB $LIBS"
+
+    YAZLALIB="${build_root}/src/libyaz.la"
+    if test "$lib_server" = "yes"; then
+	YAZLALIB="${build_root}/src/libyaz_server.la $YAZLALIB"
     fi
+    if test "$lib_icu" = "yes"; then
+	YAZLALIB="${build_root}/src/libyaz_icu.la $YAZLALIB"
+    fi
+    YAZLALIB="$YAZLALIB $LIBS"
+
+    YAZBINC="-I${src_root}/include"
+    YAZINC="$YAZBINC $YAZINC"
+    YAZCOMP=${src_root}/util/yaz-asncomp
+else
+    YAZBIN=${prefix}/bin
+    YAZCOMP=${prefix}/bin/yaz-asncomp
+
+    if test "$prefix" != "/usr"; then
+	YAZLIB="-L$libdir $YAZLIB"
+    fi
+    if test "$lib_ssl" = "yes"; then
+        LIBS="${SSL_LIBS} $LIBS"
+    fi
+    YAZLIB="$YAZLIB $LIBS"
     YAZLALIB=$YAZLIB
-    if test "$yazprefix" != "/usr"; then
-	YAZINC="$YAZINC -I$yazprefix/include"
+    if test "$prefix" != "/usr"; then
+	YAZBINC="-I${includedir}"
+	YAZINC="$YAZBINC $YAZINC"
     fi
 fi
 
-if test "$yaz_echo_help" = "yes"; then
+if test "$lib_thread" = "yes"; then
+    :
+fi
+
+if test "$lib_icu" = "yes"; then
+    YAZINC="$YAZINC $ICU_CPPFLAGS"
+    YAZLIB="$YAZLIB $ICU_LIBS"
+    YAZLALIB="$YAZLALIB $ICU_LIBS"
+fi
+
+if test "$echo_help" = "yes"; then
     usage 1 1>&2
 fi
-if test "$yaz_echo_cflags" = "yes"; then
+if test "$echo_include" = "yes"; then
+    echo $YAZBINC
+fi
+if test "$echo_cflags" = "yes"; then
     echo $YAZINC
 fi
-if test "$yaz_echo_libs" = "yes"; then
+if test "$echo_libs" = "yes"; then
     echo $YAZLIB
 fi
-if test "$yaz_echo_lalibs" = "yes"; then
+if test "$echo_lalibs" = "yes"; then
     echo $YAZLALIB
 fi
-if test "$yaz_echo_comp" = "yes"; then
+if test "$echo_comp" = "yes"; then
     echo $YAZCOMP
 fi
 # Local Variables: