fixed wxUSE_XML

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

diff --git a/configure b/configure
index e3a162a23aac17cb70e58dbfa59c371d3b61432f..565b4672c0455adda9f186d2580fce2472aecf66 100755 (executable)
--- a/configure
+++ b/configure
@@ -34906,9 +34906,16 @@ int
 main ()
 {
 
 main ()
 {
 

-                    #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.in b/configure.in
index 7e91dc9a5db494c4e286061ad54175c81f7b016a..1c445a06e22f33fdb68587d9ff206cd66df93d76 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2107,7 +2107,7 @@ dnl Check for expat libraries
 dnl ------------------------------------------------------------------------
 
 if test "$wxUSE_EXPAT" != "no"; then
 dnl ------------------------------------------------------------------------
 
 if test "$wxUSE_EXPAT" != "no"; then

-    wxUSE_XML=1
+    wxUSE_XML=yes

     AC_DEFINE(wxUSE_EXPAT)
     AC_DEFINE(wxUSE_XML)
     
     AC_DEFINE(wxUSE_EXPAT)
     AC_DEFINE(wxUSE_XML)