Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
acinclude.m4 autogen.sh configure.in
Removed Files:
setup-gettext.sh
Log Message:
Remove support for ancient gettext versions.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/acinclude.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- acinclude.m4 20 Mar 2004 15:20:40 -0000 1.3
+++ acinclude.m4 4 Feb 2006 14:20:12 -0000 1.4
@@ -175,5 +175,3 @@
fi
AC_MSG_RESULT($ac_cv___attribute__)
])
-
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/autogen.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- autogen.sh 28 Oct 2004 18:44:27 -0000 1.17
+++ autogen.sh 4 Feb 2006 14:20:12 -0000 1.18
@@ -1,70 +1,41 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
-PKG_NAME="enlightenment"
-
srcdir=`dirname $0`
-DIE=0
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have autoconf installed to compile Enlightenment."
- echo "Download the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/autoconf";
- DIE=1
+(test -d src && test -d dox) || {
+ echo "You must run this script in the top-level directory"
+ exit 1
}
-(automake --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have automake installed to compile Enlightenment."
- echo "Get it at ftp://ftp.gnu.org/pub/gnu/automake";
- DIE=1
-}
+echo "Generating configuration files, please wait...."
-(gettext --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have gettext installed to compile Enlightenment."
- echo "Get ftp://ftp.gnu.org/pub/gnu/gettext";
- DIE=1
-}
+rm -rf autom4te.cache
+rm -f aclocal.m4
-if test "$DIE" -eq 1; then
- exit 1
-fi
+echo "Running autopoint -f"
+autopoint -f || gautopoint -f || exit 1
+echo "Running aclocal -I m4 $ACLOCAL_FLAGS"
+aclocal -I m4 $ACLOCAL_FLAGS || exit 1
+echo "Running autoconf"
+autoconf || exit 1
+echo "Running autoheader"
+autoheader || exit 1
+echo "Running automake --add-missing"
+automake --add-missing || exit 1
-(test -d src && test -d dox) || {
- echo "You must run this script in the top-level Enlightenment
directory"
- exit 1
-}
+
+#conf_flags="--enable-maintainer-mode --enable-compile-warnings"
if test -z "$*"; then
echo "I am going to run ./configure with no arguments - if you wish "
echo "to pass any to it, please specify them on the $0 command line."
fi
-echo "Generating configuration files for Enlightenment, please wait...."
-
-#echo " gettextize -f"
-#gettextize -f
-echo " setup-gettext.sh"
-grep 'AM_GNU_GETTEXT_VERSION' configure.in >/dev/null 2>&1 || sh
./setup-gettext.sh --install
-sh ./setup-gettext.sh
-echo " aclocal -I m4 $ACLOCAL_FLAGS"
-aclocal -I m4 $ACLOCAL_FLAGS
-echo " autoheader"
-autoheader
-echo " automake --add-missing"
-automake --add-missing
-echo " autoconf"
-autoconf
-
-
-#conf_flags="--enable-maintainer-mode --enable-compile-warnings"
-
if test x$NOCONFIGURE = x; then
- echo Running $srcdir/configure $conf_flags "$@" ...
+ echo "Running $srcdir/configure $conf_flags $@ ..."
$srcdir/configure $conf_flags "$@" \
- && echo Now type \`make\' to compile $PKG_NAME
+ && echo "Now type 'make' to compile."
else
- echo Skipping configure process.
+ echo "Skipping configure process."
fi
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/configure.in,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- configure.in 24 Jan 2006 19:35:31 -0000 1.135
+++ configure.in 4 Feb 2006 14:20:12 -0000 1.136
@@ -67,10 +67,6 @@
AM_GNU_GETTEXT
AM_GNU_GETTEXT_VERSION(0.12.1)
-if test "x$LIBINTL" = "x"; then
- LIBINTL="$INTLLIBS"
- AC_SUBST(LIBINTL)
-fi
AC_ARG_ENABLE(fsstd,
[ --enable-fsstd install files following FSSTD
@<:@default=yes@:>@],,
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
