Browse Source

* autogen.sh: Fall back to aclocal without "-I gettext.m4" in
case it already has gettext macros elsewhere and doesn't like
duplicates (i.e. it's aclocal from Automake-1.4).

Pavel Roskin 23 years ago
parent
commit
fe1df0083f
2 changed files with 9 additions and 1 deletions
  1. 6 0
      ChangeLog
  2. 3 1
      autogen.sh

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2001-08-21  Pavel Roskin  <proski@gnu.org>
+
+	* autogen.sh: Fall back to aclocal without "-I gettext.m4" in
+	case it already has gettext macros elsewhere and doesn't like
+	duplicates (i.e. it's aclocal from Automake-1.4).
+
 2001-08-20  Pavel Roskin  <proski@gnu.org>
 
 	* AUTHORS: Updated.

+ 3 - 1
autogen.sh

@@ -41,7 +41,9 @@ for i in $m4files; do
   cp -f $fromdir/$i gettext.m4
 done
 
-$ACLOCAL -I macros -I gettext.m4 $ACLOCAL_FLAGS || exit 1
+$ACLOCAL -I macros -I gettext.m4 $ACLOCAL_FLAGS || \
+  $ACLOCAL -I macros $ACLOCAL_FLAGS || \
+  exit 1
 $AUTOHEADER || exit 1
 $AUTOCONF || exit 1
 $AUTOMAKE -a || exit 1