aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in12
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a47028562e..3e5254be19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-20 James Henstridge <james@jamesh.id.au>
+
+ * configure.in (EVO_SET_COMPILE_FLAGS): fix up macro so that it
+ doesn't trigger configure failures with newer versions of
+ pkg-config. Fixes bug #300436.
+
2005-04-11 Harish Krishnaswamy <kharish@novell.com>
* configure.in: bump version, requires
diff --git a/configure.in b/configure.in
index f11b4c0e2a..52b16c9480 100644
--- a/configure.in
+++ b/configure.in
@@ -1079,13 +1079,11 @@ AC_MSG_RESULT($IDL_INCLUDES)
AC_SUBST(IDL_INCLUDES)
dnl Utility macro to set compiler flags for a specific lib.
-AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
- deps="$2"
- extra_cflags="$3"
- extra_libs="$4"
- PKG_CHECK_MODULES(EVOLUTION, $deps)
- $1_CFLAGS="$EVOLUTION_CFLAGS \$(WERROR) $extra_cflags"
- $1_LIBS="$EVOLUTION_LIBS $extra_libs"
+dnl EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS)
+AC_DEFUN([EVO_SET_COMPILE_FLAGS], [
+ PKG_CHECK_MODULES([$1], [$2])
+ $1_CFLAGS="[$]$1_CFLAGS \$(WERROR) $3"
+ $1_LIBS="[$]$1_LIBS $4"
])
dnl enable USE_GTKFILECHOOSER if gtk version is > 2.4.0