precompiled headers check accounts for Apple compiler now

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

diff --git a/aclocal.m4 b/aclocal.m4
index fedb14b8b3fd67d635440421d6497603a69e116f..e7d0b3fb5995b4a780cfb03650b4b1bc622a9ad1 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1653,9 +1653,16 @@ AC_DEFUN(AC_BAKEFILE_PRECOMP_HEADERS,
             AC_MSG_CHECKING([if the compiler supports precompiled headers])
             AC_TRY_COMPILE([],
                 [
             AC_MSG_CHECKING([if the compiler supports precompiled headers])
             AC_TRY_COMPILE([],
                 [

-                    #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) || \
-                        (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
-                            #error "no pch support"
+                    #if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
+                        #error "no pch support"
+                    #endif
+                    #if (__GNUC__ < 3)
+                        #error "no pch support"
+                    #endif
+                    #if (__GNUC__ == 3) && \
+                       ((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \
+                       ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3)))
+                        #error "no pch support"

                     #endif
                 ],
                 [
                     #endif
                 ],
                 [

diff --git a/configure b/configure
index 3bce909f2da066d6245a6b3b54f6d10d64bf89ae..e3a162a23aac17cb70e58dbfa59c371d3b61432f 100755 (executable)
--- a/configure
+++ b/configure
@@ -19289,7 +19289,7 @@ fi
 
 
 if test "$wxUSE_EXPAT" != "no"; then
 
 
 if test "$wxUSE_EXPAT" != "no"; then

-    wxUSE_XML=1
+    wxUSE_XML=yes

     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_EXPAT 1
 _ACEOF
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_EXPAT 1
 _ACEOF


@@ -34880,6 +34880,8 @@ fi
 
 
 
 
 
 

+
+

     # 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"