From c96a37267efd57cddf7a30f472f9e56f2ecddddc Mon Sep 17 00:00:00 2001
From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Thu, 8 Oct 2009 16:40:15 -0400
Subject: [PATCH 1/1] move config.h to urcu/config.h and install it

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
---
 Makefile.am       | 2 +-
 bootstrap         | 1 -
 configure.ac      | 2 +-
 tests/Makefile.am | 2 +-
 urcu/arch_ppc.h   | 2 +-
 urcu/arch_s390.h  | 2 +-
 urcu/arch_x86.h   | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 28e414c..df67b1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_builddir)/urcu
 
 AM_LDFLAGS=-lpthread
 
-SUBDIRS = tests
+SUBDIRS = . tests
 
 include_HEADERS = urcu.h $(top_srcdir)/urcu-*.h
 nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \
diff --git a/bootstrap b/bootstrap
index c507425..530ec0a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -6,7 +6,6 @@ if [ ! -e config ]; then
 fi
 aclocal
 libtoolize --force --copy
-autoheader
 automake --add-missing --copy
 autoconf
 
diff --git a/configure.ac b/configure.ac
index 2c1b6c0..e7cc181 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AH_TEMPLATE([CONFIG_SMP], [Enable SMP support. With SMP support enabled, uniproc
 AH_TEMPLATE([CONFIG_HAVE_FENCE], [Defined when on a system that has memory fence
 instructions.])
 AH_TEMPLATE([CONFIG_HAVE_FUTEX], [Defined when on a system with futex support.])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([urcu/config.h])
 
 # Checks for programs.
 AC_PROG_CC
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fdc82b1..748e770 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 AM_LDFLAGS=-lpthread
-AM_CFLAGS=-I$(top_srcdir)
+AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir)
 
 noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \
         test_rwlock_timing test_rwlock test_perthreadlock_timing \
diff --git a/urcu/arch_ppc.h b/urcu/arch_ppc.h
index 40a4359..2f9460b 100644
--- a/urcu/arch_ppc.h
+++ b/urcu/arch_ppc.h
@@ -23,7 +23,7 @@
  */
 
 #include <urcu/compiler.h>
-#include "config.h"
+#include <urcu/config.h>
 
 #define CONFIG_HAVE_FENCE 1
 #define CONFIG_HAVE_MEM_COHERENCY
diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index 1a43c6c..aec91b9 100644
--- a/urcu/arch_s390.h
+++ b/urcu/arch_s390.h
@@ -29,7 +29,7 @@
  */
 
 #include <compiler.h>
-#include "config.h"
+#include <config/config.h>
 
 #define CONFIG_HAVE_MEM_COHERENCY
 
diff --git a/urcu/arch_x86.h b/urcu/arch_x86.h
index 7d3d76d..a72ef06 100644
--- a/urcu/arch_x86.h
+++ b/urcu/arch_x86.h
@@ -23,7 +23,7 @@
  */
 
 #include <urcu/compiler.h>
-#include "config.h"
+#include <urcu/config.h>
 
 #define CONFIG_HAVE_MEM_COHERENCY
 
-- 
2.34.1