cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=c2ac7986ed1f9209352f646b2e637bd0e2582f73
commit c2ac7986ed1f9209352f646b2e637bd0e2582f73 Author: Srivardhan Hebbar <[email protected]> Date: Mon Sep 22 14:37:57 2014 +0200 autotools: modified autogen.sh to be able to build from different directory. Summary: Right now we cannot have a designated build directory and we should build in the source directory. So the proposed solution lets you to build from any directory. Signed-off-by: Srivardhan Hebbar <[email protected]> Reviewers: raster, cedric Differential Revision: https://phab.enlightenment.org/D1395 Signed-off-by: Cedric BAIL <[email protected]> --- autogen.sh | 77 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/autogen.sh b/autogen.sh index b814903..d7ab123 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,40 +1,47 @@ #!/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 +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. +( + cd "$srcdir" && + ( + 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 +) if [ -z "$NOCONFIGURE" ]; then - ./configure -C "$@" + $srcdir/configure -C "$@" fi --
