added wxRecursionGuard

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index cbed6ad44276412d1145cceca9eb8eb09cd38f0e..ed2a157a4d8ee451215f9c6c69a4101f63544561 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -140,6 +140,7 @@ DEFAULT_DEFAULT_wxUSE_X11=0
 PROGRAM_EXT=
 SO_SUFFIX=so
 SAMPLES_RPATH_FLAG=
+SAMPLES_RPATH_POSTLINK=
 
 dnl to support a new system, you need to add its canonical name (as determined
 dnl by config.sub or specified by the configure command line) to this "case"
@@ -2106,7 +2107,7 @@ dnl Check for expat libraries
 dnl ------------------------------------------------------------------------
 
 if test "$wxUSE_EXPAT" != "no"; then
-    wxUSE_XML=1
+    wxUSE_XML=yes
     AC_DEFINE(wxUSE_EXPAT)
     AC_DEFINE(wxUSE_XML)
     
@@ -3105,7 +3106,7 @@ if test "$wxUSE_SHARED" = "yes"; then
     case "${host}" in
       *-*-linux* | *-*-gnu* )
         SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
-      ;;
+       ;;
 
       *-*-solaris2* )
         if test "$GCC" = yes ; then
@@ -3144,6 +3145,21 @@ if test "$wxUSE_SHARED" = "yes"; then
             SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
         fi
       ;;
+      
+      powerpc-*-darwin* )
+        SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+        cat <<EOF >change-install-names
+#!/bin/sh
+libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
+inst_cmd="install_name_tool "
+for i in \${libnames} ; do
+    inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
+done
+\${inst_cmd} \${3}
+EOF
+        chmod +x change-install-names
+      ;;
+      
     esac
 
     dnl set target to shared if not explicitly chose static before
@@ -5629,11 +5645,33 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [[A-Z]] [[a-z]]`
 AC_SUBST(TOOLKIT_LOWERCASE)
 AC_SUBST(TOOLKIT_VERSION)
 AC_SUBST(SAMPLES_RPATH_FLAG)
+AC_SUBST(SAMPLES_RPATH_POSTLINK)
 AC_SUBST(HOST_SUFFIX)
 
 AC_BAKEFILE
 
 
+dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
+if test $GCC_PCH = 1 ; then
+    CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
+else
+    case "${host}" in
+        powerpc-*-darwin* )
+            dnl Some Apple's GCC version are broken and can't handle the
+            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
 dnl