From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 13 Apr 2007 10:26:57 +0000 (+0000)
Subject: Ensure yazpp includes files are listed first in output of yazpp-config
X-Git-Tag: YAZPP.1.0.3~5
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=ca58a20d661f245f8c3974fae6b61b50dada80f2;p=yazpp-moved-to-github.git

Ensure yazpp includes files are listed first in output of yazpp-config
--cflags.
---

diff --git a/yazpp-config.in b/yazpp-config.in
index fd52071..001347a 100644
--- a/yazpp-config.in
+++ b/yazpp-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yazpp-config.in,v 1.2 2006-12-12 14:39:02 marc Exp $
+# $Id: yazpp-config.in,v 1.3 2007-04-13 10:26:57 adam Exp $
 yazppprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -71,12 +71,14 @@ done
 
 libs_short="-lyazpp -lzoompp"
 
+YAZPPINC="@YAZINC@"
+
 if test "$yaz_echo_source" = "yes"; then
     YAZPPLIB="-L${yazpp_build_root}/src/.libs -lyazpp"
     YAZPPLIB="$YAZPPLIB -L${yazpp_build_root}/zoom/.libs -lzoompp"
     YAZPPLIB="$YAZPPLIB $yazlibs"
     YAZPPLALIB="${yazpp_build_root}/src/libyazpp.la $yazlalibs"
-    YAZPPINC="@YAZINC@ -I${yazpp_src_root}/include"
+    YAZPPINC="-I${yazpp_src_root}/include $YAZPPINC"
 else
 
     if test "$yazppprefix" = "/usr"; then
@@ -85,10 +87,8 @@ else
 	YAZPPLIB="-L${yazppprefix}/lib ${libs_short} $yazlibs"
     fi
     YAZPPLALIB=$YAZPPLIB
-    if test "$yazppprefix" = "/usr"; then
-	YAZPPINC="@YAZINC@"
-    else
-	YAZPPINC="@YAZINC@ -I${yazppprefix}/include"
+    if test "$yazppprefix" != "/usr"; then
+	YAZPPINC="-I${yazppprefix}/include $YAZPPINC"
     fi
 fi