compilation fix

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 3bce909f2da066d6245a6b3b54f6d10d64bf89ae..9a707790b243f8d718890dbfbdb6925088822820 100755 (executable)
--- a/configure
+++ b/configure
@@ -11362,7 +11362,6 @@ do
 done
 done
 
 done
 done
 

-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"

 fi
 fi
 AR=$ac_cv_prog_AR
 fi
 fi
 AR=$ac_cv_prog_AR


@@ -11374,6 +11373,11 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

+if test "x$AR" = "x" ; then
+    { { echo "$as_me:$LINENO: error: ar is needed to build wxWindows" >&5
+echo "$as_me: error: ar is needed to build wxWindows" >&2;}
+   { (exit 1); exit 1; }; }
+fi

 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or


@@ -19289,7 +19293,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


@@ -34904,9 +34908,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
 
   ;


@@ -35445,10 +35456,13 @@ else
         powerpc-*-darwin* )
                                     CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
             ;;
         powerpc-*-darwin* )
                                     CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
             ;;

-        *)
-            ;;

     esac
 fi
     esac
 fi

+case "${host}" in
+    powerpc-*-darwin* )
+                        CODE_GEN_FLAGS_CXX="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS_CXX"
+        ;;
+esac

 
 
 SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
 
 
 SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"