summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--macros2/gnome-autogen.sh2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a1f348..caa21e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-20 James Henstridge <james@jamesh.id.au>
+
+ * macros2/gnome-autogen.sh (configure_files): when searching for
+ configure.in files, skip directories starting with a dot. This
+ avoids Bzr, Quilt and Subversion bookkeeping directories among
+ others. Fixes bug #311951.
+
2005-08-17 Stepan Kasal <kasal@ucw.cz>
* macros2/gnome-autogen.sh (add_to_cm_macrodirs): New function,
diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index 54c8e32..1ddfdb1 100644
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -240,7 +240,7 @@ want_pkg_config=false
want_gtk_doc=false
want_gnome_doc_utils=false
-configure_files="`find $srcdir -name '{arch}' -prune -o -name configure.ac -print -o -name configure.in -print`"
+configure_files="`find $srcdir -name '{arch}' -prune -o -name '.?*' -prune -o -name configure.ac -print -o -name configure.in -print`"
for configure_ac in $configure_files; do
if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null ||
grep "^LT_INIT" $configure_ac >/dev/null; then