Alexandre Julliard : configure: Define WINE_CROSSTEST when building crosstests, and disable use of config. h in that case.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5d2b8e77d29d981e14fed7119c42eafe957abb88
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5d2b8e77d29d981e14fed7119c...

Author: Alexandre Julliard 
Date:   Thu Apr  8 17:29:11 2010 +0200

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 77cf558..0f9c02a 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 7d9031d..f39347e 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 29e711c..0faf127 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 */