From: Joel Becker <jlbec@src.gnome.org>
Date: Wed, 16 Dec 1998 01:40:50 +0000 (+0000)
Subject: Fixed gettextize/aclocal conflict in autogen.sh
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;ds=sidebyside;h=8968861d7948601413e077a43613573ff88f05ad;p=~andy%2Fgtk

Fixed gettextize/aclocal conflict in autogen.sh
---

diff --git a/ChangeLog b/ChangeLog
index b22ac2ab7..0589872ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-15  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+	* autogen.sh: reordered gettextize and aclocal, because
+	gettextize was messing up aclocal.m4.
+
 Tue Dec 15 19:50:41 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkctree.c gtk/gtkclist.c gtk/testgtk.c: Use 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b22ac2ab7..0589872ff 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+1998-12-15  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+	* autogen.sh: reordered gettextize and aclocal, because
+	gettextize was messing up aclocal.m4.
+
 Tue Dec 15 19:50:41 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkctree.c gtk/gtkclist.c gtk/testgtk.c: Use 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b22ac2ab7..0589872ff 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+1998-12-15  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+	* autogen.sh: reordered gettextize and aclocal, because
+	gettextize was messing up aclocal.m4.
+
 Tue Dec 15 19:50:41 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkctree.c gtk/gtkclist.c gtk/testgtk.c: Use 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b22ac2ab7..0589872ff 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+1998-12-15  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+	* autogen.sh: reordered gettextize and aclocal, because
+	gettextize was messing up aclocal.m4.
+
 Tue Dec 15 19:50:41 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkctree.c gtk/gtkclist.c gtk/testgtk.c: Use 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b22ac2ab7..0589872ff 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+1998-12-15  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+	* autogen.sh: reordered gettextize and aclocal, because
+	gettextize was messing up aclocal.m4.
+
 Tue Dec 15 19:50:41 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkctree.c gtk/gtkclist.c gtk/testgtk.c: Use 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b22ac2ab7..0589872ff 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+1998-12-15  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+	* autogen.sh: reordered gettextize and aclocal, because
+	gettextize was messing up aclocal.m4.
+
 Tue Dec 15 19:50:41 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkctree.c gtk/gtkclist.c gtk/testgtk.c: Use 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b22ac2ab7..0589872ff 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+1998-12-15  Joel Becker  <jlbec@ocala.cs.miami.edu>
+
+	* autogen.sh: reordered gettextize and aclocal, because
+	gettextize was messing up aclocal.m4.
+
 Tue Dec 15 19:50:41 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkctree.c gtk/gtkclist.c gtk/testgtk.c: Use 
diff --git a/autogen.sh b/autogen.sh
index 05c98ba85..2cb68864e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -54,14 +54,17 @@ case $CC in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
-aclocal $ACLOCAL_FLAGS
-
 echo "Running gettextize...  Ignore non-fatal messages."
 # Hmm, we specify --force here, since otherwise things dont'
 # get added reliably, but we don't want to overwrite intl
 # while making dist.
 echo "no" | gettextize --copy --force
 
+# We don't need ./intl
+rm -rf intl
+
+aclocal $ACLOCAL_FLAGS
+
 # optionally feature autoheader
 (autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader