From: Martin Willi <martin@revosec.ch>
Date: Tue, 3 Jul 2012 14:45:12 +0000 (+0200)
Subject: Use and install a config.h AC_CONFIG_HEADER that contains all AC_DEFINE results
X-Git-Tag: 5.0.1~445
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7300eb29d10ca69d998bb09a4c435d86ebd95327;p=thirdparty%2Fstrongswan.git

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

diff --git a/.gitignore b/.gitignore
index cadfdc55dc..34d3ee667f 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 a142c1c5f0..b236f7667c 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 8927a0e496..2934552ed0 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 cee2bb53b0..51ce46bc21 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 48a8d1d385..a066919eca 100644
--- a/src/libstrongswan/.gitignore
+++ b/src/libstrongswan/.gitignore
@@ -1 +1,4 @@
 oid.[ch]
+config.h
+config.h.in
+stamp-h1