don't use #error in configure test programs, some compilers (such as SGI mipsPro) treat it as a non-fatal warning

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-08-22 20:22:21 +00:00
parent 1bc4db11b1
commit dd6abbacb9

View File

@@ -2178,7 +2178,7 @@ if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
AC_TRY_COMPILE([#include <features.h>], AC_TRY_COMPILE([#include <features.h>],
[ [
#if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1) #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
#error not glibc2.1 not glibc 2.1
#endif #endif
], ],
[ [
@@ -2774,7 +2774,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
], ],
[ [
#if !GTK_CHECK_VERSION(2,4,0) #if !GTK_CHECK_VERSION(2,4,0)
#error "Not GTK+ 2.4" Not GTK+ 2.4
#endif #endif
], ],
[ [
@@ -3140,7 +3140,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
], ],
[ [
#if XmVersion < 2000 #if XmVersion < 2000
#error "Not Motif 2" Not Motif 2
#endif #endif
], ],
[ [
@@ -3158,7 +3158,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
], ],
[ [
#if !defined(LesstifVersion) || LesstifVersion <= 0 #if !defined(LesstifVersion) || LesstifVersion <= 0
#error "Not Lesstif" Not Lesstif
#endif #endif
], ],
[ [
@@ -6823,7 +6823,7 @@ else
AC_MSG_CHECKING([if this GCC version is >= 4.0 and needs -DNO_GCC_PRAGMA]) AC_MSG_CHECKING([if this GCC version is >= 4.0 and needs -DNO_GCC_PRAGMA])
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
[#if (__GNUC__ < 4) [#if (__GNUC__ < 4)
#error "Not GCC 4.0 or greater" Not GCC 4.0 or greater
#endif #endif
], ],
[GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA" [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
@@ -6848,7 +6848,7 @@ else
AC_MSG_CHECKING([if this MinGW version needs -DNO_GCC_PRAGMA]) AC_MSG_CHECKING([if this MinGW 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" Not GCC 3.2 or greater
#endif #endif
], ],
[GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA" [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
@@ -6864,7 +6864,7 @@ else
AC_MSG_CHECKING([if this gcc version needs -DNO_GCC_PRAGMA]) 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" Not GCC 3.2 or greater
#endif #endif
], ],
[GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA" [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"