summaryrefslogtreecommitdiff
path: root/macros2/gnome-common.m4
diff options
context:
space:
mode:
Diffstat (limited to 'macros2/gnome-common.m4')
-rw-r--r--macros2/gnome-common.m47
1 files changed, 7 insertions, 0 deletions
diff --git a/macros2/gnome-common.m4 b/macros2/gnome-common.m4
index 8f296b60..e4747e9b 100644
--- a/macros2/gnome-common.m4
+++ b/macros2/gnome-common.m4
@@ -5,9 +5,16 @@ dnl GNOME_COMMON_INIT
AC_DEFUN([GNOME_COMMON_INIT],
[
+ dnl this macro should come after AC_CONFIG_MACRO_DIR
+ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
+
dnl ensure that when the Automake generated makefile calls aclocal,
dnl it honours the $ACLOCAL_FLAGS environment variable
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+ if test -n "$ac_macro_dir"; then
+ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+ fi
+
AC_SUBST([ACLOCAL_AMFLAGS])
])