Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=9a60e06c18026d97309aadd5d88c41d105fca705

commit 9a60e06c18026d97309aadd5d88c41d105fca705
Author: Laszlo Papp <djsza...@gmail.com>
Date:   Sat Nov 14 08:37:05 2009 +0100

Move GETTEXT macros, change for autreconf -fi

* Move AM_GNU_GETTEXT([external]) and AM_GNU_GETTEXT_VERSION(0.13.1)
after the AM_PROG_LIBTOOL macro, because it caused 'error: possibly
undefined macro' like error messages.

* Change for autoreconf -fi in the ./autogen.sh script instead of using
more unneccesary lines there earlier, so it's simpler, easier to read in
this format, and it can work well

diff --git a/autogen.sh b/autogen.sh
index df0a3b4..059be27 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -124,14 +124,7 @@ fi
# copy in the po files
import_pootle

-cp /usr/share/aclocal/libtool.m4 aclocal.m4
-libtoolize -f -c
-aclocal --force
-autoheader -f
-autoconf -f
-cp -f $(dirname $(which automake))/../share/automake-$(automake --version|sed 
's/.*) //;s/\([0-9]\+\.[0-9]\+\)\.[0-9]\+/\1/;q')/mkinstalldirs ./
-cp -f $(dirname $(which automake))/../share/gettext/config.rpath ./
-automake -a -c --gnu --foreign
+autoreconf -fi

if [ "$1" == "--git" ]; then
rm -rf autom4te.cache
diff --git a/configure.ac b/configure.ac
index fb5ee64..a0db1a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,9 +7,7 @@ AC_CONFIG_MACRO_DIR([m4])
AC_LANG(C)
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.13.1)
+AM_INIT_AUTOMAKE([foreign])
AC_C_BIGENDIAN

dnl Host dependant flags
@@ -49,6 +47,8 @@ AC_HEADER_STDC
AC_PROG_INSTALL
AC_CHECK_FUNCS([strverscmp])
AM_PROG_LIBTOOL
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.13.1)
AM_CONDITIONAL(LINKSTATIC, test "$enable_static" = "yes")

dnl Humor lowers blood pressure
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to