diff options
author | Rodney Dawes <dobey@src.gnome.org> | 2009-03-29 03:11:13 +0000 |
---|---|---|
committer | Rodney Dawes <dobey@src.gnome.org> | 2009-03-29 03:11:13 +0000 |
commit | 736626f9b6140d89e02d7dcea5f6c924f4a6788c (patch) | |
tree | 17f8f15059dc526a1ded052e47e020a37decf415 | |
parent | 57131f57742b075b49c9d9f05a09c42ae5333725 (diff) | |
download | shared-mime-info-736626f9b6140d89e02d7dcea5f6c924f4a6788c.tar.gz |
Only pass --enable-maintainer-mode when AM_MAINTAINER_MODE is present
svn path=/trunk/; revision=3929
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | macros2/gnome-autogen.sh | 12 |
2 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2009-03-28 Rodney Dawes <dobey@gnome.org> + + * macros2/gnome-autogen.sh: + Only pass --enable-maintainer-mode when AM_MAINTAINER_MODE is present + + FIxes #577037 + 2008-11-25 Vincent Untz <vuntz@gnome.org> * macros2/gnome-common.m4: add -DWNCK_DISABLE_DEPRECATED diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh index e2ce97f9..ba61f825 100644 --- a/macros2/gnome-autogen.sh +++ b/macros2/gnome-autogen.sh @@ -257,6 +257,7 @@ want_intltool=false want_pkg_config=false want_gtk_doc=false want_gnome_doc_utils=false +want_maintainer_mode=false configure_files="`find $srcdir -name '{arch}' -prune -o -name '_darcs' -prune -o -name '.??*' -prune -o -name configure.ac -print -o -name configure.in -print`" for configure_ac in $configure_files; do @@ -289,6 +290,11 @@ for configure_ac in $configure_files; do want_gnome_doc_utils=true fi + # check that AM_MAINTAINER_MODE is used + if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then + want_maintainer_mode=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 || @@ -484,7 +490,11 @@ for configure_ac in $configure_files; do fi done -conf_flags="--enable-maintainer-mode" +conf_flags="" + +if $want_maintainer_mode; then + conf_flags="--enable-maintainer-mode" +fi if test x$NOCONFIGURE = x; then printbold Running $srcdir/configure $conf_flags "$@" ... |