Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separated MinGW and OS/2 specific tests for -DNO_GCC_PRAGMA since conditions

Browse Source 
are slightly different.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2004-11-28 19:38:11 +00:00
parent 937e42a324
commit 5bef7b5828
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
configure.in
View File

@@ -6162,8 +6162,8 @@ else
dnl pragmas: dnl pragmas:
GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA" GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
;; ;;
*-*-mingw32* | *-pc-os2_emx | *-pc-os2-emx ) *-*-mingw32* )
dnl MinGW and Innotek's GCC versions >= 3.2 have problems with dnl MinGW GCC versions >= 3.2 have problems with
dnl static member of classes derived from templates dnl static member of classes derived from templates
dnl in combination with #pragma interface/implementation dnl in combination with #pragma interface/implementation
dnl (the test case uses 4 files) dnl (the test case uses 4 files)
@@ -6172,7 +6172,23 @@ else
if test "$wxUSE_STL" = "yes" -o \ if test "$wxUSE_STL" = "yes" -o \
"$wxUSE_NO_EXCEPTIONS" != "yes" -o \ "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
"$wxUSE_NO_RTTI" != "yes"; then "$wxUSE_NO_RTTI" != "yes"; then
AC_MSG_CHECKING([if this compiler version needs -DNO_GCC_PRAGMA]) AC_MSG_CHECKING([if this MinGW version needs -DNO_GCC_PRAGMA])
AC_TRY_COMPILE([],
[#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
#error "Not GCC 3.2 or greater"
#endif
],
[GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])])
fi
;;
*-pc-os2_emx | *-pc-os2-emx )
dnl GCC versions ported to OS/2 have similar problems with
dnl static member of classes in combination with STL and
dnl pragma interface/implementation
if test "$wxUSE_STL" = "yes"; then
AC_MSG_CHECKING([if this gcc version needs -DNO_GCC_PRAGMA])
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
[#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)) [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
#error "Not GCC 3.2 or greater" #error "Not GCC 3.2 or greater"