summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@src.gnome.org>2007-01-12 19:13:13 +0000
committerShaun McCance <shaunm@src.gnome.org>2007-01-12 19:13:13 +0000
commit01f5dff368a262d7e0ac909823fa178517c9c43c (patch)
treeb6c7c32c274f86b53d3d466aba155113e7a392ff
parent2ea58dc73f96b36311d4b54d24596b96b484732f (diff)
downloadshared-mime-info-01f5dff368a262d7e0ac909823fa178517c9c43c.tar.gz
- 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
-rw-r--r--ChangeLog5
-rw-r--r--macros2/gnome-autogen.sh5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cb02104e..8e1490fa 100644
--- 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 ed12f7da..d0fa4c13 100644
--- 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