>From 34323df112197162c2441ec248895814ea911c76 Mon Sep 17 00:00:00 2001 From: Volker Grabsch Date: Wed, 21 Apr 2010 18:36:30 +0200 Subject: [PATCH] fix gen-scmconfig for cross compiling --- libguile/Makefile.am | 2 +- libguile/gen-scmconfig.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libguile/Makefile.am b/libguile/Makefile.am index a841c9f..5b441ec 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -54,7 +54,7 @@ gen_scmconfig_SOURCES = gen-scmconfig.c ## For some reason, OBJEXT does not include the dot gen-scmconfig.$(OBJEXT): gen-scmconfig.c if [ "$(cross_compiling)" = "yes" ]; then \ - $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) -c -o $@ $<; \ + $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) -DBUILDING_LIBGUILE=1 -I$(top_srcdir) -I$(top_builddir) -c -o $@ $<; \ else \ $(COMPILE) -c -o $@ $<; \ fi diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c index 851578f..5a37c68 100644 --- a/libguile/gen-scmconfig.c +++ b/libguile/gen-scmconfig.c @@ -125,7 +125,6 @@ #include #include -#include #define pf printf @@ -145,6 +144,7 @@ main (int argc, char *argv[]) pf ("#include \n"); if (SCM_I_GSC_NEEDS_INTTYPES_H) pf ("#include \n"); + pf ("#include \n"); #ifdef HAVE_LIMITS_H pf ("#include \n"); @@ -423,11 +423,9 @@ main (int argc, char *argv[]) pf ("\n"); pf ("/* Constants from uniconv.h. */\n"); - pf ("#define SCM_ICONVEH_ERROR %d\n", (int) iconveh_error); - pf ("#define SCM_ICONVEH_QUESTION_MARK %d\n", - (int) iconveh_question_mark); - pf ("#define SCM_ICONVEH_ESCAPE_SEQUENCE %d\n", - (int) iconveh_escape_sequence); + pf ("#define SCM_ICONVEH_ERROR ((int) iconveh_error)\n"); + pf ("#define SCM_ICONVEH_QUESTION_MARK ((int) iconveh_question_mark)\n"); + pf ("#define SCM_ICONVEH_ESCAPE_SEQUENCE ((int) iconveh_escape_sequence)\n"); printf ("#endif\n"); -- 1.5.6.5