From cfda0ea87b32d6fb933cf4541487ae1c3571b6ff Mon Sep 17 00:00:00 2001 From: David Elliott Date: Wed, 17 Aug 2005 00:56:55 +0000 Subject: [PATCH] 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 --- configure | 13 +++++++++---- configure.in | 18 ++++++++++++------ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 4279767a91..30941836d7 100755 --- a/configure +++ b/configure @@ -1975,7 +1975,7 @@ _ACEOF DEFAULT_STD_FLAG=no ;; - powerpc-*-darwin* ) + *-*-darwin* ) USE_BSD=1 USE_DARWIN=1 SO_SUFFIX=dylib @@ -13263,7 +13263,7 @@ esac case "${host}" in - powerpc-*-darwin* ) + *-*-darwin* ) INSTALL_PROGRAM="cp -fp" INSTALL_DATA="cp -fp" ;; @@ -13465,6 +13465,11 @@ _ACEOF 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 @@ -29983,7 +29988,7 @@ rm -f conftest.err conftest.$ac_objext \ 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) \$@" @@ -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 - powerpc-*-darwin* ) + *-*-darwin* ) GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA" ;; *-*-mingw32* ) diff --git a/configure.in b/configure.in index ce601eeb03..6fac11da6c 100644 --- a/configure.in +++ b/configure.in @@ -299,8 +299,8 @@ case "${host}" in 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 @@ -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... - powerpc-*-darwin* ) + *-*-darwin* ) INSTALL_PROGRAM="cp -fp" INSTALL_DATA="cp -fp" ;; @@ -1526,7 +1526,7 @@ if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then 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]) @@ -1538,6 +1538,12 @@ case "${host}" in [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 ],[], @@ -3604,7 +3610,7 @@ if test "$wxUSE_SHARED" = "yes"; then 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) \$@" @@ -6815,7 +6821,7 @@ else 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" -- 2.45.2