summaryrefslogtreecommitdiff
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)
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 \
8 8
9bin_SCRIPTS = enlightenment-config 9bin_SCRIPTS = enlightenment-config
10 10
11EXTRA_DIST = mkinstalldirs config.rpath config.rpath mkinstalldirs mkinstalldirs config.rpath mkinstalldirs config.rpath config.rpath mkinstalldirs config.rpath README AUTHORS COPYING COPYING-PLAIN \ 11EXTRA_DIST = config.rpath README AUTHORS COPYING COPYING-PLAIN \
12 enlightenment.spec.in enlightenment.spec \ 12 enlightenment.spec.in enlightenment.spec \
13 debian/changelog \ 13 debian/changelog \
14 debian/changelog.in \ 14 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
6touch README 6touch README
7touch ABOUT-NLS 7touch ABOUT-NLS
8 8
9#echo "Running autopoint..." ; autopoint -f || exit 1 9echo "Running autopoint..." ; autopoint -f || exit 1
10echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 10echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
11echo "Running autoconf..." ; autoconf || exit 1 11echo "Running autoconf..." ; autoconf || exit 1
12echo "Running autoheader..." ; autoheader || exit 1 12echo "Running autoheader..." ; autoheader || exit 1
13echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 13echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
14echo "Running gettextize..." ; gettextize -f --no-changelog
15# hack - gettextize is interactive and demands input from a user. "screw it".
16#sleep 20
17#kill %1
18echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 14echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
19 15
20if [ -z "$NOCONFIGURE" ]; then 16if [ -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"
146AC_SUBST(ALL_LINGUAS) 146AC_SUBST(ALL_LINGUAS)
147 147
148AM_GNU_GETTEXT([external]) 148AM_GNU_GETTEXT([external])
149AM_GNU_GETTEXT_VERSION([0.14.6]) 149AM_GNU_GETTEXT_VERSION([0.12.1])
150if test "x$LIBINTL" = "x"; then 150if test "x$LIBINTL" = "x"; then
151 LIBINTL="$INTLLIBS" 151 LIBINTL="$INTLLIBS"
152fi 152fi