X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e8e867ff99be2e9d02e4e94766d27068ae66f57..c2efd890447c04e0d6f17c8d1066674b05ba25de:/configure.in diff --git a/configure.in b/configure.in index edae0c269c..a06af8e7ba 100644 --- a/configure.in +++ b/configure.in @@ -328,7 +328,6 @@ case "${host}" in SO_SUFFIX=dylib AC_DEFINE(__BSD__) AC_DEFINE(__DARWIN__) - AC_DEFINE(__POWERPC__) AC_DEFINE(TARGET_CARBON) DEFAULT_DEFAULT_wxUSE_MAC=1 ;; @@ -1142,7 +1141,7 @@ WX_ARG_ENABLE(tooltips, [ --enable-tooltips use wxToolTip class], wxUS WX_ARG_ENABLE(splines, [ --enable-splines use spline drawing code], wxUSE_SPLINES) WX_ARG_ENABLE(validators, [ --enable-validators use wxValidator and derived classes], wxUSE_VALIDATORS) WX_ARG_ENABLE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUSYINFO) -WX_ARG_ENABLE(joystick, [ --enable-joystick use wxJoystick (Linux only)], wxUSE_JOYSTICK) +WX_ARG_ENABLE(joystick, [ --enable-joystick use wxJoystick], wxUSE_JOYSTICK) WX_ARG_ENABLE(metafile, [ --enable-metafiles use wxMetaFile (Windows only)], wxUSE_METAFILE) WX_ARG_ENABLE(dragimage, [ --enable-dragimage use wxDragImage], wxUSE_DRAGIMAGE) WX_ARG_ENABLE(accessibility,[ --enable-accessibility enable accessibility support], wxUSE_ACCESSIBILITY) @@ -1362,7 +1361,13 @@ dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add dnl -g and -O flags ourselves below CFLAGS=${CFLAGS:=} AC_PROG_CC +AC_WX_METROWERKS_EXTO +if test "x$wx_cv_c_exto" '!=' "x"; then + unset ac_cv_prog_cc_g + _AC_PROG_CC_G +fi AC_BAKEFILE_PROG_MWCC +AC_WX_PROG_XLCC dnl is -traditional needed for correct compilations dnl adds -traditional for gcc if needed @@ -1380,7 +1385,13 @@ dnl dnl see CFLAGS line above CXXFLAGS=${CXXFLAGS:=} AC_PROG_CXX +AC_WX_METROWERKS_EXTO +if test "x$wx_cv_cxx_exto" '!=' "x"; then + unset ac_cv_prog_cxx_g + _AC_PROG_CXX_G +fi AC_BAKEFILE_PROG_MWCXX +AC_WX_PROG_XLCXX AC_LANG_RESTORE @@ -1495,6 +1506,46 @@ dnl ------------------------------------------------------------------------ dnl Platform specific tests dnl ------------------------------------------------------------------------ +dnl xlC needs -qunique (at least on AIX) so that one source file can be +dnl compiled to multiple object files and safely linked together. +if test "x$XLCXX" = "xyes"; then + CXXFLAGS="$CXXFLAGS -qunique" +fi + + +dnl This case is for OS X vs. everything else +case "${host}" in + powerpc-*-darwin* ) + AC_MSG_CHECKING([if __POWERPC__ is already defined]) + AC_TRY_COMPILE([],[#ifndef __POWERPC__ + choke me for lack of PowerPC +#endif +], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_DEFINE(__POWERPC__) + ]) + AC_MSG_CHECKING([if CoreFoundation/CFBase.h is usable]) + AC_TRY_COMPILE([#include +],[], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_CHECKING([if __CF_USE_FRAMEWORK_INCLUDES__ is required]) + AC_TRY_COMPILE([#define __CF_USE_FRAMEWORK_INCLUDES__ +#include + ],[], + [AC_MSG_RESULT([yes]) + dnl We must use -D so source files that don't include wx/setup.h + dnl but do include CFBase will work. + CPPFLAGS="$CPPFLAGS -D__CF_USE_FRAMEWORK_INCLUDES__"], + [AC_MSG_FAILURE([no. CoreFoundation not available.])] + ) + ] + ) + ;; +esac + +dnl This case is for OS/2 vs. everything else case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) dnl --------------------------------------------------------------------- @@ -1513,46 +1564,59 @@ case "${host}" in dnl Include resources for the "native" port (wxPM). RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" fi + dnl Check for the gcc version (and thereby for the C runtime library). + dnl wx_cv_gccversion = EMX2 -> Standard EMX environment + dnl wx_cv_gccversion = EMX3 -> EMX with gcc-3.0.3 or gcc-3.2.1 + dnl wx_cv_gccversion = Innotek5 -> gcc-3.2.2 with Innotek libc5 + dnl wx_cv_gccversion = Innotek6 -> gcc-3.3.5 with Innotek libc6. AC_CACHE_CHECK([for gcc version], wx_cv_gccversion,[ - AC_TRY_COMPILE([], + AC_TRY_RUN( + dnl Check the gcc version macro. [ + #include + + int main() + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, #if (__GNUC__ < 3) - #error old gcc + "EMX2" + #elif (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2))) + "EMX3" + #elif (__GNUC__==3) && (__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__==2) + "Innotek5" + #else + "Innotek6" #endif + ); + exit(0); + } ], - [ - AC_TRY_COMPILE([], - [ - #if (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2))) - #error intermediate gcc - #endif - ], - [ - wx_cv_gccversion=Innotek - ], - [ - wx_cv_gccversion=3 - ] - ) - ], - [ - wx_cv_gccversion=2 - ] + wx_cv_gccversion=`cat conftestval`, + wx_cv_gccversion="EMX2", + dnl Compilation error: Assuming standard EMX environment + wx_cv_gccversion="EMX2" ) ]) - if test "$wx_cv_gccversion" = "2"; then + if test "$wx_cv_gccversion" = "EMX2"; then LIBS="$LIBS -lstdcpp" LDFLAGS="$LDFLAGS -Zsysv-signals" else - if test "$wx_cv_gccversion" = "3"; then + if test "$wx_cv_gccversion" = "EMX3"; then LIBS="$LIBS -lstdcxx" LDFLAGS="$LDFLAGS -Zsysv-signals" else LIBS="$LIBS -lstdc++" fi fi + if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then + AC_MSG_WARN([Building DLLs requires OMF mode, enabled]) + wxUSE_OMF=yes + enable_omf=yes + fi if test "$wxUSE_OMF" = "yes"; then - LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK" + LDFLAGS="$LDFLAGS -Zlinker /EXEPACK -Zlinker /PMTYPE:PM" fi dnl (end of OS/2-only piece) ;; @@ -1637,8 +1701,12 @@ AC_CHECK_HEADERS(langinfo.h) case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) - dnl Explicitly link -lintl if langinfo.h is available. - if test $ac_cv_header_langinfo_h = "yes"; then + dnl Explicitly link -lintl if langinfo.h is available + dnl and intl not yet included in libc + if test $ac_cv_header_langinfo_h = "yes" \ + -a \( "$wx_cv_gccversion" = "EMX2" \ + -o "$wx_cv_gccversion" = "EMX3" \ + -o "$wx_cv_gccversion" = "Innotek5" \); then LIBS="$LIBS -lintl" fi ;; @@ -5221,27 +5289,29 @@ dnl Joystick support dnl --------------------------------------------------------------------------- if test "$wxUSE_GUI" = "yes"; then - - if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then - AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled]) - wxUSE_JOYSTICK=no - fi - dnl under MSW we always have joystick support - if test "$TOOLKIT" != "MSW"; then - if test "$wxUSE_JOYSTICK" = "yes"; then - dnl joystick support is only for Linux 2.1.x or greater + if test "$wxUSE_JOYSTICK" = "yes"; then + + dnl joystick support is only for Linux 2.1.x or greater + if test "$TOOLKIT" != "MAC" -a "$TOOLKIT" != "COCOA" -a "$TOOLKIT" != "MSW"; then AC_CHECK_HEADERS(linux/joystick.h) if test "$ac_cv_header_linux_joystick_h" != "yes"; then wxUSE_JOYSTICK=no AC_MSG_WARN(Joystick not supported by this system... disabled) fi + else + dnl mac only available on darwin + if test "$USE_DARWIN" != 1 -a "$TOOLKIT" != "MSW"; then + wxUSE_JOYSTICK=no + AC_MSG_WARN(Joystick not supported by this system... disabled) + fi fi - fi - if test "$wxUSE_JOYSTICK" = "yes"; then - AC_DEFINE(wxUSE_JOYSTICK) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" + + if test "$wxUSE_JOYSTICK" = "yes"; then + AC_DEFINE(wxUSE_JOYSTICK) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" + fi fi fi @@ -6156,7 +6226,7 @@ if test "$wxUSE_MAC" = 1 ; then fi fi if test "$wxUSE_COCOA" = 1 ; then - LDFLAGS="$LDFLAGS -framework Cocoa" + LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa" if test "$wxUSE_MEDIACTRL" = "yes"; then LDFLAGS="$LDFLAGS -framework QuickTime" fi @@ -6275,7 +6345,7 @@ EXTRALIBS_XML="$EXPAT_LINK" EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_ODBC="$ODBC_LINK" if test "$wxUSE_GUI" = "yes"; then - EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK` + EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_GNOMEPRINT` fi if test "$wxUSE_OPENGL" = "yes"; then EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"