diff options
| author | James Henstridge <james@jamesh.id.au> | 2005-08-16 11:01:33 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2005-08-16 11:01:33 +0000 |
| commit | c48b058463a0554f6cda17310bcb1b1d9c3971ed (patch) | |
| tree | 05d2c27ca63f4e28af4fa7eb6337abf549c18583 | |
| parent | 707c6a8142883143c2255374f7b5d19fc90efd7a (diff) | |
| download | gnome-common-c48b058463a0554f6cda17310bcb1b1d9c3971ed.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | macros2/gnome-autogen.sh | 11 |
2 files changed, 18 insertions, 0 deletions
@@ -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 --- 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 |