From 972b5d7045e4bc12c2e3d8284ab60e40329cf1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 13 Sep 2008 20:09:08 +0200
Subject: [PATCH] Include <config.h> in standalone tests.

* test-suite/standalone/Makefile.am (test_cflags): Add `-I$(top_builddir)' so
  that <config.h> can be found.
  (snarfcppopts): Likewise.

* test-suite/standalone/*.c: Include <config.h>.
---
 test-suite/standalone/Makefile.am              | 12 +++++++-----
 test-suite/standalone/test-asmobs-lib.c        |  4 ++++
 test-suite/standalone/test-gh.c                |  4 ++++
 test-suite/standalone/test-list.c              |  4 ++++
 test-suite/standalone/test-num2integral.c      |  4 ++++
 test-suite/standalone/test-with-guile-module.c |  4 ++++
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am
index 9af6a17a5..dd2f3e724 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -30,15 +30,17 @@ EXTRA_DIST =
 
 TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
 
-test_cflags = \
-  -I$(top_srcdir)/test-suite/standalone \
-  -I$(top_srcdir) \
+test_cflags =					\
+  -I$(top_srcdir)/test-suite/standalone		\
+  -I$(top_srcdir) -I$(top_builddir)		\
   $(EXTRA_DEFS) $(GUILE_CFLAGS)
 
 AM_LDFLAGS = $(GUILE_CFLAGS)
 
-snarfcppopts = \
-  $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(CFLAGS) -I$(top_srcdir)
+snarfcppopts =						\
+  $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(CFLAGS)	\
+  -I$(top_srcdir) -I$(top_builddir)
+
 SUFFIXES = .x
 .c.x:
 	${top_builddir}/libguile/guile-snarf -o $@ $< $(snarfcppopts)
diff --git a/test-suite/standalone/test-asmobs-lib.c b/test-suite/standalone/test-asmobs-lib.c
index 88cf847c5..b85f923cd 100644
--- a/test-suite/standalone/test-asmobs-lib.c
+++ b/test-suite/standalone/test-asmobs-lib.c
@@ -15,6 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <libguile.h>
 
 long asmob000;
diff --git a/test-suite/standalone/test-gh.c b/test-suite/standalone/test-gh.c
index 4d91cce41..6eea62511 100644
--- a/test-suite/standalone/test-gh.c
+++ b/test-suite/standalone/test-gh.c
@@ -17,6 +17,10 @@
 
 /* some bits originally by Jim Blandy <jimb@red-bean.com> */
 
+#ifndef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <libguile.h>
 #include <libguile/gh.h>
 
diff --git a/test-suite/standalone/test-list.c b/test-suite/standalone/test-list.c
index 3396dff83..02634f676 100644
--- a/test-suite/standalone/test-list.c
+++ b/test-suite/standalone/test-list.c
@@ -17,6 +17,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <libguile.h>
 
 #include <stdio.h>
diff --git a/test-suite/standalone/test-num2integral.c b/test-suite/standalone/test-num2integral.c
index d2de418e9..1e8a016d5 100644
--- a/test-suite/standalone/test-num2integral.c
+++ b/test-suite/standalone/test-num2integral.c
@@ -15,6 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <libguile.h>
 
 #include <stdio.h>
diff --git a/test-suite/standalone/test-with-guile-module.c b/test-suite/standalone/test-with-guile-module.c
index 14d3afdc7..babc22b22 100644
--- a/test-suite/standalone/test-with-guile-module.c
+++ b/test-suite/standalone/test-with-guile-module.c
@@ -15,6 +15,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <pthread.h>
 #include <libguile.h>