Make urcu/config.h work.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/bootstrap b/bootstrap
index 530ec0a04457638230e4153f969c285b95e7454b..c507425667e579d73a2a31c27b0e7a96baa4e8da 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -6,6 +6,7 @@ if [ ! -e config ]; then
 fi
 aclocal
 libtoolize --force --copy
+autoheader
 automake --add-missing --copy
 autoconf
 

diff --git a/configure.ac b/configure.ac
index be9fd72b499b7e9fef75d02da51ce01f93a8bbae..8c9ce5aa3edc9b6d76ed84de70c95c9516c804f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,10 +9,12 @@ AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AC_CONFIG_SRCDIR([urcu.h])
 
+AC_CONFIG_HEADERS([config.h urcu/config.h])
+
+# Keep at the end to do not pollute installed header.
 AH_TEMPLATE([CONFIG_URCU_SMP], [Enable SMP support. With SMP support enabled, uniprocessors are also supported. With SMP support disabled, UP systems work fine, but the behavior of SMP systems is undefined.])
 AH_TEMPLATE([CONFIG_URCU_HAVE_FENCE], [Defined when on a system that has memory fence instructions.])
 AH_TEMPLATE([CONFIG_URCU_HAVE_FUTEX], [Defined when on a system with futex support.])
-AC_CONFIG_HEADERS([urcu/config.h])
 
 # Checks for programs.
 AC_PROG_CC