X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8fbc92bdb84f34fc7306266b116ebd2da28c950..6f016d540117a5832f5242344694a6e2f25094a6:/configure.in diff --git a/configure.in b/configure.in index 0cc0f86057..7414c66cd6 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [2.5.3], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [2.5.4], [wx-dev@lists.wxwidgets.org]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -55,8 +55,8 @@ dnl libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE) wx_major_version_number=2 wx_minor_version_number=5 -wx_release_number=3 -wx_subrelease_number=3 +wx_release_number=4 +wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_VERSION=$WX_RELEASE.$wx_release_number @@ -64,9 +64,9 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number -WX_CURRENT=3 +WX_CURRENT=4 WX_REVISION=0 -WX_AGE=3 +WX_AGE=4 dnl ------------------------------------------------------------------------ @@ -417,6 +417,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_OPENGL=no DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no + DEFAULT_wxUSE_STACKWALKER=no DEFAULT_wxUSE_SNGLINST_CHECKER=no DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_CMDLINE_PARSER=no @@ -499,6 +500,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FS_INET=no DEFAULT_wxUSE_FS_ZIP=no DEFAULT_wxUSE_BUSYINFO=no + DEFAULT_wxUSE_ARCHIVE_STREAMS=no DEFAULT_wxUSE_ZIPSTREAM=no DEFAULT_wxUSE_VALIDATORS=no @@ -512,6 +514,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_CHOICEBOOK=no DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_DATEPICKCTRL=no DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no @@ -607,6 +610,7 @@ else DEFAULT_wxUSE_OPENGL=no DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes + DEFAULT_wxUSE_STACKWALKER=yes DEFAULT_wxUSE_SNGLINST_CHECKER=yes DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_CMDLINE_PARSER=yes @@ -689,6 +693,7 @@ else DEFAULT_wxUSE_FS_INET=yes DEFAULT_wxUSE_FS_ZIP=yes DEFAULT_wxUSE_BUSYINFO=yes + DEFAULT_wxUSE_ARCHIVE_STREAMS=yes DEFAULT_wxUSE_ZIPSTREAM=yes DEFAULT_wxUSE_VALIDATORS=yes @@ -702,6 +707,7 @@ else DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_CHOICEBOOK=yes DEFAULT_wxUSE_COMBOBOX=yes + DEFAULT_wxUSE_DATEPICKCTRL=yes DEFAULT_wxUSE_DISPLAY=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes @@ -880,7 +886,9 @@ WX_ARG_ENABLE(ipc, [ --enable-ipc use interprocess communi dnl please keep the settings below in alphabetical order WX_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], wxUSE_APPLE_IEEE) +WX_ARG_ENABLE(arcstream, [ --enable-arcstream use wxArchive streams], wxUSE_ARCHIVE_STREAMS) WX_ARG_ENABLE(catch_segvs, [ --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only)], wxUSE_ON_FATAL_EXCEPTION) +WX_ARG_ENABLE(backtrace, [ --enable-backtrace use wxStackWalker class for getting backtraces], wxUSE_STACKWALKER) WX_ARG_ENABLE(cmdline, [ --enable-cmdline use wxCmdLineParser class], wxUSE_CMDLINE_PARSER) WX_ARG_ENABLE(datetime, [ --enable-datetime use wxDateTime class], wxUSE_DATETIME) WX_ARG_ENABLE(dialupman, [ --enable-dialupman use dialup network classes], wxUSE_DIALUP_MANAGER) @@ -910,7 +918,7 @@ WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Un WX_ARG_ENABLE(sound, [ --enable-sound use wxSound class], wxUSE_SOUND) WX_ARG_ENABLE(mediactrl, [ --enable-mediactrl use wxMediaCtrl class], wxUSE_MEDIACTRL) WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWidgets implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF) -WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZipInputStream], wxUSE_ZIPSTREAM) +WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZip streams], wxUSE_ZIPSTREAM) WX_ARG_ENABLE(url, [ --enable-url use wxURL class], wxUSE_URL) WX_ARG_ENABLE(protocol, [ --enable-protocol use wxProtocol class], wxUSE_PROTOCOL) @@ -985,13 +993,14 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_ACCEL=yes DEFAULT_wxUSE_BMPBUTTON=yes DEFAULT_wxUSE_BUTTON=yes - DEFAULT_wxUSE_CALCTRL=no + DEFAULT_wxUSE_CALCTRL=yes DEFAULT_wxUSE_CARET=yes DEFAULT_wxUSE_COMBOBOX=yes DEFAULT_wxUSE_CHECKBOX=yes DEFAULT_wxUSE_CHECKLISTBOX=yes DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_CHOICEBOOK=yes + DEFAULT_wxUSE_DATEPICKCTRL=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes @@ -1031,6 +1040,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_CHECKLISTBOX=no DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_CHOICEBOOK=no + DEFAULT_wxUSE_DATEPICKCTRL=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_IMAGLIST=no @@ -1071,6 +1081,7 @@ WX_ARG_ENABLE(checklst, [ --enable-checklst use wxCheckListBox (listbo WX_ARG_ENABLE(choice, [ --enable-choice use wxChoice class], wxUSE_CHOICE) WX_ARG_ENABLE(choicebook, [ --enable-choicebook use wxChoicebook class], wxUSE_CHOICEBOOK) WX_ARG_ENABLE(combobox, [ --enable-combobox use wxComboBox class], wxUSE_COMBOBOX) +WX_ARG_ENABLE(datepick, [ --enable-datepick use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL) WX_ARG_ENABLE(display, [ --enable-display use wxDisplay class], wxUSE_DISPLAY) WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE) WX_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID) @@ -1131,7 +1142,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) @@ -1351,6 +1362,7 @@ 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_BAKEFILE_PROG_MWCC dnl is -traditional needed for correct compilations dnl adds -traditional for gcc if needed @@ -1368,6 +1380,7 @@ dnl dnl see CFLAGS line above CXXFLAGS=${CXXFLAGS:=} AC_PROG_CXX +AC_BAKEFILE_PROG_MWCXX AC_LANG_RESTORE @@ -1500,44 +1513,56 @@ 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 + fi if test "$wxUSE_OMF" = "yes"; then LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK" fi @@ -1624,8 +1649,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 ;; @@ -1740,7 +1769,8 @@ AC_CACHE_CHECK([for va_copy], } int main() { - return foo("hi", 17); + foo("hi", 17); + return 0; }], wx_cv_func_va_copy=yes, wx_cv_func_va_copy=no @@ -1789,7 +1819,6 @@ fi dnl check for large file support AC_SYS_LARGEFILE -AC_FUNC_FSEEKO dnl we need to define _FILE_OFFSET_BITS or _LARGE_FILES on the compiler command dnl line because otherwise the system headers risk being included before @@ -1802,6 +1831,11 @@ if test "x$wx_largefile" = "xyes"; then else WX_LARGEFILE_FLAGS="-D_LARGE_FILES" fi + dnl AC_FUNC_FSEEKO sets HAVE_FSEEKO and $ac_cv_sys_largefile_source + AC_FUNC_FSEEKO + if test "$ac_cv_sys_largefile_source" != no; then + WX_LARGEFILE_FLAGS="$WX_LARGEFILE_FLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source" + fi CPPFLAGS="$CPPFLAGS $WX_LARGEFILE_FLAGS" fi @@ -2370,7 +2404,6 @@ dnl Check for libmspack dnl ------------------------------------------------------------------------ if test "$wxUSE_LIBMSPACK" != "no"; then - AC_CHECK_HEADER([mspack.h], [found_mspack_h=1]) if test "x$found_mspack_h" = "x1"; then AC_CHECK_LIB(mspack, mspack_create_chm_decompressor, @@ -2378,11 +2411,13 @@ if test "$wxUSE_LIBMSPACK" != "no"; then fi if test "x$MSPACK_LINK" = "x" ; then wxUSE_LIBMSPACK=no - else - AC_DEFINE(wxUSE_LIBMSPACK) fi fi +if test "$wxUSE_LIBMSPACK" != "no"; then + AC_DEFINE(wxUSE_LIBMSPACK) +fi + dnl ---------------------------------------------------------------- dnl search for toolkit (widget sets) @@ -3211,33 +3246,6 @@ dnl --------------------------------------------------------------------------- fi fi -dnl --------------------------------------------------------------------------- -dnl wxMediaCtrl -dnl --------------------------------------------------------------------------- - -if test "$wxUSE_MEDIACTRL" = "yes"; then - if test "$wxUSE_MSW" = 1; then -dnl --------------------------------------------------------------------------- -dnl DirectShow MSW -dnl --------------------------------------------------------------------------- - wxUSE_DIRECTSHOW="yes" - AC_CHECK_HEADERS([dshow.h], [], - [ - wxUSE_DIRECTSHOW="no" - AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher]) - ], - [#include ]) - - if test "$wxUSE_DIRECTSHOW" = "yes"; then - AC_DEFINE(wxUSE_DIRECTSHOW) - LIBS="$LIBS -lstrmiids" - fi - fi - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer" - AC_DEFINE(wxUSE_MEDIACTRL) -fi - dnl --------------------------------------------------------------------------- dnl OpenGL libraries dnl --------------------------------------------------------------------------- @@ -3406,6 +3414,11 @@ EOF TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1" ;; + *-*-hpux* ) + SAMPLES_RPATH_FLAG="-Wl,+b,\$(top_builddir)lib" + WXCONFIG_RPATH="-Wl,+b,\$libdir" + ;; + esac if test $wxUSE_RPATH = "no"; then @@ -3636,8 +3649,8 @@ if test "$wx_cv_sizeof_wchar_t" != "0"; then AC_DEFINE(HAVE_WCSLEN) fi - dnl HP-UX aCC needs this define to find mbstrtowcs() &c - if test "$USE_HPUX" = 1 -a "x$GCC" != "xyes"; then + dnl on HP-UX aCC and g++ need this define to find mbstrtowcs() &c + if test "$USE_HPUX" = 1; then CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE " fi @@ -3679,7 +3692,27 @@ if test "$ac_cv_func_vsnprintf" = "yes"; then vsnprintf(buf, 10u, "%s", ap); ], wx_cv_func_vsnprintf_decl=yes, - wx_cv_func_vsnprintf_decl=no + [ + dnl Metrowerks does provide a vsnprintf declaration + dnl but in C++ mode it's always in std namespace. + dnl FIXME: Do we have any UNIX C++ compilers that would + dnl fail this test if using namespace std; was + dnl simply always included? + AC_TRY_COMPILE( + [ + #include + #include + using namespace std; + ], + [ + char *buf; + va_list ap; + vsnprintf(buf, 10u, "%s", ap); + ], + wx_cv_func_vsnprintf_decl=yes, + wx_cv_func_vsnprintf_decl=no + ) + ] ) ] ) @@ -3753,6 +3786,53 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then fi fi +dnl backtrace() and backtrace_symbols() for wxStackWalker +if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + AC_CACHE_CHECK([for backtrace() in ], wx_cv_func_backtrace, + [ + AC_TRY_COMPILE([#include ], + [ + void *trace[1]; + char **messages; + + backtrace(trace, 1); + messages = backtrace_symbols(trace, 1); + ], + wx_cv_func_backtrace=yes, + wx_cv_func_backtrace=no + ) + ] + ) + + + if test "$wx_cv_func_backtrace" = "no"; then + AC_MSG_WARN([backtrace() is not available, wxStackWalker will not be available]) + wxUSE_STACKWALKER=no + else + AC_CACHE_CHECK([for __cxa_demangle() in ], wx_cv_func_cxa_demangle, + [ + AC_TRY_COMPILE([#include ], + [ + int rc; + __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc); + ], + wx_cv_func_cxa_demangle=yes, + wx_cv_func_cxa_demangle=no + ) + ] + ) + + if test "$wx_cv_func_cxa_demangle" = "yes"; then + AC_DEFINE(HAVE_CXA_DEMANGLE) + fi + fi + + AC_LANG_RESTORE +fi + dnl check for the function for temp files creation AC_CHECK_FUNCS(mkstemp mktemp, break) @@ -4169,10 +4249,6 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then if test "x$GCC" != "xyes"; then dnl see http://docs.hp.com/hpux/onlinedocs/2213/threads.htm flag="$flag -D_RWSTD_MULTI_THREAD" - - dnl we also need -lcma for user threads (-lpthread is for - dnl kernel threads only) according to Ian Brown - LIBS="$LIBS -lcma" fi ;; *solaris* | alpha*-osf*) @@ -4495,21 +4571,19 @@ dnl the library may be built without GUI classes at all dnl --------------------------------------------------------------------------- if test "$wxUSE_GUI" = "yes"; then - AC_DEFINE(wxUSE_GUI) - - dnl the things we always pull in the GUI version of the library: - dnl 1. basic things like wxApp, wxWindow, wxControl, wxFrame, wxDialog (the - dnl library really can't be built without those) - dnl 2. basic controls: wxButton, wxStaticText, wxTextCtrl (these are used in - dnl almost any program and the first 2 are needed to show a message box - dnl which want to be always able to do) - dnl 3. GDI stuff: icon, cursors and all that. Although it would be very nice - dnl to compile without them (if the app doesn't do any drawing, it doesn't - dnl need the dcs, pens, brushes, ...), this just can't be done now - dnl 4. menu stuff: wxMenu, wxMenuBar, wxMenuItem - dnl 5. misc stuff: timers, settings, message box -else - AC_DEFINE(wxUSE_NOGUI) + AC_DEFINE(wxUSE_GUI) + + dnl the things we always pull in the GUI version of the library: + dnl 1. basic things like wxApp, wxWindow, wxControl, wxFrame, wxDialog (the + dnl library really can't be built without those) + dnl 2. basic controls: wxButton, wxStaticText, wxTextCtrl (these are used in + dnl almost any program and the first 2 are needed to show a message box + dnl which want to be always able to do) + dnl 3. GDI stuff: icon, cursors and all that. Although it would be very nice + dnl to compile without them (if the app doesn't do any drawing, it doesn't + dnl need the dcs, pens, brushes, ...), this just can't be done now + dnl 4. menu stuff: wxMenu, wxMenuBar, wxMenuItem + dnl 5. misc stuff: timers, settings, message box fi dnl --------------------------------------------------------------------------- @@ -4710,14 +4784,28 @@ if test "$wxUSE_FS_ZIP" = "yes"; then AC_DEFINE(wxUSE_FS_ZIP) fi +if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then + AC_DEFINE(wxUSE_ARCHIVE_STREAMS) +fi + if test "$wxUSE_ZIPSTREAM" = "yes"; then - AC_DEFINE(wxUSE_ZIPSTREAM) + if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then + AC_MSG_WARN(wxZip requires wxArchive... disabled) + elif test "$wxUSE_ZLIB" = "no"; then + AC_MSG_WARN(wxZip requires wxZlib... disabled) + else + AC_DEFINE(wxUSE_ZIPSTREAM) + fi fi if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION) fi +if test "$wxUSE_STACKWALKER" = "yes"; then + AC_DEFINE(wxUSE_STACKWALKER) +fi + if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then AC_DEFINE(wxUSE_SNGLINST_CHECKER) fi @@ -4747,6 +4835,7 @@ if test "$wxUSE_CONFIG" = "yes" ; then AC_MSG_WARN(wxConfig requires wxTextFile... disabled) else AC_DEFINE(wxUSE_CONFIG) + AC_DEFINE(wxUSE_CONFIG_NATIVE) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config" fi fi @@ -4785,11 +4874,6 @@ if test "$wxUSE_GEOMETRY" = "yes"; then AC_DEFINE(wxUSE_GEOMETRY) fi -if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then - AC_DEFINE(wxUSE_DIALUP_MANAGER) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup" -fi - if test "$wxUSE_STREAMS" = "yes" ; then AC_DEFINE(wxUSE_STREAMS) fi @@ -5038,6 +5122,67 @@ if test "$wxUSE_SOCKETS" = "yes" ; then else AC_DEFINE_UNQUOTED(SOCKLEN_T, $wx_cv_type_getsockname3) fi + dnl Do this again for getsockopt as it may be different + AC_CACHE_CHECK([what is the type of the fifth argument of getsockopt], + wx_cv_type_getsockopt5, + [ + AC_TRY_COMPILE( + [ + #include + #include + ], + [ + socklen_t len; + getsockopt(0, 0, 0, 0, &len); + ], + wx_cv_type_getsockopt5=socklen_t, + [ + dnl the compiler will compile the version with size_t + dnl even if the real type of the last parameter is int + dnl but it should give at least a warning about + dnl converting between incompatible pointer types, so + dnl try to use it to get the correct behaviour at + dnl least with gcc (otherwise we'd always use size_t) + CFLAGS_OLD="$CFLAGS" + if test "$GCC" = yes ; then + CFLAGS="$CFLAGS -Werror" + fi + + AC_TRY_COMPILE( + [ + #include + #include + ], + [ + size_t len; + getsockopt(0, 0, 0, 0, &len); + ], + wx_cv_type_getsockopt5=size_t, + AC_TRY_COMPILE( + [ + #include + #include + ], + [ + int len; + getsockopt(0, 0, 0, 0, &len); + ], + wx_cv_type_getsockopt5=int, + wx_cv_type_getsockopt5=unknown + ) + ) + + CFLAGS="$CFLAGS_OLD" + ] + ) + ]) + + if test "$wx_cv_type_getsockopt5" = "unknown"; then + wxUSE_SOCKETS=no + AC_MSG_WARN([Couldn't find socklen_t synonym for this system]) + else + AC_DEFINE_UNQUOTED(SOCKOPTLEN_T, $wx_cv_type_getsockopt5) + fi AC_LANG_POP fi fi @@ -5092,27 +5237,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 @@ -5393,6 +5540,11 @@ if test "$wxUSE_CHECKLST" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" fi +if test "$wxUSE_DATEPICKCTRL" = "yes"; then + AC_DEFINE(wxUSE_DATEPICKCTRL) + USES_CONTROLS=1 +fi + if test "$wxUSE_DISPLAY" = "yes"; then AC_DEFINE(wxUSE_DISPLAY) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display" @@ -5507,6 +5659,8 @@ if test "$wxUSE_STATLINE" = "yes"; then fi if test "$wxUSE_STATUSBAR" = "yes"; then + dnl this will get undefined in wx/chkconf.h if it's not supported + AC_DEFINE(wxUSE_NATIVE_STATUSBAR) AC_DEFINE(wxUSE_STATUSBAR) USES_CONTROLS=1 @@ -5515,7 +5669,6 @@ fi if test "$wxUSE_TABDIALOG" = "yes"; then AC_DEFINE(wxUSE_TAB_DIALOG) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" fi if test "$wxUSE_TEXTCTRL" = "yes"; then @@ -5604,6 +5757,15 @@ if test "$wxUSE_POPUPWIN" = "yes"; then fi fi +if test "$wxUSE_DIALUP_MANAGER" = "yes"; then + if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then + AC_MSG_WARN([Dialup manager not yet supported under Mac OS X... disabled]) + else + AC_DEFINE(wxUSE_DIALUP_MANAGER) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup" + fi +fi + if test "$wxUSE_TIPWINDOW" = "yes"; then if test "$wxUSE_PM" = 1; then AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled]) @@ -5826,6 +5988,111 @@ if test "$wxUSE_WIZARDDLG" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard" fi +dnl --------------------------------------------------------------------------- +dnl wxMediaCtrl +dnl --------------------------------------------------------------------------- + +if test "$wxUSE_MEDIACTRL" = "yes"; then + if test "$wxUSE_MSW" = 1; then + dnl ----------------------------------------------------------------------- + dnl DirectShow MSW + dnl ----------------------------------------------------------------------- + wxUSE_DIRECTSHOW="yes" + AC_CHECK_HEADERS([dshow.h], [], + [ + wxUSE_DIRECTSHOW="no" + AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher]) + ], + [#include ]) + + if test "$wxUSE_DIRECTSHOW" = "yes"; then + AC_DEFINE(wxUSE_DIRECTSHOW) + LIBS="$LIBS -lstrmiids" + fi + fi + + dnl ----------------------------------------------------------------------- + dnl GStreamer + dnl ----------------------------------------------------------------------- + if test "$wxUSE_GTK" = 1; then + wxUSE_GSTREAMER="yes" + + dnl ------------------------------------------------------------------- + dnl Test for gstreamer module from pkg-config + dnl ------------------------------------------------------------------- + PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.8, + [ + CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" + LIBS="$LIBS $GSTREAMER_LIBS -lgstplay-0.8" + ], + [ + AC_MSG_WARN([GStreamer installation not found]) + wxUSE_GSTREAMER="no" + ]) + + dnl ------------------------------------------------------------------- + dnl Perform a check for a GStreamer element using gst-inspect + dnl Thomas Vander Stichele + dnl Last modification: 25/01/2005 + dnl + dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + dnl ------------------------------------------------------------------- + AC_DEFUN([AM_GST_ELEMENT_CHECK], + [ + if test "x$GST_INSPECT" == "x"; then + AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, []) + fi + + if test "x$GST_INSPECT" != "x"; then + AC_MSG_CHECKING(GStreamer element $1) + if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then + AC_MSG_RESULT(found.) + $2 + else + AC_MSG_RESULT(not found.) + $3 + fi + fi + ]) + + dnl ------------------------------------------------------------------- + dnl Test for x video sink (video useless without) + dnl ------------------------------------------------------------------- + AM_GST_ELEMENT_CHECK(xvimagesink,[], + [ + wxUSE_GSTREAMER="no" + AC_MSG_WARN([x video sink not found - cannot use GStreamer]) + ]) + + dnl ------------------------------------------------------------------- + dnl Check for gstplay-0.8 lib and corresponding x overlay header + dnl ------------------------------------------------------------------- + AC_CHECK_HEADER(gst/xoverlay/xoverlay.h, [], + [ + wxUSE_GSTREAMER="no" + AC_MSG_WARN([xoverlay header not found, cannot use GStreamer]) + ], + [#include ]) + + AC_MSG_CHECKING([for gstplay 0.8]) + WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],gstplay-0.8) + + if test "$ac_find_libraries" = "" ; then + AC_MSG_RESULT([no]) + wxUSE_GSTREAMER="no" + else + AC_MSG_RESULT([yes]) + fi + + if test "$wxUSE_GSTREAMER" = "yes"; then + AC_DEFINE(wxUSE_GSTREAMER) + AC_MSG_RESULT([GStreamer detection successful]) + fi + fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer" + AC_DEFINE(wxUSE_MEDIACTRL) +fi + dnl --------------------------------------------------------------------------- dnl get the string with OS info - used by wxGetOsDescription() on MacOS X dnl --------------------------------------------------------------------------- @@ -5907,7 +6174,10 @@ 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 fi dnl FIXME: should this be covered by the conditional above @@ -6001,6 +6271,21 @@ CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS` CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CWARNINGS` CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS` +if test "x$MWCC" = "xyes"; then + dnl Correct MW 8.3 to be more similar to GCC. In particular we + dnl must use from system not our local copy on OS X, + dnl but must use local not system on OS 9. + dnl The following should make all -I paths usable for <> includes + dnl while first checking in real system paths. With 8.3 using + dnl -gccincludes it will actually check local paths before system + dnl even for <> which is totally wrong. + + dnl Note that because this absolutely needs to be before any -I + dnl that we have to tack it on to the end of the compiler commandline. + CC="$CC -cwd source -I-" + CXX="$CXX -cwd source -I-" +fi + LIBS=`echo $LIBS` EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" @@ -6008,7 +6293,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" @@ -6138,7 +6423,7 @@ case "$TOOLKIT" in ;; esac -AC_BAKEFILE +AC_BAKEFILE([m4_include(autoconf_inc.m4)]) if test "$wxUSE_SHARED" = "yes"; then @@ -6151,6 +6436,17 @@ if test "$wxUSE_SHARED" = "yes"; then sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'` EXE_LINKER=`eval echo "$sanitised_bakefile_mess"` + dnl Need addtional flag on OS/2, so override bakefiles value + dnl (there currently is no suitable variable to which the + dnl missing flags could be added, AFAICS. SN, 18.12.2004. ) + case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o" + SHARED_LD_CXX="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o" + cp -p ${srcdir}/src/os2/dllnames.sh . + cp -p ${srcdir}/src/os2/dllar.sh . + ;; + esac else dnl No bakefile support for static builds, but this should be ok for most. @@ -6158,10 +6454,14 @@ else fi +dnl According to Vaclav, if NO_GCC_PRAGMA is used for any reason it needs to +dnl be in wx-config output. Not doing so could result in link problems. GCC_PRAGMA_FLAGS="" +PCH_FLAGS="" dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP: if test $GCC_PCH = 1 ; then - GCC_PRAGMA_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA" + GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA" + PCH_FLAGS="-DWX_PRECOMP" else case "${host}" in powerpc-*-darwin* ) @@ -6208,7 +6508,7 @@ else ;; esac fi -CPPFLAGS="$GCC_PRAGMA_FLAGS $CPPFLAGS" +CPPFLAGS="$PCH_FLAGS $GCC_PRAGMA_FLAGS $CPPFLAGS" dnl for convenience, sort the samples in alphabetical order @@ -6414,7 +6714,7 @@ echo " odbc ${wxUSE_ODBC}" echo " expat ${wxUSE_EXPAT}" echo " libmspack ${wxUSE_LIBMSPACK}" echo " sdl ${wxUSE_LIBSDL}" -echo " gnomeprint ${wxUSE_LIBGNOMEPRINT}" +echo " gnomeprint ${wxUSE_LIBGNOMEPRINT-none}" echo ""