summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2010-05-30 22:41:02 +0200
committerChristian Persch <chpe@gnome.org>2010-05-30 22:47:54 +0200
commitf96a12fc3ead855c129d7ab35737a8b0deceeae5 (patch)
treef78b0fecbdedc250d1f12da8bbeaa34de6c16546
parent04dd5e38d9ef5f0df89b7def24747f177f258c3a (diff)
downloadshared-mime-info-f96a12fc3ead855c129d7ab35737a8b0deceeae5.tar.gz
Define GNOME_COMMON_INIT with AU_DEFUN
... to mark it as deprecated. Bug #608285.
-rw-r--r--macros2/gnome-common.m49
1 files changed, 6 insertions, 3 deletions
diff --git a/macros2/gnome-common.m4 b/macros2/gnome-common.m4
index 252e861a..f5c60e0a 100644
--- a/macros2/gnome-common.m4
+++ b/macros2/gnome-common.m4
@@ -1,11 +1,11 @@
# gnome-common.m4
#
-# serial 2
+# serial 3
#
dnl GNOME_COMMON_INIT
-AC_DEFUN([GNOME_COMMON_INIT],
+AU_DEFUN([GNOME_COMMON_INIT],
[
dnl this macro should come after AC_CONFIG_MACRO_DIR
AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
@@ -18,7 +18,10 @@ AC_DEFUN([GNOME_COMMON_INIT],
fi
AC_SUBST([ACLOCAL_AMFLAGS])
-])
+],
+[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
+in your top-level Makefile.am, instead, where "m4" is the macro directory set
+with AC_CONFIG_MACRO_DIR() in your configure.ac]])
AC_DEFUN([GNOME_DEBUG_CHECK],
[