Also, doesn't this break with ./autogen --prefix=/usr for example? Now that the first parameter is re-purposed as the path, and dirname doesn't work (fail) when called like: 'dirname --prefix=/usr'.
On 22/09/14 13:50, Tom Hacohen wrote: > Maybe I'm wrong, but it looks like the format is: > ./autogen.sh build_dir > but after that we use $@ for the parameter passing to configure. Doesn't > that mean we are also passing the first argument which is the build_dir > which is definitely not what configure is expecting? > Or in other words, cedric, please tell me you tested it before accepting. > > Furthermore, commit message doesn't follow guidelines (some lines are > too long), and it would have been better if the commit hasn't changed > all of the files un-neededly, making the diff impossible to read and follow. > > On 22/09/14 13:38, Srivardhan Hebbar wrote: >> cedric pushed a commit to branch master. >> >> http://git.enlightenment.org/core/elementary.git/commit/?id=c2ac7986ed1f9209352f646b2e637bd0e2582f73 >> >> commit c2ac7986ed1f9209352f646b2e637bd0e2582f73 >> Author: Srivardhan Hebbar <sri.heb...@samsung.com> >> 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 <sri.heb...@samsung.com> >> >> Reviewers: raster, cedric >> >> Differential Revision: https://phab.enlightenment.org/D1395 >> >> Signed-off-by: Cedric BAIL <ced...@osg.samsung.com> >> --- >> 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 >> > > > > ------------------------------------------------------------------------------ > Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer > Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports > Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper > Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer > http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk > _______________________________________________ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ------------------------------------------------------------------------------ Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
