Re: i18n broken on mingw cross compile

[Ludovic Courtès]

Hi,

Han-Wen Nienhuys <address@hidden> writes:

> As a review comment: is there a specific reason to do HAVE_CONFIG_H ?  In 
> what case do we not HAVE_CONFIG_H ?

Yes, when `AC_CONFIG_HEADERS' isn't used.  It's correct Autoconf
practice to check for `HAVE_CONFIG_H'.

> Ludovic Courtès escreveu:

>> Can you please restart from there and report back?
>
>                  from ../../libguile/scmconfig.h:25,
>                  from 
> /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/libguile/__scm.h:52,
>                  from 
> /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/libguile.h:30,
>                  from 
> /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/test-suite/standalone/test-asmobs-lib.c:18:
> ../../lib/time.h:76: error: expected ';', ',' or ')' before '__timer'
> ../../lib/time.h:78: error: expected ';', ',' or ')' before '__timer'
> make[4]: ** [libtest_asmobs_la-test-asmobs-lib.lo] Erro 1
> make[4]: Saindo do diretório `/home/lilydev/vc/gub/target/mingw/build/gui

Of course, I had forgotten the tests.

I'm sure we're almost done now.  :-)

Thanks,
Ludo'.

>From 3394818c0a465c8b337252250174ecb0d13d726d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ludovic=20Court=C3=A8s?= <address@hidden>
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              |    4 ++--
 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, 22 insertions(+), 2 deletions(-)

diff --git a/test-suite/standalone/Makefile.am 
b/test-suite/standalone/Makefile.am
index adbe0c8..212fbca 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -32,7 +32,7 @@ TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
 
 test_cflags =                                  \
   -I$(top_srcdir)/test-suite/standalone                \
-  -I$(top_srcdir)                              \
+  -I$(top_srcdir) -I$(top_builddir)            \
   -I$(top_srcdir)/lib -I$(top_builddir)/lib    \
   $(EXTRA_DEFS) $(GUILE_CFLAGS) $(GCC_CFLAGS)
 
@@ -40,7 +40,7 @@ AM_LDFLAGS = $(GUILE_CFLAGS)
 
 snarfcppopts =                                                         \
   $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(CFLAGS) -I$(top_srcdir)    \
-  -I$(top_srcdir)/lib -I$(top_builddir)/lib
+  -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_builddir)
 
 SUFFIXES = .x
 .c.x:
diff --git a/test-suite/standalone/test-asmobs-lib.c 
b/test-suite/standalone/test-asmobs-lib.c
index 88cf847..b85f923 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 b273b44..9f1601a 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 <address@hidden> */
 
+#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 3396dff..02634f6 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 d2de418..1e8a016 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 14d3afd..babc22b 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>
 
-- 
1.6.0