Mention that @mask requires YAZ 4.2.58

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

diff --git a/yaz-config.in b/yaz-config.in
index 9553d94..cae1175 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2011 Index Data
+# Copyright (C) 1995-2013 Index Data
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -9,6 +9,7 @@ includedir=@includedir@
 echo_cflags=no
 echo_libs=no
 echo_help=no
+echo_include=no
 echo_source=yes
 echo_lalibs=no
 echo_comp=no
@@ -32,6 +33,7 @@ Options:
        [--libs]
        [--lalibs]
        [--cflags]
+       [--include]
        [--comp]
         [-V]
 Libraries:
@@ -65,6 +67,9 @@ while test $# -gt 0; do
        --cflags)
            echo_cflags=yes
            ;;
+       --include)
+           echo_include=yes
+           ;;
        --libs)
            echo_libs=yes
            ;;
@@ -108,19 +113,12 @@ if test "$lib_icu" = "yes"; then
     YAZLIB="-lyaz_icu $YAZLIB"
 fi
 
-if test "$lib_ssl" = "yes"; then
-    LIBS="${SSL_LIBS} $LIBS"
-fi
-
 YAZINC="@YAZ_CONFIG_CFLAGS@"
 
 if test "$echo_source" = "yes"; then
     YAZBIN=${build_root}/bin
 
     if test "$lib_static" = "yes"; then
-        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="${build_root}/src/.libs/libyaz_server.a $YAZLIB"
@@ -131,6 +129,7 @@ if test "$echo_source" = "yes"; then
     else
         YAZLIB="-L${build_root}/src/.libs $YAZLIB"
     fi
+    LIBS="${SSL_LIBS} $LIBS"
     YAZLIB="$YAZLIB $LIBS"
 
     YAZLALIB="${build_root}/src/libyaz.la"
@@ -142,7 +141,8 @@ if test "$echo_source" = "yes"; then
     fi
     YAZLALIB="$YAZLALIB $LIBS"
 
-    YAZINC="-I${src_root}/include $YAZINC"
+    YAZBINC="-I${src_root}/include"
+    YAZINC="$YAZBINC $YAZINC"
     YAZCOMP=${src_root}/util/yaz-asncomp
 else
     YAZBIN=${prefix}/bin
@@ -151,10 +151,14 @@ else
     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 "$prefix" != "/usr"; then
-       YAZINC="-I${includedir} $YAZINC"
+       YAZBINC="-I${includedir}"
+       YAZINC="$YAZBINC $YAZINC"
     fi
 fi
 
@@ -171,6 +175,9 @@ fi
 if test "$echo_help" = "yes"; then
     usage 1 1>&2
 fi
+if test "$echo_include" = "yes"; then
+    echo $YAZBINC
+fi
 if test "$echo_cflags" = "yes"; then
     echo $YAZINC
 fi