From 70fc39fb39fa5a067d385a477a1fc32362e5be9a Mon Sep 17 00:00:00 2001
From: Timo Sirainen <cras@irssi.org>
Date: Mon, 12 Feb 2001 19:48:51 +0000
Subject: small updates

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1209 dbcabf3a-b0e7-0310-adc4-f8d773084564
---
 autogen.sh | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'autogen.sh')

diff --git a/autogen.sh b/autogen.sh
index b9673927..047d1117 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -53,18 +53,6 @@ DIE=0
 }
 
 grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
-  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
-  (gettext --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
-    echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
-    echo "(or a newer version if it is available)"
-    DIE=1
-  }
-}
-
-grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
-  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
   (gettext --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
@@ -110,6 +98,7 @@ xlc )
   am_opt=--include-deps;;
 esac
 
+rm -f aclocal.m4
 if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
   echo "Creating aclocal.m4 ..."
   test -r aclocal.m4 || touch aclocal.m4
@@ -129,10 +118,10 @@ if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
   echo "Running autoheader..."
   autoheader
 fi
-echo "Running automake --gnu $am_opt ..."
-automake --add-missing --gnu $am_opt
 echo "Running autoconf ..."
 autoconf
+echo "Running automake --gnu $am_opt ..."
+automake --add-missing --gnu $am_opt
 
 conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
 
-- 
cgit v1.2.3