CCL: And-list / sub-phrase split-out YAZ-844

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

diff --git a/yaz-config.in b/yaz-config.in
index e04767b..979985d 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,23 +1,30 @@
 #!/bin/sh
 # This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2008 Index Data
+# Copyright (C) Index Data
+# See the file LICENSE for details.
 
-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@"
+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@"
+GCRYPT_LIBS="@GCRYPT_LIBS@"
+MEMCACHED_LIBS="@MEMCACHED_LIBS@"
+HIREDIS_LIBS="@HIREDIS_LIBS@"
 LIBS="@LIBS@"
-YAZVERSION=@VERSION@
+VERSION=@VERSION@
+YAZVERSION=$VERSION
 VERSION_SHA1=@VERSION_SHA1@
 
 usage()
@@ -30,9 +37,11 @@ Options:
        [--libs]
        [--lalibs]
        [--cflags]
+       [--include]
        [--comp]
+        [-V]
 Libraries:
-       threads icu server
+       threads icu server static
 EOF
        exit $1
 }
@@ -45,31 +54,34 @@ while test $# -gt 0; do
     
     case $1 in
        --prefix=*)
-           yazprefix=$optarg
+           prefix=$optarg
            ;;
        --prefix)
-           echo $yazprefix
+           echo $prefix
            exit 0
            ;;
         -V)
-           echo "$YAZVERSION $VERSION_SHA1"
+           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
@@ -79,6 +91,9 @@ while test $# -gt 0; do
                lib_icu=yes
            fi
            ;;
+       ssl)
+           lib_ssl=yes
+           ;;
        server)
            lib_thread=yes
            lib_server=yes
@@ -87,68 +102,72 @@ 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
 
 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"
+        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="${yaz_build_root}/src/.libs/libyaz_icu.a $YAZLIB"
+           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 ${SSL_LIBS} $LIBS"
+    LIBS="${SSL_LIBS} ${GCRYPT_LIBS} ${MEMCACHED_LIBS} ${HIREDIS_LIBS} $LIBS"
+    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 $LIBS"
 
-    YAZINC="-I${yaz_src_root}/include $YAZINC"
-    YAZCOMP=${yaz_src_root}/util/yaz-asncomp
+    YAZBINC="-I${src_root}/include"
+    YAZINC="$YAZBINC $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 ${SSL_LIBS} $LIBS"
+    if test "$lib_ssl" = "yes"; then
+        LIBS="${SSL_LIBS} $LIBS"
+    fi
+    YAZLIB="$YAZLIB $LIBS"
     YAZLALIB=$YAZLIB
-    if test "$yazprefix" != "/usr"; then
-       YAZINC="-I$yazprefix/include $YAZINC"
+    if test "$prefix" != "/usr"; then
+       YAZBINC="-I${includedir}"
+       YAZINC="$YAZBINC $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
@@ -157,19 +176,22 @@ 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_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: