From 90f0ac4b6b254975cd8932593ba0d660e8a85527 Mon Sep 17 00:00:00 2001 From: Srivardhan Hebbar Date: Mon, 22 Sep 2014 14:37:57 +0200 Subject: [PATCH] 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 Reviewers: raster, cedric Differential Revision: https://phab.enlightenment.org/D1395 Signed-off-by: Cedric BAIL --- legacy/elementary/autogen.sh | 65 ++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/legacy/elementary/autogen.sh b/legacy/elementary/autogen.sh index b814903b86..d7ab12330f 100755 --- a/legacy/elementary/autogen.sh +++ b/legacy/elementary/autogen.sh @@ -1,40 +1,47 @@ #!/bin/sh -rm -rf autom4te.cache -rm -f aclocal.m4 ltmain.sh +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 + 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 + 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 + 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 + 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 + 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 [ $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