Allow wxWidgets to be built hosted on any architecture of Darwin.

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

diff --git a/configure b/configure
index 4279767a911328324becdb08c830c6712a5c213d..30941836d75e4075a2e79dd170643e49e7390b3a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1975,7 +1975,7 @@ _ACEOF
     DEFAULT_STD_FLAG=no
   ;;
 
     DEFAULT_STD_FLAG=no
   ;;
 

-  powerpc-*-darwin* )
+  *-*-darwin* )

         USE_BSD=1
     USE_DARWIN=1
     SO_SUFFIX=dylib
         USE_BSD=1
     USE_DARWIN=1
     SO_SUFFIX=dylib


@@ -13263,7 +13263,7 @@ esac
 
 case "${host}" in
 
 
 case "${host}" in
 

-                powerpc-*-darwin* )
+                *-*-darwin* )

         INSTALL_PROGRAM="cp -fp"
         INSTALL_DATA="cp -fp"
         ;;
         INSTALL_PROGRAM="cp -fp"
         INSTALL_DATA="cp -fp"
         ;;


@@ -13465,6 +13465,11 @@ _ACEOF
 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

+  ;;
+esac
+
+case "${host}" in
+  *-*-darwin* )

     echo "$as_me:$LINENO: checking if CoreFoundation/CFBase.h is usable" >&5
 echo $ECHO_N "checking if CoreFoundation/CFBase.h is usable... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF
     echo "$as_me:$LINENO: checking if CoreFoundation/CFBase.h is usable" >&5
 echo $ECHO_N "checking if CoreFoundation/CFBase.h is usable... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF


@@ -29983,7 +29988,7 @@ rm -f conftest.err conftest.$ac_objext \
         fi
       ;;
 
         fi
       ;;
 

-      powerpc-*-darwin* )
+      *-*-darwin* )

         install_name_tool=`which install_name_tool`
         if test "$install_name_tool" -a -x "$install_name_tool"; then
             SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
         install_name_tool=`which install_name_tool`
         if test "$install_name_tool" -a -x "$install_name_tool"; then
             SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"


@@ -44411,7 +44416,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
             case "${host}" in
 echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
             case "${host}" in

-                powerpc-*-darwin* )
+                *-*-darwin* )

                                                             GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
                 ;;
                 *-*-mingw32* )
                                                             GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
                 ;;
                 *-*-mingw32* )

diff --git a/configure.in b/configure.in
index ce601eeb034f0e96bc6b7c9ffe390a9cea0ffcdf..6fac11da6cde44d93eb73c68ce4295df15e7e3a4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -299,8 +299,8 @@ case "${host}" in
     DEFAULT_STD_FLAG=no
   ;;
 
     DEFAULT_STD_FLAG=no
   ;;
 

-  powerpc-*-darwin* )
-    dnl PowerPC Darwin based distributions (including Mac OS X)
+  *-*-darwin* )
+    dnl Darwin based distributions (including Mac OS X)

     USE_BSD=1
     USE_DARWIN=1
     SO_SUFFIX=dylib
     USE_BSD=1
     USE_DARWIN=1
     SO_SUFFIX=dylib


@@ -1440,7 +1440,7 @@ case "${host}" in
     dnl The other BSD's should probably go in here too, since this is
     dnl to workaround a strange static lib BSDism.
     dnl Mac OS X install seems to ignore -p option...
     dnl The other BSD's should probably go in here too, since this is
     dnl to workaround a strange static lib BSDism.
     dnl Mac OS X install seems to ignore -p option...

-    powerpc-*-darwin* )
+    *-*-darwin* )

         INSTALL_PROGRAM="cp -fp"
         INSTALL_DATA="cp -fp"
         ;;
         INSTALL_PROGRAM="cp -fp"
         INSTALL_DATA="cp -fp"
         ;;


@@ -1526,7 +1526,7 @@ if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
 fi
 
 
 fi
 
 

-dnl This case is for OS X vs. everything else
+dnl This case is for PowerPC OS X vs. everything else

 case "${host}" in
   powerpc-*-darwin* )
     AC_MSG_CHECKING([if __POWERPC__ is already defined])
 case "${host}" in
   powerpc-*-darwin* )
     AC_MSG_CHECKING([if __POWERPC__ is already defined])


@@ -1538,6 +1538,12 @@ case "${host}" in
         [AC_MSG_RESULT([no])
         AC_DEFINE(__POWERPC__)
     ])
         [AC_MSG_RESULT([no])
         AC_DEFINE(__POWERPC__)
     ])

+  ;;
+esac
+
+dnl This case is for OS X vs. everything else
+case "${host}" in
+  *-*-darwin* )

     AC_MSG_CHECKING([if CoreFoundation/CFBase.h is usable])
     AC_TRY_COMPILE([#include <CoreFoundation/CFBase.h>
 ],[],
     AC_MSG_CHECKING([if CoreFoundation/CFBase.h is usable])
     AC_TRY_COMPILE([#include <CoreFoundation/CFBase.h>
 ],[],


@@ -3604,7 +3610,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         fi
       ;;
       
         fi
       ;;
       

-      powerpc-*-darwin* )
+      *-*-darwin* )

         install_name_tool=`which install_name_tool`
         if test "$install_name_tool" -a -x "$install_name_tool"; then
             SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
         install_name_tool=`which install_name_tool`
         if test "$install_name_tool" -a -x "$install_name_tool"; then
             SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"


@@ -6815,7 +6821,7 @@ else
              AC_MSG_RESULT([yes])],
             [AC_MSG_RESULT([no])
             case "${host}" in
              AC_MSG_RESULT([yes])],
             [AC_MSG_RESULT([no])
             case "${host}" in

-                powerpc-*-darwin* )
+                *-*-darwin* )

                     dnl Some Apple's GCC version are broken and can't handle the
                     dnl pragmas:
                     GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
                     dnl Some Apple's GCC version are broken and can't handle the
                     dnl pragmas:
                     GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"