e: Use autoreconf

SVN revision: 78722

diff --git a/Makefile.am b/Makefile.am
index e574d5c..17c74b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = src data doc config
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 if HAVE_PO
 
 SUBDIRS += po
@@ -70,8 +72,6 @@ EXTRA_DIST = config.rpath  README AUTHORS COPYING \
 filesdir = $(datadir)/enlightenment/
 files_DATA = AUTHORS COPYING 
 
-ACLOCAL_AMFLAGS = -I m4
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = enlightenment.pc
 

diff --git a/autogen.sh b/autogen.sh
index b814903..9b3aff6 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,39 +1,6 @@
 #!/bin/sh
 
-rm -rf autom4te.cache
-rm -f aclocal.m4 ltmain.sh
-
-touch README
-touch ABOUT-NLS
-
-echo "Running autopoint..." ; autopoint -f || :
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
-echo "Running autoheader..." ; autoheader || exit 1
-echo "Running autoconf..." ; autoconf || exit 1
-echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
-echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
-
-W=0
-
-rm -f config.cache-env.tmp
-echo "OLD_PARM=\"$@\"" >> config.cache-env.tmp
-echo "OLD_CFLAGS=\"$CFLAGS\"" >> config.cache-env.tmp
-echo "OLD_PATH=\"$PATH\"" >> config.cache-env.tmp
-echo "OLD_PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\"" >> config.cache-env.tmp
-echo "OLD_LDFLAGS=\"$LDFLAGS\"" >> config.cache-env.tmp
-
-cmp config.cache-env.tmp config.cache-env >> /dev/null
-if [ $? -ne 0 ]; then
-       W=1;
-fi
-
-if [ $W -ne 0 ]; then
-       echo "Cleaning configure cache...";
-       rm -f config.cache config.cache-env
-       mv config.cache-env.tmp config.cache-env
-else
-       rm -f config.cache-env.tmp
-fi
+autoreconf --symlink --install
 
 if [ -z "$NOCONFIGURE" ]; then
        ./configure -C "$@"