From 5d2b8e77d29d981e14fed7119c42eafe957abb88 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard <julliard@winehq.org> Date: Thu, 8 Apr 2010 17:29:11 +0200 Subject: [PATCH] configure: Define WINE_CROSSTEST when building crosstests, and disable use of config.h in that case. --- Make.rules.in | 2 +- configure.ac | 4 +++- include/config.h.in | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 77cf55800d8..0f9c02a6f5e 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -143,7 +143,7 @@ filter: dummy $(CC) -c $(ALLCFLAGS) -o $@ $< .c.cross.o: - $(CROSSCC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) -o $@ $< + $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< .y.tab.c: $(BISON) $(BISONFLAGS) -p $*_ -o $@ $< diff --git a/configure.ac b/configure.ac index 7d9031d283b..f39347ed1c9 100644 --- a/configure.ac +++ b/configure.ac @@ -2160,7 +2160,9 @@ esac dnl **** Generate output files **** -AH_TOP([#define __WINE_CONFIG_H]) +AH_TOP([#ifndef WINE_CROSSTEST +#define __WINE_CONFIG_H]) +AH_BOTTOM([#endif /* WINE_CROSSTEST */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) diff --git a/include/config.h.in b/include/config.h.in index 29e711c90e0..0faf127db60 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1,5 +1,6 @@ /* include/config.h.in. Generated from configure.ac by autoheader. */ +#ifndef WINE_CROSSTEST #define __WINE_CONFIG_H /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ @@ -1307,3 +1308,5 @@ #ifndef __cplusplus #undef inline #endif + +#endif /* WINE_CROSSTEST */ -- GitLab