add checks for gnome-common macro names, and call require_m4macro for the

2005-08-16  James Henstridge  <james@jamesh.id.au>

	* macros2/gnome-autogen.sh: add checks for gnome-common macro
	names, and call require_m4macro for the appropriate names.  This
	can help detect $ACLOCAL_FLAGS problems earlier.  Addresses bug
	#312125.

svn path=/trunk/; revision=3601

diff --git a/ChangeLog b/ChangeLog
index a7de3df..b1acc29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-16  James Henstridge  <james@jamesh.id.au>
+
+       * macros2/gnome-autogen.sh: add checks for gnome-common macro
+       names, and call require_m4macro for the appropriate names.  This
+       can help detect $ACLOCAL_FLAGS problems earlier.  Addresses bug
+       #312125.
+
 2005-07-25  James Henstridge  <james@jamesh.id.au>
 
        * configure.in: bump release number.

diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index f950973..12b9c6e 100644 (file)
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -237,6 +237,17 @@ for configure_ac in $configure_files; do
     if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then
         want_gnome_doc_utils=true
     fi
+
+    # check to make sure gnome-common macros can be found ...
+    if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null ||
+       grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null ||
+       grep "^GNOME_MAINTAINER_MODE_DEFINES" $configure_ac >/dev/null; then
+        require_m4macro gnome-common.m4
+    fi
+    if grep "^GNOME_COMPILE_WARNINGS" $configure_ac >/dev/null ||
+       grep "^GNOME_CXX_WARNINGS" $configure_ac >/dev/null; then
+        require_m4macro gnome-compiler-flags.m4
+    fi
 done
 
 DIE=0