summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Friloux <guillaume.friloux@gmail.com>2013-12-12 09:10:34 +0100
committerGuillaume Friloux <guillaume.friloux@gmail.com>2013-12-12 09:10:34 +0100
commitbe52045f38cae47545abf927fd0038cd5d5202f8 (patch)
tree11d7a09f8b56c02c011782d133b3109118f26b10
parent7f52bcb2d804a2f6df924f0174ef106362c55533 (diff)
Changing build a bit
But a rewrite will be needed to get it clearer and faster.
-rw-r--r--Makefile.am8
-rwxr-xr-xautogen.sh41
-rw-r--r--configure.ac22
3 files changed, 58 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index 8a2a527..6cfd95b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,8 @@ m4/po.m4 \
44m4/progtest.m4 \ 44m4/progtest.m4 \
45m4/stdint_h.m4 \ 45m4/stdint_h.m4 \
46m4/uintmax_t.m4 \ 46m4/uintmax_t.m4 \
47m4/ulonglong.m4 47m4/ulonglong.m4 \
48 48debian/files \
49 49debian/smman.debhelper.log \
50debian/smman.substvars \
51debian/stamp*
diff --git a/autogen.sh b/autogen.sh
index 6a54b9b..aaaa004 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,41 @@
1#!/bin/sh 1#!/bin/sh
2 2
3mkdir m4 2>/dev/null 1>&2 3#!/bin/sh
4
5rm -rf autom4te.cache
6rm -f aclocal.m4 ltmain.sh
7
8touch README
9touch ABOUT-NLS
10
11echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
12echo "Running autoconf..." ; autoconf || exit 1
13echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
14echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
15
16W=0
17
18rm -f config.cache-env.tmp
19echo "OLD_PARM=\"$@\"" >> config.cache-env.tmp
20echo "OLD_CFLAGS=\"$CFLAGS\"" >> config.cache-env.tmp
21echo "OLD_PATH=\"$PATH\"" >> config.cache-env.tmp
22echo "OLD_PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\"" >> config.cache-env.tmp
23echo "OLD_LDFLAGS=\"$LDFLAGS\"" >> config.cache-env.tmp
4 24
5autoreconf -f -i 25cmp config.cache-env.tmp config.cache-env >> /dev/null
6if [ $? -eq 0 ]; then 26if [ $? -ne 0 ]; then
7 ./configure 27 W=1;
8fi 28fi
29
30if [ $W -ne 0 ]; then
31 echo "Cleaning configure cache...";
32 rm -f config.cache config.cache-env
33 mv config.cache-env.tmp config.cache-env
34else
35 rm -f config.cache-env.tmp
36fi
37
38if [ -z "$NOCONFIGURE" ]; then
39 ./configure -C "$@"
40fi
41
diff --git a/configure.ac b/configure.ac
index 32333d9..e6e8ae9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,10 @@
1m4_define([v_rev], m4_esyscmd([(svnversion "." | grep -v exported || echo 0) | tr -d ' MSP\n'])) 1m4_define([v_maj], [1])
2m4_define([v_min], [0])
3m4_define([v_mic], [1])
4m4_define([v_ver], [v_maj.v_min.v_mic])
2 5
3AC_INIT([Smman], [1.0], [guillaume.friloux@asp64.com]) 6
7AC_INIT([Smman], [v_ver], [guillaume.friloux@aspfrance.com])
4 8
5AC_PREREQ(2.01) 9AC_PREREQ(2.01)
6AC_CONFIG_SRCDIR([configure.ac]) 10AC_CONFIG_SRCDIR([configure.ac])
@@ -13,12 +17,14 @@ AC_PROG_LIBTOOL
13AC_CONFIG_MACRO_DIR([m4]) 17AC_CONFIG_MACRO_DIR([m4])
14 18
15dnl we just have set the version info, then: 19dnl we just have set the version info, then:
16version_number=1.0 20version_number=v_ver
17revision_number="v_rev"
18AC_SUBST(version_number) 21AC_SUBST(version_number)
19AC_SUBST(revision_number)
20 22
23GCC_STACK_PROTECT_LIB
24GCC_STACK_PROTECT_CC
21AC_PROG_CC 25AC_PROG_CC
26AM_PROG_CC_C_O
27AC_PROG_MKDIR_P
22 28
23AC_CONFIG_FILES([ 29AC_CONFIG_FILES([
24Makefile 30Makefile
@@ -44,7 +50,11 @@ echo
44echo " eina.........: ${have_eina}" 50echo " eina.........: ${have_eina}"
45echo " ecore........: ${have_ecore}" 51echo " ecore........: ${have_ecore}"
46echo " curl.........: ${have_curl}" 52echo " curl.........: ${have_curl}"
47echo
48echo " prefix.......: $prefix" 53echo " prefix.......: $prefix"
49echo 54echo
55echo "Build Options:"
56echo " CPPFLAGS.....: $CPPFLAGS"
57echo " CFLAGS.......: $CFLAGS"
58echo " LDFLAGS......: $LDFLAGS"
59echo
50 60