2004-03-14 Marcus Brinkmann <marcus@g10code.de>

	* libgcrypt-config.in (includedir, libdir): New variables.  For
	--cflags, don't test $cflags.  Also check against /include for the
	GNU/Hurd.  Don't overwrite but extend $cflags_final.  Likewise for
	--libs.

1 files changed, 8 insertions, 16 deletions

diff --git a/src/libgcrypt-config.in b/src/libgcrypt-config.in
index 3309b692..f54dfb4c 100644
--- a/src/libgcrypt-config.in
+++ b/src/libgcrypt-config.in
@@ -13,6 +13,8 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 version="@VERSION@"
+includedir=@includedir@
+libdir=@libdir@
 gpg_error_libs="@GPG_ERROR_LIBS@"
 gpg_error_cflags="@GPG_ERROR_CFLAGS@"
 
@@ -122,16 +124,11 @@ if test "$echo_cflags" = "yes"; then
     cflags_final="$cflags"
 
     # Set up `includes'.
-    if test "@includedir@" != "/usr/include" ; then
-	includes="-I@includedir@"
-	for i in $cflags ; do
-	    if test "$i" = "-I@includedir@" ; then
-		includes=""
-	    fi
-	done
+    if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
+	includes="$includes -I$includedir"
     fi
     # Set up `cflags_final'.
-    cflags_final="@GPG_ERROR_CFLAGS@"
+    cflags_final="$cflags_final @GPG_ERROR_CFLAGS@"
 
     echo "$includes $cflags_final"
 fi
@@ -141,17 +138,12 @@ if test "$echo_libs" = "yes"; then
     libs_final="$libs"
 
     # Set up `libdirs'.
-    if test "@libdir@" != "/usr/lib" ; then
-	libdirs="-L@libdir@"
-	for i in $libs ; do
-	    if test "$i" = "-L@libdir@" ; then
-		libdirs=""
-	    fi
-	done
+    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+	libdirs="$libdir -L@libdir@"
     fi
 
     # Set up `libs_final'.
-    libs_final="@GPG_ERROR_LIBS@"
+    libs_final="$libs_final @GPG_ERROR_LIBS@"
 
     echo "$libdirs $libs_final"
 fi