aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStafford Mitchell Horne <shorne@gmail.com>2007-01-27 06:00:58 +0000
committerStafford Mitchell Horne <shorne@gmail.com>2007-01-27 06:00:58 +0000
commitde7e05e8c51fe8bd6465c6c91ad1a9f93e753fcb (patch)
treeb04622a2009d8ebb5547c04414db4a63b0862da1
parent691bda6ed7a05291f71bd88a9193e86f173d27de (diff)
downloadenlightenment-de7e05e8c51fe8bd6465c6c91ad1a9f93e753fcb.tar.gz
enlightenment-de7e05e8c51fe8bd6465c6c91ad1a9f93e753fcb.tar.xz
enlightenment-de7e05e8c51fe8bd6465c6c91ad1a9f93e753fcb.zip
Revert build changes, OOPS!
SVN revision: 28132
-rw-r--r--Makefile.am2
-rwxr-xr-xautogen.sh6
-rw-r--r--configure.in2
3 files changed, 3 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 331687e14..518533c8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
bin_SCRIPTS = enlightenment-config
-EXTRA_DIST = mkinstalldirs config.rpath config.rpath mkinstalldirs mkinstalldirs config.rpath mkinstalldirs config.rpath config.rpath mkinstalldirs config.rpath README AUTHORS COPYING COPYING-PLAIN \
+EXTRA_DIST = config.rpath README AUTHORS COPYING COPYING-PLAIN \
enlightenment.spec.in enlightenment.spec \
debian/changelog \
debian/changelog.in \
diff --git a/autogen.sh b/autogen.sh
index f58a5ac86..43cef3338 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,15 +6,11 @@ rm -f aclocal.m4 ltmain.sh
touch README
touch ABOUT-NLS
-#echo "Running autopoint..." ; autopoint -f || exit 1
+echo "Running autopoint..." ; autopoint -f || exit 1
echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
echo "Running autoconf..." ; autoconf || exit 1
echo "Running autoheader..." ; autoheader || exit 1
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
-echo "Running gettextize..." ; gettextize -f --no-changelog
-# hack - gettextize is interactive and demands input from a user. "screw it".
-#sleep 20
-#kill %1
echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
if [ -z "$NOCONFIGURE" ]; then
diff --git a/configure.in b/configure.in
index f819dcbdc..112d0b302 100644
--- a/configure.in
+++ b/configure.in
@@ -146,7 +146,7 @@ ALL_LINGUAS="bg de eo ja ru hu sl it fr"
AC_SUBST(ALL_LINGUAS)
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.14.6])
+AM_GNU_GETTEXT_VERSION([0.12.1])
if test "x$LIBINTL" = "x"; then
LIBINTL="$INTLLIBS"
fi