X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz-config.in;h=d14e5078ad6f8beaf0b7b34ff37372fbf26dbcb5;hb=cd3162337ff8918cd2d997f79ca9da20b8c70855;hp=d2325ab37fe8600b810032c7b3609b40783043cb;hpb=bb7daed8b7299999f1c25e4e768e5e510d4b7e98;p=yaz-moved-to-github.git

diff --git a/yaz-config.in b/yaz-config.in
index d2325ab..d14e507 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.24 2006-06-13 15:36:09 adam Exp $
+# $Id: yaz-config.in,v 1.27 2007-04-13 10:24:32 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -75,11 +75,13 @@ done
 
 lyaz="-lyaz"
 
+YAZINC="@YAZ_CONFIG_CFLAGS@"
+
 if test "$yaz_echo_source" = "yes"; then
     YAZBIN=${yaz_build_root}/bin
     YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs"
     YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs"
-    YAZINC="-I${yaz_src_root}/include"
+    YAZINC="-I${yaz_src_root}/include $YAZINC"
     YAZCOMP=${yaz_src_root}/util/yaz-asncomp
 else
     YAZBIN=${yazprefix}/bin
@@ -91,19 +93,11 @@ else
 	YAZLIB="-L$yazprefix/lib $lyaz $yazextralibs"
     fi
     YAZLALIB=$YAZLIB
-    if test "$yazprefix" = "/usr"; then
-	YAZINC=
-    else
-	YAZINC=-I$yazprefix/include
+    if test "$yazprefix" != "/usr"; then
+	YAZINC="-I$yazprefix/include $YAZINC"
     fi
 fi
 
-YAZINC="$YAZINC @YAZ_CONF_CFLAGS@"
-
-if test "$lib_thread" = "yes"; then
-    YAZINC="$YAZINC @THREAD_CFLAGS@"
-fi
-
 if test "$yaz_echo_help" = "yes"; then
     usage 1 1>&2
 fi