Use and install a config.h AC_CONFIG_HEADER that contains all AC_DEFINE results

diff --git a/.gitignore b/.gitignore
index cadfdc55dc0b03ba9e76770e37441d93306fa1be..34d3ee667ff1a8e75db7bebcc4e7dd5a8de7c362 100644 (file)
--- 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 a142c1c5f003520ee5537d613943e8f820e8d518..b236f7667ca21d1925a604d19192094b5408c308 100644 (file)
--- 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 8927a0e4967cf7e9950d3cd5645b9206a93f99ae..2934552ed0daa9342b4f5587d8414164a9b6dcd9 100755 (executable)
--- 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 cee2bb53b053218649a04198ec2bbd2b4d2c76a9..51ce46bc21375bca2eb03fe6a6dbae93d7332b0a 100644 (file)
--- 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 48a8d1d3853e8675e2788c13ac8d2f910fb776d5..a066919ecab74a941265ae106bf956ebae52aa9e 100644 (file)
--- a/src/libstrongswan/.gitignore
+++ b/src/libstrongswan/.gitignore
@@ -1 +1,4 @@
 oid.[ch]
+config.h
+config.h.in
+stamp-h1