summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@gmail.com>2014-03-06 18:02:07 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-06 18:02:07 +0900
commit21fca3d12aab45438b5d3fac20309fbc4df1fbb3 (patch)
treed284e81a4fa96a88afa388d3d6722bae0fc8bf49
parent5d85fa3fe49f1dec2ccf2922702c7468ae102b2b (diff)
I modified autogen.sh to unify it with core/efl. I also changed the version of gettext and the way to use it in the configure.ac by doing the same way as in core/efl. I think this may reduce build errors (this was spotted by Thanatermesis in D205).
Summary: ...5). At least, this will improve homogeneity with core/efl. Reviewers: cedric, raster Differential Revision: https://phab.enlightenment.org/D552
-rwxr-xr-xautogen.sh35
-rw-r--r--configure.ac4
2 files changed, 4 insertions, 35 deletions
diff --git a/autogen.sh b/autogen.sh
index afd45e1..d265ba5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,39 +1,10 @@
1#!/bin/sh 1#!/bin/sh
2 2
3rm -rf autom4te.cache 3rm -rf autom4te.cache
4rm -f aclocal.m4 ltmain.sh 4rm -f aclocal.m4 ltmain.sh config.cache
5 5
6touch README 6autoreconf -vif
7
8echo "Running autopoint..." ; autopoint -f || :
9echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
10echo "Running autoheader..." ; autoheader || exit 1
11echo "Running autoconf..." ; autoconf || exit 1
12echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
13echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
14
15W=0
16
17rm -f config.cache-env.tmp
18echo "OLD_PARM=\"$@\"" >> config.cache-env.tmp
19echo "OLD_CFLAGS=\"$CFLAGS\"" >> config.cache-env.tmp
20echo "OLD_PATH=\"$PATH\"" >> config.cache-env.tmp
21echo "OLD_PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\"" >> config.cache-env.tmp
22echo "OLD_LDFLAGS=\"$LDFLAGS\"" >> config.cache-env.tmp
23
24cmp config.cache-env.tmp config.cache-env >> /dev/null
25if [ $? -ne 0 ]; then
26 W=1;
27fi
28
29if [ $W -ne 0 ]; then
30 echo "Cleaning configure cache...";
31 rm -f config.cache config.cache-env
32 mv config.cache-env.tmp config.cache-env
33else
34 rm -f config.cache-env.tmp
35fi
36 7
37if [ -z "$NOCONFIGURE" ]; then 8if [ -z "$NOCONFIGURE" ]; then
38 ./configure -C "$@" 9 exec ./configure -C "$@"
39fi 10fi
diff --git a/configure.ac b/configure.ac
index b526b92..59da418 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,9 +43,7 @@ AC_PROG_LIBTOOL
43##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 43##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
44##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 44##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
45 45
46m4_ifdef([AM_GNU_GETTEXT_VERSION], [ 46AM_GNU_GETTEXT_VERSION([0.17])
47 AM_GNU_GETTEXT_VERSION(0.18.1)
48],[])
49 47
50m4_ifdef([AM_GNU_GETTEXT], [ 48m4_ifdef([AM_GNU_GETTEXT], [
51 AM_GNU_GETTEXT([external]) 49 AM_GNU_GETTEXT([external])