X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=e491516a3baad8f7afa038bc59d1a0c69ad8879d;hp=5cbc6bc1204305f619b73c1e98f9735a9043b610;hb=92d27e4d818fdd4613e42ea79184974c39d34c93;hpb=b80c29e05c84270159284f5b1297e38175cd63e0

diff --git a/yaz-config.in b/yaz-config.in
index 5cbc6bc..e491516 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,21 +1,25 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.32 2007-10-22 12:50:52 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@
-PTHREAD_LIBS="@PTHREAD_LIBS@"
-PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
+# This file is part of the YAZ toolkit.
+# Copyright (C) 1995-2008 Index Data
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+echo_cflags=no
+echo_libs=no
+echo_help=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@"
-
-yazextralibs="@LIBS@"
-YAZVERSION=@VERSION@
+SSL_LIBS="@SSL_LIBS@"
+LIBS="@LIBS@"
+VERSION=@VERSION@
+VERSION_SHA1=@VERSION_SHA1@
 
 usage()
 {
@@ -28,8 +32,9 @@ Options:
 	[--lalibs]
 	[--cflags]
 	[--comp]
+        [-V]
 Libraries:
-	threads
+	threads icu server static
 EOF
 	exit $1
 }
@@ -42,33 +47,42 @@ 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
 	    ;;
 	--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
 	    ;;
 	icu)
-	    lib_icu=yes
+	    if test "$ICU_CPPFLAGS"; then
+		lib_icu=yes
+	    fi
+	    ;;
+	ssl)
+	    lib_ssl=yes
 	    ;;
 	server)
 	    lib_thread=yes
@@ -78,65 +92,73 @@ while test $# -gt 0; do
 	    lib_static=yes
 	    ;;
 	-*)
-	    yaz_echo_help=yes
+	    echo_help=yes
 	    ;;
     esac
     shift
 done
 
-lyaz="-lyaz"
+YAZLIB="-lyaz"
 if test "$lib_server" = "yes"; then
-    lyaz="-lyaz_server $lyaz"
+    YAZLIB="-lyaz_server $YAZLIB"
 fi
 
 if test "$lib_icu" = "yes"; then
-    lyaz="-lyaz_icu $lyaz"
+    YAZLIB="-lyaz_icu $YAZLIB"
+fi
+
+if test "$lib_ssl" = "yes"; then
+    LIBS="${SSL_LIBS} $LIBS"
 fi
 
 YAZINC="@YAZ_CONFIG_CFLAGS@"
 
-if test "$yaz_echo_source" = "yes"; then
-    YAZBIN=${yaz_build_root}/bin
+if test "$echo_source" = "yes"; then
+    YAZBIN=${build_root}/bin
 
     if test "$lib_static" = "yes"; then
-        YAZLIB="${yaz_build_root}/src/.libs/libyaz.a"
+        if test "$lib_ssl" != "yes"; then
+            LIBS="${SSL_LIBS} $LIBS"
+        fi
+        YAZLIB="${build_root}/src/.libs/libyaz.a"
         if test "$lib_server" = "yes"; then
-    	    YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB"
+    	    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${yaz_build_root}/src/.libs $lyaz"
+        YAZLIB="-L${build_root}/src/.libs $YAZLIB"
     fi
-    YAZLIB="$YAZLIB $yazextralibs"
+    YAZLIB="$YAZLIB $LIBS"
 
-    YAZLALIB="${yaz_build_root}/src/libyaz.la"
+    YAZLALIB="${build_root}/src/libyaz.la"
     if test "$lib_server" = "yes"; then
-	YAZLALIB="${yaz_build_root}/src/libyaz_server.la $YAZLALIB"
+	YAZLALIB="${build_root}/src/libyaz_server.la $YAZLALIB"
     fi
     if test "$lib_icu" = "yes"; then
-	YAZLALIB="${yaz_build_root}/src/libyaz_icu.la $YAZLALIB"
+	YAZLALIB="${build_root}/src/libyaz_icu.la $YAZLALIB"
     fi
-    YAZLALIB="$YAZLALIB $yazextralibs"
+    YAZLALIB="$YAZLALIB $LIBS"
 
-    YAZINC="-I${yaz_src_root}/include $YAZINC"
-    YAZCOMP=${yaz_src_root}/util/yaz-asncomp
+    YAZINC="-I${src_root}/include $YAZINC"
+    YAZCOMP=${src_root}/util/yaz-asncomp
 else
-    YAZBIN=${yazprefix}/bin
-    YAZCOMP=${yazprefix}/bin/yaz-asncomp
+    YAZBIN=${prefix}/bin
+    YAZCOMP=${prefix}/bin/yaz-asncomp
 
-    if test "$yazprefix" != "/usr"; then
-	YAZLIB="-L$yazprefix/lib"
+    if test "$prefix" != "/usr"; then
+	YAZLIB="-L$libdir $YAZLIB"
     fi
-    YAZLIB="$YAZLIB $lyaz $yazextralibs"
+    YAZLIB="$YAZLIB $LIBS"
     YAZLALIB=$YAZLIB
-    if test "$yazprefix" != "/usr"; then
-	YAZINC="-I$yazprefix/include $YAZINC"
+    if test "$prefix" != "/usr"; then
+	YAZINC="-I${includedir} $YAZINC"
     fi
 fi
 
 if test "$lib_thread" = "yes"; then
-    YAZINC="$PTHREAD_CFLAGS $YAZINC"
-    YAZLIB="$YAZLIB $PTHREAD_LIBS"
-    YAZLALIB="$YAZLALIB $PTHREAD_LIBS"
+    :
 fi
 
 if test "$lib_icu" = "yes"; then
@@ -145,19 +167,19 @@ if test "$lib_icu" = "yes"; then
     YAZLALIB="$YAZLALIB $ICU_LIBS"
 fi
 
-if test "$yaz_echo_help" = "yes"; then
+if test "$echo_help" = "yes"; then
     usage 1 1>&2
 fi
-if test "$yaz_echo_cflags" = "yes"; then
+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: