From f6deda85ef4f28426c09fab7205f274922af3d96 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Fri, 1 Mar 2013 18:24:23 +0100 Subject: current mingw headers don't have fMergeNeutralItems Reported upstream by Kendy (r5626), for now do not use the field if not present, seems to be not that important. --- configure.ac | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index de10a0e20511..5b503c931310 100644 --- a/configure.ac +++ b/configure.ac @@ -5350,6 +5350,23 @@ using namespace std; AC_SUBST(MINGW_GXXDLL) fi +if test "$WITH_MINGW" = "yes"; then + AC_MSG_CHECKING([for fMergeNeutralItems in SCRIPT_CONTROL]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + #include + ], + [ + SCRIPT_CONTROL c; + c.fMergeNeutralItems = 1; + ])], + [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_FMERGENEUTRALITEMS) + ], + [AC_MSG_RESULT(no)]) +fi + dnl =================================================================== dnl Extra checking for the SunOS compiler dnl =================================================================== @@ -11842,6 +11859,7 @@ AC_CONFIG_FILES([solenv/inc/minor.mk.tmp:solenv/inc/minor.mk.in], AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_global.h]) AC_CONFIG_HEADERS([config_host/config_graphite.h]) +AC_CONFIG_HEADERS([config_host/config_mingw.h]) AC_CONFIG_HEADERS([config_host/config_telepathy.h]) AC_CONFIG_HEADERS([config_host/config_typesizes.h]) AC_CONFIG_HEADERS([config_host/config_vclplug.h]) -- cgit