expat must be added to the template, not generated wxWindows.dsp

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 1c445a06e22f33fdb68587d9ff206cd66df93d76..5ac745776ecda424d6d4fbcfadf6b731191425c7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1309,7 +1309,10 @@ AC_PROG_RANLIB
 
 dnl ar command
 dnl   defines AR with the appropriate command
-AC_CHECK_PROG(AR, ar, ar, ar)
+AC_CHECK_PROG(AR, ar, ar)
+if test "x$AR" = "x" ; then
+    AC_MSG_ERROR([ar is needed to build wxWindows])
+fi
 
 dnl install checks
 dnl   defines INSTALL with the appropriate command
@@ -5661,10 +5664,16 @@ else
             dnl pragmas:
             CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
             ;;
-        *)
-            ;;
     esac
 fi
+dnl We have to output NO_GCC_PRAGMA with wx-config on Apple, too:
+case "${host}" in
+    powerpc-*-darwin* )
+        dnl Some Apple's GCC version are broken and can't handle the
+        dnl pragmas:
+        CODE_GEN_FLAGS_CXX="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS_CXX"
+        ;;
+esac
 
 
 dnl for convenience, sort the samples in alphabetical order