new MinGW requires NO_GCC_PRAGMA for exceptions handling, too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index e1d3e30cfb9e393540cab701b404f4464de5a0e3..57ca46e300118779fdfde094c1e4608fd02b285a 100755 (executable)
--- a/configure
+++ b/configure
@@ -40364,14 +40364,10 @@ fi
 
 
 
 
 
 

-
-
-

 BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.4"
 
 
 
 BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.4"
 
 
 

-

     # Check whether --enable-precomp-headers or --disable-precomp-headers was given.
 if test "${enable_precomp_headers+set}" = set; then
   enableval="$enable_precomp_headers"
     # Check whether --enable-precomp-headers or --disable-precomp-headers was given.
 if test "${enable_precomp_headers+set}" = set; then
   enableval="$enable_precomp_headers"


@@ -41722,9 +41718,11 @@ else
             CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
             ;;
         *-*-mingw32* )
             CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
             ;;
         *-*-mingw32* )

-                                                            if test "$wxUSE_STL" = "yes"; then
-               echo "$as_me:$LINENO: checking If this MinGW version needs -DNO_GCC_PRAGMA" >&5
-echo $ECHO_N "checking If this MinGW version needs -DNO_GCC_PRAGMA... $ECHO_C" >&6
+                                                                                    if test "$wxUSE_STL" = "yes" -o \
+                    "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
+                    "$wxUSE_NO_RTTI" != "yes"; then
+               echo "$as_me:$LINENO: checking if this MinGW version needs -DNO_GCC_PRAGMA" >&5
+echo $ECHO_N "checking if this MinGW version needs -DNO_GCC_PRAGMA... $ECHO_C" >&6

                cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
                cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -41735,7 +41733,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
 int
 main ()
 {

-#if !(__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
+#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))

                                #error "Not GCC 3.2 or greater"
                                #endif
 
                                #error "Not GCC 3.2 or greater"
                                #endif
 

diff --git a/configure.in b/configure.in
index a842cec1fd90582c54328bb450d4af79d82561df..918e6db1b65289e1c0901aaab60ac14c20ed8f9b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6060,12 +6060,16 @@ else
         *-*-mingw32* )
             dnl MinGW GCC versions >= 3.2 have problems with
             dnl static member of classes derived from templates
         *-*-mingw32* )
             dnl MinGW GCC versions >= 3.2 have problems with
             dnl static member of classes derived from templates

-            dnl in combination with #pragme interface/implementation
+            dnl in combination with #pragma interface/implementation

             dnl (the test case uses 4 files)
             dnl (the test case uses 4 files)

-            if test "$wxUSE_STL" = "yes"; then
-               AC_MSG_CHECKING([If this MinGW version needs -DNO_GCC_PRAGMA])
+            dnl ... and with exceptions handling (undefined symbols needed
+            dnl to correctly calls dtors when unwinding) as well
+            if test "$wxUSE_STL" = "yes" -o \
+                    "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
+                    "$wxUSE_NO_RTTI" != "yes"; then
+               AC_MSG_CHECKING([if this MinGW version needs -DNO_GCC_PRAGMA])

                AC_TRY_COMPILE([],
                AC_TRY_COMPILE([],

-                              [#if !(__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
+                              [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))

                                #error "Not GCC 3.2 or greater"
                                #endif
                                ],
                                #error "Not GCC 3.2 or greater"
                                #endif
                                ],