summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--macros2/ChangeLog6
-rw-r--r--macros2/autogen.sh2
2 files changed, 7 insertions, 1 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index 0a507396..895c7f5f 100644
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-19 Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+ * autogen.sh: Replace use of -or in a find command with -o.
+ Makes things work for people with less functional versions of
+ find. Fixes bug #127354 reported by Rolf Sponsel.
+
2003-11-03 <clahey@ximian.com>
* gnome-common.m4: Removed ENABLE_WERROR and changed name to
diff --git a/macros2/autogen.sh b/macros2/autogen.sh
index b8f99569..598edc55 100644
--- a/macros2/autogen.sh
+++ b/macros2/autogen.sh
@@ -216,7 +216,7 @@ want_intltool=false
want_pkg_config=false
want_gtk_doc=false
-configure_files="`find $srcdir -name '{arch}' -prune -o -name configure.ac -print -or -name configure.in -print`"
+configure_files="`find $srcdir -name '{arch}' -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; then
want_libtool=true