X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=cae1175693f505e7b91baa8c207876a9ac1926be;hp=20748279eca2fdcda197bd71f2db9059c8514512;hb=916ddaa16e2fe4f4bd649b463be12e7854f98dc8;hpb=7ae6a3d178c4f29bad3af081c1882cdb6dcb3e06

diff --git a/yaz-config.in b/yaz-config.in
index 2074827..cae1175 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,11 +1,15 @@
 #!/bin/sh
 # This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2008 Index Data
+# Copyright (C) 1995-2013 Index Data
 
 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
@@ -16,6 +20,7 @@ ICU_CPPFLAGS="@ICU_CPPFLAGS@"
 SSL_LIBS="@SSL_LIBS@"
 LIBS="@LIBS@"
 VERSION=@VERSION@
+YAZVERSION=$VERSION
 VERSION_SHA1=@VERSION_SHA1@
 
 usage()
@@ -28,6 +33,7 @@ Options:
 	[--libs]
 	[--lalibs]
 	[--cflags]
+	[--include]
 	[--comp]
         [-V]
 Libraries:
@@ -61,6 +67,9 @@ while test $# -gt 0; do
 	--cflags)
 	    echo_cflags=yes
 	    ;;
+	--include)
+	    echo_include=yes
+	    ;;
 	--libs)
 	    echo_libs=yes
 	    ;;
@@ -104,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"
@@ -127,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"
@@ -138,19 +141,24 @@ 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
     YAZCOMP=${prefix}/bin/yaz-asncomp
 
     if test "$prefix" != "/usr"; then
-	YAZLIB="-L$prefix/lib $YAZLIB"
+	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$prefix/include $YAZINC"
+	YAZBINC="-I${includedir}"
+	YAZINC="$YAZBINC $YAZINC"
     fi
 fi
 
@@ -167,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