Enlightenment CVS committal

Author  : vapier
Project : e16
Module  : e16keyedit

Dir     : e16/e16keyedit


Modified Files:
        autogen.sh 


Log Message:
simpler autogen script

===================================================================
RCS file: /cvs/e/e16/e16keyedit/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- autogen.sh  18 Mar 2006 19:36:31 -0000      1.2
+++ autogen.sh  31 Mar 2006 03:09:20 -0000      1.3
@@ -1,54 +1,15 @@
 #!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-# $Id: autogen.sh,v 1.2 2006/03/18 19:36:31 kwo Exp $
 
-broken() {
-    echo
-    echo "You need libtool, autoconf, and automake.  Install them"
-    echo "and try again.  Get source at ftp://ftp.gnu.org/pub/gnu/";
-    echo "ERROR:  $1 not found."
-    exit -1
-}
+rm -rf autom4te.cache
+rm -f aclocal.m4 ltmain.sh
 
-DIE=0
+touch README
 
-echo "Generating build files, please wait...."
-
-AUTOHEADER_CHOICES="$AUTOHEADER autoheader"
-ACLOCAL_CHOICES="$ACLOCAL aclocal"
-AUTOMAKE_CHOICES="$AUTOMAKE automake"
-AUTOCONF_CHOICES="$AUTOCONF autoconf"
-
-for i in $AUTOHEADER_CHOICES ; do
-    $i --version </dev/null >/dev/null 2>&1 && AUTOHEADER=$i && break
-done
-[ "x$AUTOHEADER" = "x" ] && broken autoconf
-
-for i in $ACLOCAL_CHOICES ; do
-    $i --version </dev/null >/dev/null 2>&1 && ACLOCAL=$i && break
-done
-[ "x$ACLOCAL" = "x" ] && broken automake
-
-for i in $AUTOMAKE_CHOICES ; do
-    $i --version </dev/null >/dev/null 2>&1 && AUTOMAKE=$i && break
-done
-[ "x$AUTOMAKE" = "x" ] && broken automake
-
-for i in $AUTOCONF_CHOICES ; do
-    $i --version </dev/null >/dev/null 2>&1 && AUTOCONF=$i && break
-done
-[ "x$AUTOCONF" = "x" ] && broken autoconf
-
-# Export them so configure can AC_SUBST() them.
-export AUTOHEADER ACLOCAL AUTOMAKE AUTOCONF
-
-rm -rf aclocal.m4 autom4te.cache
-
-# Run the stuff.
-(set -x && $ACLOCAL $ACLOCAL_FLAGS)
-(set -x && $AUTOCONF)
-(set -x && $AUTOHEADER)
-(set -x && $AUTOMAKE -a -c)
-
-# Run configure.
-./configure "$@"
+echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
+echo "Running autoheader..." ; autoheader || exit 1
+echo "Running autoconf..." ; autoconf || exit 1
+echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
+
+if [ -z "$NOCONFIGURE" ]; then
+       ./configure "$@"
+fi




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to