yaz-config --include: returns -Ipath

for YAZ header files.

diff --git a/doc/yaz-config-man.xml b/doc/yaz-config-man.xml
index 2dddb31..1b16139 100644 (file)
--- a/doc/yaz-config-man.xml
+++ b/doc/yaz-config-man.xml
@@ -34,6 +34,7 @@
    <arg choice="opt"><option>--libs</option></arg>
    <arg choice="opt"><option>--lalibs</option></arg>
    <arg choice="opt"><option>--cflags</option></arg>
+   <arg choice="opt"><option>--include</option></arg>
    <arg choice="opt"><option>--comp</option></arg>
    <arg choice="opt"><option>-V</option></arg>
    <arg choice="opt" rep="repeat">libraries</arg>
@@ -101,6 +102,13 @@
    </varlistentry>
 
    <varlistentry>
+    <term>--include</term>
+    <listitem><para>
+      Return C compiler includes for YAZ header files (-Ipath).
+     </para></listitem>
+   </varlistentry>
+
+   <varlistentry>
     <term>--comp</term>
     <listitem><para>
       Returns full path to YAZ' ASN.1 compiler: yaz-asncomp.

diff --git a/yaz-config.in b/yaz-config.in
index 9553d94..2374032 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -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
            ;;
@@ -142,7 +147,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
@@ -154,7 +160,8 @@ else
     YAZLIB="$YAZLIB $LIBS"
     YAZLALIB=$YAZLIB
     if test "$prefix" != "/usr"; then
-       YAZINC="-I${includedir} $YAZINC"
+       YAZBINC="-I${includedir}"
+       YAZINC="$YAZBINC $YAZINC"
     fi
 fi
 
@@ -171,6 +178,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