raster pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=e3172d6796e019a2f68c0d7050a7d509c36fe63f
commit e3172d6796e019a2f68c0d7050a7d509c36fe63f Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sun Aug 3 09:26:51 2014 +0900 fix autogetn.sh for terminology for gettext so i've been having trouble building for the past while unless i git clean our build files etc. - it turned out to be the autogen.sh, so i'm using one that works from elm. :) --- autogen.sh | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index 6d9dc10..b814903 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,10 +3,38 @@ rm -rf autom4te.cache rm -f aclocal.m4 ltmain.sh -autoreconf --symlink --install || exit 1 +touch README +touch ABOUT-NLS -if [ -z "$NOCONFIGURE" ]; then - exec ./configure -C "$@" +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 -exit 0 +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 "$@" +fi --
