diff options
| author | Martin Willi <martin@revosec.ch> | 2012-07-03 16:45:12 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-07-11 09:57:07 +0200 |
| commit | 7300eb29d10ca69d998bb09a4c435d86ebd95327 (patch) | |
| tree | 8017012757a46557d5851edd8b698172666b250a | |
| parent | a4037686c7b8c9e6e8223d363a79f5cbe2698be1 (diff) | |
| download | strongswan-7300eb29d10ca69d998bb09a4c435d86ebd95327.tar.bz2 strongswan-7300eb29d10ca69d998bb09a4c435d86ebd95327.tar.xz | |
Use and install a config.h AC_CONFIG_HEADER that contains all AC_DEFINE results
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rwxr-xr-x | autogen.sh | 1 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | src/libstrongswan/.gitignore | 3 |
5 files changed, 13 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index cadfdc55d..34d3ee667 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ autom4te.cache config.guess config.sub configure +config.h.in +config.h +stamp-h1 depcomp install-sh ltmain.sh diff --git a/Makefile.am b/Makefile.am index a142c1c5f..b236f7667 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,6 +11,9 @@ CLEANFILES = Doxyfile BUILT_SOURCES = Android.mk MAINTAINERCLEANFILES = Android.mk +config_includedir = $(ipseclibdir)/include +nodist_config_include_HEADERS = config.h + Android.mk : Android.mk.in configure.in sed \ -e "s:\@PACKAGE_VERSION\@:$(PACKAGE_VERSION):" \ diff --git a/autogen.sh b/autogen.sh index 8927a0e49..2934552ed 100755 --- a/autogen.sh +++ b/autogen.sh @@ -12,6 +12,7 @@ case "$LIBTOOLIZE" in ;; esac +autoheader && $LIBTOOLIZE --force && aclocal && automake -a && diff --git a/configure.in b/configure.in index cee2bb53b..51ce46bc2 100644 --- a/configure.in +++ b/configure.in @@ -19,6 +19,7 @@ dnl =========================== AC_INIT(strongSwan,5.0.0) AM_INIT_AUTOMAKE(tar-ustar) AC_CONFIG_MACRO_DIR([m4/config]) +AC_CONFIG_HEADERS([config.h]) PKG_PROG_PKG_CONFIG dnl ================================= @@ -782,6 +783,8 @@ if test x$integrity_test = xtrue; then ) fi +CFLAGS="$CFLAGS -include `pwd`/config.h" + dnl ============================================== dnl collect plugin list for strongSwan components dnl ============================================== diff --git a/src/libstrongswan/.gitignore b/src/libstrongswan/.gitignore index 48a8d1d38..a066919ec 100644 --- a/src/libstrongswan/.gitignore +++ b/src/libstrongswan/.gitignore @@ -1 +1,4 @@ oid.[ch] +config.h +config.h.in +stamp-h1 |