- Fix for #377175 by skipping NO-AUTO-GEN directories, by Christian Persch

* macros2/gnome-autogen.sh:
- Fix for #377175 by skipping NO-AUTO-GEN directories, by Christian Persch

svn path=/trunk/; revision=3899

diff --git a/ChangeLog b/ChangeLog
index cb02104..8e1490f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-12  Shaun McCance  <shaunm@gnome.org>
+
+       * macros2/gnome-autogen.sh:
+       - Fix for #377175 by skipping NO-AUTO-GEN directories, by Christian Persch
+
 2007-01-11  Christian Persch  <chpe@svn.gnome.org>
 
        * macros2/gnome-autogen.sh: Default to AM 1.9. Bug #323868, patch by

diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index ed12f7d..d0fa4c1 100644 (file)
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -253,6 +253,11 @@ want_gnome_doc_utils=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
+    dirname=`dirname $configure_ac`
+    if [ -f $dirname/NO-AUTO-GEN ]; then
+       echo skipping $dirname -- flagged as no auto-gen
+       continue
+    fi
     if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null ||
        grep "^LT_INIT" $configure_ac >/dev/null; then
        want_libtool=true