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

	* gpgme-config.in: Do not emit include and lib directory for
	prefix "/usr" or "".

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index f027885d3218fc1b574a004ec60f0723ec8bbdb2..38f8f433d4a5513124b0dfdaf472c07cc92f701c 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-07  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgme-config.in: Do not emit include and lib directory for
+       prefix "/usr" or "".
+
 2004-03-03  Werner Koch  <wk@gnupg.org>
 
        * engine-gpgsm.c (gpgsm_export_ext): Properly insert a space

diff --git a/gpgme/gpgme-config.in b/gpgme/gpgme-config.in
index 270f965ce80db9b964c71ec10ed36b736b327d60..28f14483ab8838e9b1e552f52f0a5c43ab063464 100644 (file)
--- a/gpgme/gpgme-config.in
+++ b/gpgme/gpgme-config.in
@@ -78,7 +78,9 @@ while test $# -gt 0; do
            exit 0
            ;;
         --cflags)
-            output="$output -I$includedir"
+           if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
+               output="$output -I$includedir"
+           fi
            case "$thread_module" in
                pthread)
                    output="$output $cflags_pthread"
@@ -90,7 +92,9 @@ while test $# -gt 0; do
            output="$output $gpg_error_cflags"
            ;;
        --libs)
-            output="$output -L$libdir"
+           if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+               output="$output -L$libdir"
+           fi
            case "$thread_module" in
                pthread)
                    output="$output -lgpgme-pthread $libs_pthread"