gnome-common r3929 - in trunk: . macros2

[dobey svn gnome org]

Author: dobey
Date: Sun Mar 29 03:11:13 2009
New Revision: 3929
URL: http://svn.gnome.org/viewvc/gnome-common?rev=3929&view=rev

Log:
Only pass --enable-maintainer-mode when AM_MAINTAINER_MODE is present


Modified:
   trunk/ChangeLog
   trunk/macros2/gnome-autogen.sh

Modified: trunk/macros2/gnome-autogen.sh
==============================================================================
--- trunk/macros2/gnome-autogen.sh	(original)
+++ trunk/macros2/gnome-autogen.sh	Sun Mar 29 03:11:13 2009
@@ -257,6 +257,7 @@
 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 @@
         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 @@
     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 "$@" ...