X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50bf89f70291d1f5ac0bc976bab43737047e4285..1495b9150579208e943504ce38fbbdd6acadfa9d:/configure.in diff --git a/configure.in b/configure.in index 6162af7737..029b1d0d13 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [2.5.4], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [2.6.0], [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]) @@ -48,15 +48,16 @@ dnl If any public interface was removed (or altered in a way effectively dnl removing the previous definition), instead do: WX_AGE = 0 dnl dnl When the major or minor version numbers are incremented, all the above -dnl variables should be reset to 0. +dnl variables should be reset to 0. wx_subrelease_number should be set to zero +dnl when major, minor or release numbers change. dnl dnl The resulting library name will be of the form: 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_minor_version_number=6 +wx_release_number=0 +wx_subrelease_number=1 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_VERSION=$WX_RELEASE.$wx_release_number @@ -64,9 +65,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=0 WX_REVISION=0 -WX_AGE=3 +WX_AGE=0 dnl ------------------------------------------------------------------------ @@ -145,6 +146,8 @@ SO_SUFFIX=so SAMPLES_RPATH_FLAG= SAMPLES_RPATH_POSTLINK= +DEFAULT_STD_FLAG=yes + 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" dnl and also define the shared library flags below - search for @@ -276,6 +279,7 @@ case "${host}" in PROGRAM_EXT=".exe" RESCOMP=windres DEFAULT_DEFAULT_wxUSE_MSW=1 + DEFAULT_STD_FLAG=no ;; *-pc-msdosdjgpp ) @@ -284,8 +288,6 @@ case "${host}" in AC_DEFINE(__DOS__) PROGRAM_EXT=".exe" DEFAULT_DEFAULT_wxUSE_MGL=1 - dnl DJGPP needs explicit -lstdc++ for some reason (VS: mayb some versions only?) - LIBS="$LIBS -lstdc++" ;; *-pc-os2_emx | *-pc-os2-emx ) @@ -319,6 +321,7 @@ case "${host}" in done export PATH="$ac_TEMP_PATH" unset ac_TEMP_PATH + DEFAULT_STD_FLAG=no ;; powerpc-*-darwin* ) @@ -328,9 +331,9 @@ case "${host}" in SO_SUFFIX=dylib AC_DEFINE(__BSD__) AC_DEFINE(__DARWIN__) - AC_DEFINE(__POWERPC__) AC_DEFINE(TARGET_CARBON) DEFAULT_DEFAULT_wxUSE_MAC=1 + DEFAULT_STD_FLAG=no ;; powerpc-apple-macos* ) dnl Classic Mac OS (< X) @@ -342,6 +345,7 @@ case "${host}" in dnl AC_DEFINE(TARGET_CARBON) dnl platform.h needs TARGET_CARBON before setup.h, we'll add it to CPPFLAGS DEFAULT_DEFAULT_wxUSE_MAC=1 + DEFAULT_STD_FLAG=no ;; *-*-beos* ) @@ -418,14 +422,17 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no DEFAULT_wxUSE_STACKWALKER=no + DEFAULT_wxUSE_DEBUGREPORT=no DEFAULT_wxUSE_SNGLINST_CHECKER=no DEFAULT_wxUSE_STD_IOSTREAM=no + DEFAULT_wxUSE_STD_STRING=no DEFAULT_wxUSE_CMDLINE_PARSER=no DEFAULT_wxUSE_DATETIME=no DEFAULT_wxUSE_TIMER=no DEFAULT_wxUSE_STOPWATCH=no DEFAULT_wxUSE_FILE=no DEFAULT_wxUSE_FFILE=no + DEFAULT_wxUSE_STDPATHS=no DEFAULT_wxUSE_TEXTBUFFER=no DEFAULT_wxUSE_TEXTFILE=no DEFAULT_wxUSE_SOUND=no @@ -454,6 +461,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_DRAG_AND_DROP=no DEFAULT_wxUSE_DRAGIMAGE=no DEFAULT_wxUSE_SPLINES=no + DEFAULT_wxUSE_MOUSEWHEEL=no DEFAULT_wxUSE_MDI=no DEFAULT_wxUSE_MDI_ARCHITECTURE=no @@ -500,6 +508,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 @@ -610,19 +619,22 @@ else DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes DEFAULT_wxUSE_STACKWALKER=yes + DEFAULT_wxUSE_DEBUGREPORT=yes DEFAULT_wxUSE_SNGLINST_CHECKER=yes - DEFAULT_wxUSE_STD_IOSTREAM=no + DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG + DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG DEFAULT_wxUSE_CMDLINE_PARSER=yes DEFAULT_wxUSE_DATETIME=yes DEFAULT_wxUSE_TIMER=yes DEFAULT_wxUSE_STOPWATCH=yes DEFAULT_wxUSE_FILE=yes DEFAULT_wxUSE_FFILE=yes + DEFAULT_wxUSE_STDPATHS=yes DEFAULT_wxUSE_TEXTBUFFER=yes DEFAULT_wxUSE_TEXTFILE=yes DEFAULT_wxUSE_SOUND=yes DEFAULT_wxUSE_MEDIACTRL=no - DEFAULT_wxUSE_DIRECTSHOW=no + DEFAULT_wxUSE_DIRECTSHOW=no DEFAULT_wxUSE_INTL=yes DEFAULT_wxUSE_CONFIG=yes DEFAULT_wxUSE_FONTMAP=yes @@ -646,6 +658,7 @@ else DEFAULT_wxUSE_DRAG_AND_DROP=yes DEFAULT_wxUSE_DRAGIMAGE=yes DEFAULT_wxUSE_SPLINES=yes + DEFAULT_wxUSE_MOUSEWHEEL=yes DEFAULT_wxUSE_MDI=yes DEFAULT_wxUSE_MDI_ARCHITECTURE=yes @@ -692,6 +705,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 @@ -759,6 +773,7 @@ else DEFAULT_wxUSE_GTK2=yes fi + dnl WX_ARG_WITH should be used to select whether an external package will be dnl used or not, to configure compile-time features of this package itself, dnl use WX_ARG_ENABLE instead @@ -775,6 +790,11 @@ for toolkit in `echo $ALL_TOOLKITS`; do has_toolkit_in_cache=1 eval "DEFAULT_$LINE" eval "CACHE_$toolkit=1" + + LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}` + if test "x$LINE" != "x" ; then + eval "DEFAULT_$LINE" + fi fi done @@ -793,7 +813,7 @@ WX_ARG_ENABLE(plugins, [ --enable-plugins build parts of wxWidgets a if test "$wxUSE_GUI" = "yes"; then WX_ARG_ENABLE(universal, [ --enable-universal use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL) -AC_ARG_WITH(gtk, [ --with-gtk use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1]) +AC_ARG_WITH(gtk, [[ --with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(mac, [ --with-mac use Mac OS X], [wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(cocoa, [ --with-cocoa use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1]) @@ -805,7 +825,7 @@ AC_ARG_WITH(microwin, [ --with-microwin use MicroWindows], [wxUSE_ AC_ARG_WITH(x11, [ --with-x11 use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1]) WX_ARG_ENABLE(nanox, [ --enable-nanox use NanoX], wxUSE_NANOX) -WX_ARG_ENABLE(gtk2, [ --disable-gtk2 use GTK+ 1.2 instead of 2.0], wxUSE_GTK2) +AC_ARG_ENABLE(gtk2, [ --disable-gtk2 use GTK+ 1.2 instead of 2.0], [wxUSE_GTK2="$enableval"]) WX_ARG_ENABLE(gpe, [ --enable-gpe use GNOME PDA Environment features if possible], wxUSE_GPE) WX_ARG_SYS_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG) @@ -835,6 +855,7 @@ WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wx WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG) WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL) if test "$USE_OS2" = "1"; then + DEFAULT_wxUSE_OMF=no WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF) fi @@ -884,10 +905,12 @@ 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(catch_segvs, [ --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only)], wxUSE_ON_FATAL_EXCEPTION) +WX_ARG_ENABLE(arcstream, [ --enable-arcstream use wxArchive streams], wxUSE_ARCHIVE_STREAMS) WX_ARG_ENABLE(backtrace, [ --enable-backtrace use wxStackWalker class for getting backtraces], wxUSE_STACKWALKER) +WX_ARG_ENABLE(catch_segvs, [ --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only)], wxUSE_ON_FATAL_EXCEPTION) 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(debugreport, [ --enable-debugreport use wxDebugReport class], wxUSE_DEBUGREPORT) WX_ARG_ENABLE(dialupman, [ --enable-dialupman use dialup network classes], wxUSE_DIALUP_MANAGER) WX_ARG_ENABLE(dynlib, [ --enable-dynlib use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS) WX_ARG_ENABLE(dynamicloader, [ --enable-dynamicloader use (new) wxDynamicLibrary class], wxUSE_DYNAMIC_LOADER) @@ -904,9 +927,11 @@ WX_ARG_ENABLE(longlong, [ --enable-longlong use wxLongLong class], w WX_ARG_ENABLE(mimetype, [ --enable-mimetype use wxMimeTypesManager], wxUSE_MIMETYPE) WX_ARG_ENABLE(mslu, [ --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only)], wxUSE_UNICODE_MSLU) WX_ARG_ENABLE(snglinst, [ --enable-snglinst use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER) -WX_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes], wxUSE_STREAMS) WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM) +WX_ARG_ENABLE(std_string, [ --enable-std_string use standard C++ string classes], wxUSE_STD_STRING) +WX_ARG_ENABLE(stdpaths, [ --enable-stdpaths use wxStandardPaths class], wxUSE_STDPATHS) WX_ARG_ENABLE(stopwatch, [ --enable-stopwatch use wxStopWatch class], wxUSE_STOPWATCH) +WX_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes], wxUSE_STREAMS) WX_ARG_ENABLE(system_options,[ --enable-sysoptions use wxSystemOptions], wxUSE_SYSTEM_OPTIONS) WX_ARG_ENABLE(textbuf, [ --enable-textbuf use wxTextBuffer class], wxUSE_TEXTBUFFER) WX_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile class], wxUSE_TEXTFILE) @@ -915,7 +940,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) @@ -1137,9 +1162,10 @@ WX_ARG_ENABLE(menus, [ --enable-menus use wxMenu/wxMenuBar/wxMen WX_ARG_ENABLE(miniframe, [ --enable-miniframe use wxMiniFrame class], wxUSE_MINIFRAME) WX_ARG_ENABLE(tooltips, [ --enable-tooltips use wxToolTip class], wxUSE_TOOLTIPS) WX_ARG_ENABLE(splines, [ --enable-splines use spline drawing code], wxUSE_SPLINES) +WX_ARG_ENABLE(mousewheel, [ --enable-mousewheel use mousewheel], wxUSE_MOUSEWHEEL) 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) @@ -1197,6 +1223,7 @@ if test "$wxUSE_WINE" = "yes"; then wxUSE_SHARED=no fi + if test "$wxUSE_GUI" = "yes"; then if test "$USE_BEOS" = 1; then @@ -1204,11 +1231,19 @@ if test "$wxUSE_GUI" = "yes"; then fi if test "$TOOLKIT_GIVEN" = 1; then - dnl convert "yes" to 1 and "no" to 0 + dnl convert "yes", "any" or a number to 1 and "no" to 0 for toolkit in `echo $ALL_TOOLKITS`; do var=wxUSE_$toolkit eval "value=\$${var}" - eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`" + if test "x$value" = "xno"; then + eval "$var=0" + elif test "x$value" != "x"; then + eval "$var=1" + fi + + if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then + eval "wx${toolkit}_VERSION=$value" + fi done else dnl try to guess the most apropriate toolkit for this platform @@ -1217,6 +1252,11 @@ if test "$wxUSE_GUI" = "yes"; then var=DEFAULT_DEFAULT_wxUSE_$toolkit else var=DEFAULT_wxUSE_$toolkit + + eval "version=\$DEFAULT_wx${toolkit}_VERSION" + if test "x$version" != "x"; then + eval "wx${toolkit}_VERSION=$version" + fi fi eval "wxUSE_$toolkit=\$${var}" done @@ -1244,6 +1284,13 @@ if test "$wxUSE_GUI" = "yes"; then AC_MSG_ERROR(Please specify at most one toolkit (maybe some are cached in configarg.cache?)) esac + # to be removed when --disable-gtk2 isn't needed + if test "x$wxUSE_GTK2" = "xyes"; then + wxGTK_VERSION=2 + elif test "x$wxUSE_GTK2" = "xno"; then + wxGTK_VERSION=1 + fi + dnl cache the wxUSE_ values too for toolkit in `echo $ALL_TOOLKITS`; do var=wxUSE_$toolkit @@ -1253,6 +1300,10 @@ if test "$wxUSE_GUI" = "yes"; then eval "cache=\$${cache_var}" if test "$cache" = 1; then echo "$var=$value" >> ${wx_arg_cache_file} + eval "version=\$wx${toolkit}_VERSION" + if test "x$version" != "x"; then + echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file} + fi fi if test "$value" = 1; then toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"` @@ -1358,8 +1409,7 @@ dnl this magic incantation is needed to prevent AC_PROG_CC from setting the 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 +AC_BAKEFILE_PROG_CC dnl is -traditional needed for correct compilations dnl adds -traditional for gcc if needed @@ -1376,8 +1426,7 @@ dnl defines CXXFLAGS dnl dnl see CFLAGS line above CXXFLAGS=${CXXFLAGS:=} -AC_PROG_CXX -AC_BAKEFILE_PROG_MWCXX +AC_BAKEFILE_PROG_CXX AC_LANG_RESTORE @@ -1492,6 +1541,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 --------------------------------------------------------------------- @@ -1510,46 +1599,56 @@ case "${host}" in dnl Include resources for the "native" port (wxPM). RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" fi - AC_CACHE_CHECK([for gcc version], wx_cv_gccversion,[ - AC_TRY_COMPILE([], + 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/libc version], wx_cv_gccversion,[ + 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_OMF" = "yes"; then - LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK" + 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 dnl (end of OS/2-only piece) ;; @@ -1634,8 +1733,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 ;; @@ -1688,51 +1791,31 @@ case "${host}" in AC_CHECK_SIZEOF(long long, 0) esac -dnl we have to do it ourselves because SGI/Irix's stdio.h does not include -dnl wchar_t and AC_CHECK_SIZEOF only includes stdio.h -dnl Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD) -AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t, -[ - AC_TRY_RUN( - [ - /* DJGPP only has fake wchar_t: */ - #ifdef __DJGPP__ - # error "fake wchar_t" - #endif - #ifdef HAVE_WCHAR_H - # ifdef __CYGWIN__ - # include - # endif - # include - #endif - #ifdef HAVE_STDLIB_H - # include - #endif - #include - int main() - { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%i", sizeof(wchar_t)); - exit(0); - } - ], - wx_cv_sizeof_wchar_t=`cat conftestval`, - wx_cv_sizeof_wchar_t=0, - [ - case "${host}" in - *-pc-msdosdjgpp ) - wx_cv_sizeof_wchar_t=0 - ;; - * ) - wx_cv_sizeof_wchar_t=4 - ;; - esac - ] - ) -]) - -AC_DEFINE_UNQUOTED(SIZEOF_WCHAR_T, $wx_cv_sizeof_wchar_t) +dnl SGI/Irix's stdio.h does not include wchar_t. Mac OS X does not provide +dnl wchar.h and wchar_t is defined by stdlib.h (GD) +AC_CHECK_SIZEOF(wchar_t, 0, + [ + /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */ + #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 ) + # error "fake wchar_t" + #endif + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + ] +) +if test "$ac_cv_sizeof_wchar_t" != "0"; then + wxUSE_WCHAR_T=yes +else + wxUSE_WCHAR_T=no +fi dnl checks needed to define wxVaCopy AC_CACHE_CHECK([for va_copy], @@ -1836,8 +1919,46 @@ dnl check whether C++ compiler supports C++ casts AC_CXX_CONST_CAST AC_CXX_REINTERPRET_CAST AC_CXX_STATIC_CAST +dnl we don't use HAVE_DYNAMIC_CAST anywhere right now... +dnl AC_CXX_DYNAMIC_CAST dnl check various STL features +if test "$wxUSE_UNICODE" = "yes" -a \ + \( "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes" \); then + AC_LANG_PUSH(C++) + + dnl check if declares std::wstring + AC_MSG_CHECKING([for std::wstring in ]) + AC_TRY_COMPILE([#include ], + [std::wstring foo;], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_STD_WSTRING)], + [AC_MSG_RESULT(no) + AC_MSG_CHECKING([if std::basic_string works]) + AC_TRY_COMPILE([ + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + #include + ], + [std::basic_string foo; + const wchar_t* dummy = foo.c_str();], + [AC_MSG_RESULT(yes)], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Can't compile without unicode string class])] + ) + ]) + + AC_LANG_POP +fi + if test "$wxUSE_STL" = "yes"; then AC_LANG_PUSH(C++) @@ -1857,14 +1978,6 @@ if test "$wxUSE_STL" = "yes"; then [AC_MSG_RESULT([no]) AC_MSG_ERROR([Basic STL functionality missing])]) - dnl check if declares std::wstring - AC_MSG_CHECKING([for std::wstring in ]) - AC_TRY_COMPILE([#include ], - [std::wstring foo;], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STD_WSTRING)], - [AC_MSG_RESULT(no)]) - dnl check for compliant std::string::compare AC_MSG_CHECKING([for compliant std::string::compare]) AC_TRY_COMPILE([#include ], @@ -1991,8 +2104,9 @@ dnl be found before the ones in lib64 for 32bit compilation -- of course, this dnl probably/surely breaks 64bit compilation... IMO the only real solution is to dnl stop using WX_PATH_FIND_LIBRARIES() at all and use AC_CHECK_LIB() instead dnl -dnl add 64 bit versions for Linux on AMD (this is not perfect but well...) -SEARCH_LIB="/usr/lib /usr/lib32 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g` /usr/lib64 /usr/X11R6/lib64" +dnl also put 64 bit versions for Linux on AMD, they must come before the usual +dnl locations or 64 bit compilation failed +SEARCH_LIB="/usr/lib /usr/lib32 /usr/lib64 /usr/X11R6/lib64 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g`" dnl ------------------------------------------------------------------------ dnl Check for libraries @@ -2336,6 +2450,17 @@ dnl ------------------------------------------------------------------------ dnl Check for expat libraries dnl ------------------------------------------------------------------------ +if test "$wxUSE_WCHAR_T" != "yes"; then + if test "$wxUSE_EXPAT" != "no"; then + AC_MSG_WARN([wxWidgets requires wchar_t to use expat, disabling]) + wxUSE_EXPAT=no + fi + if test "$wxUSE_XML" != "no"; then + AC_MSG_WARN([wxWidgets requires wchar_t to use xml, disabling]) + wxUSE_XML=no + fi +fi + if test "$wxUSE_EXPAT" != "no"; then wxUSE_XML=yes AC_DEFINE(wxUSE_EXPAT) @@ -2506,16 +2631,20 @@ if test "$wxUSE_GUI" = "yes"; then GTK_MODULES=gthread fi - dnl note that if we fail to find GTK2 we abort and don't fall - dnl back to GTK1.x + dnl detect GTK2 wx_cv_lib_gtk= - if test "x$wxUSE_GTK2" = "xyes"; then + if test "x$wxGTK_VERSION" != "x1"; then AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES) - else - AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES) + fi + + dnl detect GTK1.x + if test -z "$wx_cv_lib_gtk"; then + if test "x$wxGTK_VERSION" = "x1" -o "x$wxGTK_VERSION" = "xany" ; then + AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES) - if test -z "$wx_cv_lib_gtk"; then - AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES) + if test -z "$wx_cv_lib_gtk"; then + AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES) + fi fi fi @@ -2547,10 +2676,12 @@ if test "$wxUSE_GUI" = "yes"; then 1.2.3) WXGTK12=1 ;; *) AC_MSG_ERROR([ -Please check that gtk-config is in path, the directory -where GTK+ libraries are installed (returned by -'gtk-config --libs' command) is in LD_LIBRARY_PATH or -equivalent variable and GTK+ is version 1.2.3 or above. +The development files for GTK+ were not found. For GTK+ 2, please +ensure that pkg-config is in the path and that gtk+-2.0.pc is +installed. For GTK+ 1.2 please check that gtk-config is in the path, +and that the version is 1.2.3 or above. Also check that the +libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config +--libs' are in the LD_LIBRARY_PATH or equivalent. ]) ;; esac @@ -2558,8 +2689,8 @@ equivalent variable and GTK+ is version 1.2.3 or above. if test "$WXGTK20" = 1; then save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" + CFLAGS="$CFLAGS $wx_cv_cflags_gtk" + LIBS="$LIBS $wx_cv_lib_gtk" AC_CHECK_FUNCS([pango_font_family_is_monospace]) @@ -2816,6 +2947,10 @@ equivalent variable and GTK+ is version 1.2.3 or above. fi if test "$wxUSE_MOTIF" = 1; then + if test "$wxUSE_UNICODE" = "yes"; then + AC_MSG_ERROR([Unicode configuration not supported with Motif]) + fi + AC_MSG_CHECKING(for Motif/Lesstif headers) WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h) if test "$ac_find_includes" != "" ; then @@ -3159,18 +3294,19 @@ if test "$TOOLKIT" != "MSW" ; then wxUSE_ODBC=sys fi fi - if test "$wxUSE_ODBC" != "no" ; then - AC_DEFINE(wxUSE_ODBC) - if test "$wxUSE_ODBC" = "builtin" ; then - AC_DEFINE(wxUSE_BUILTIN_IODBC) - fi - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" - - dnl is this still necessary in 2.5? - WXODBCFLAG="-D_IODBC_" + + if test "$wxUSE_ODBC" = "builtin" ; then + AC_DEFINE(wxUSE_BUILTIN_IODBC) fi fi +if test "$wxUSE_ODBC" != "no" ; then + AC_DEFINE(wxUSE_ODBC) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" + + dnl is this still necessary? + WXODBCFLAG="-D_IODBC_" +fi dnl --------------------------------------------------------------------------- dnl wxDisplay Sanity checks @@ -3227,33 +3363,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 --------------------------------------------------------------------------- @@ -3283,6 +3392,8 @@ if test "$wxUSE_OPENGL" = "yes"; then AC_MSG_CHECKING([for -lGL]) WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GL) if test "$ac_find_libraries" != "" ; then + AC_MSG_RESULT([yes]) + WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) if test "$ac_path_to_link" != " -L/usr/lib" ; then LDFLAGS_GL="$ac_path_to_link" @@ -3291,6 +3402,7 @@ if test "$wxUSE_OPENGL" = "yes"; then dnl don't suppose that libGL and libGLU are always in the dnl same directory -- this is not true for some common dnl distributions + AC_MSG_CHECKING([for -lGLU]) WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU) if test "$ac_find_libraries" != "" ; then WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) @@ -3302,11 +3414,14 @@ if test "$wxUSE_OPENGL" = "yes"; then found_gl=1 OPENGL_LIBS="-lGL -lGLU" AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) fi + else + AC_MSG_RESULT([no]) fi if test "$found_gl" != 1; then - AC_MSG_RESULT([no]) AC_MSG_CHECKING([for -lMesaGL]) WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL) if test "$ac_find_libraries" != "" ; then @@ -3491,6 +3606,35 @@ WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_u +if test "$wxUSE_COCOA" = 1; then + AC_LANG_SAVE + AC_WX_LANG_OBJECTIVEC +dnl Recent AppKit/NSEvent.h include parts of IOKit which eventually +dnl gets IOKit/graphics/IOGraphicsTypes.h included which typedefs +dnl Point but only if MacTypes.h was not included first. Of course, +dnl if MacTypes.h is included later then you're screwed when it +dnl tries to typedef Point. Defining __Point__ will cause IOGraphicsTypes.h +dnl to not typedef Point and thus fix the problem. + AC_MSG_CHECKING([if AppKit/NSEvent.h conflicts with CoreFoundation]) + AC_TRY_COMPILE([#include +#include + ],[], + [AC_MSG_RESULT([no])], + [AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([if defining __Point__ will fix it]) + AC_TRY_COMPILE([#define __Point__ 1 +#include +#include + ],[], + [AC_MSG_RESULT([yes]) + AC_DEFINE(__Point__) + ], + [AC_MSG_FAILURE([no])] + )] + ) + AC_LANG_RESTORE +fi + if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then dnl base name of the resource file for wxMac must be the same dnl as library installation base name (-install_name) @@ -3509,11 +3653,11 @@ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then dnl resources are bundled both with shared library and applications dnl since the carb resource *must* be included in the application if test "$wxUSE_MAC" = 1; then - MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o" + MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r -o" dnl this command is used to implement `wx-config --rezflags` and it is dnl eval'd there so escape any metacharacters inside - MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o" + MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r -o" else MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o" MACRESWXCONFIG="echo -n \\\| ${RESCOMP} -d __DARWIN__ -t APPL \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o" @@ -3634,7 +3778,7 @@ dnl Check for functions dnl --------------------------------------------------------------------------- dnl don't check for wchar_t functions if we haven't got wchar_t itself -if test "$wx_cv_sizeof_wchar_t" != "0"; then +if test "$wxUSE_WCHAR_T" = "yes"; then AC_DEFINE(wxUSE_WCHAR_T) dnl check for wcslen in all possible places @@ -3822,7 +3966,7 @@ if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then else AC_CACHE_CHECK([for __cxa_demangle() in ], wx_cv_func_cxa_demangle, [ - AC_TRY_COMPILE([#include ], + AC_TRY_LINK([#include ], [ int rc; __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc); @@ -3841,6 +3985,12 @@ if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then AC_LANG_RESTORE fi +if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then + AC_MSG_WARN([wxStackWalker is only available on Win32 and UNIX... disabled]) + wxUSE_STACKWALKER=no +fi + + dnl check for the function for temp files creation AC_CHECK_FUNCS(mkstemp mktemp, break) @@ -4615,6 +4765,8 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then if test "$USE_DARWIN" = 1; then dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X HAVE_DL_FUNCS=1 + elif test "$USE_DOS" = 1; then + HAVE_DL_FUNCS=0 else dnl the test is a bit complicated because we check for dlopen() both with dnl and without -ldl and we also try to find shl_load() if there is no @@ -4660,7 +4812,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then if test "$HAVE_DL_FUNCS" = 0; then if test "$HAVE_SHL_FUNCS" = 0; then - if test "$USE_UNIX" = 1; then + if test "$USE_UNIX" = 1 -o "$USE_DOS" = 1; then AC_MSG_WARN([Missing dynamic loading support, several features will be disabled]) wxUSE_DYNAMIC_LOADER=no wxUSE_DYNLIB_CLASS=no @@ -4718,13 +4870,15 @@ if test "$wxUSE_TIMER" = "yes"; then AC_DEFINE(wxUSE_TIMER) fi +dnl Unix implementation needs additional checks because audio support +dnl comes in many favours: +if test "$USE_UNIX" = "1" ; then + AC_CHECK_HEADERS([sys/soundcard.h],, + [DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"]) +fi WITH_PLUGIN_SDL=0 if test "$wxUSE_SOUND" = "yes"; then - dnl Unix implementation needs additional checks because audio support - dnl comes in many favours: if test "$USE_UNIX" = "1" ; then - AC_CHECK_HEADERS([sys/soundcard.h]) - if test "$wxUSE_LIBSDL" != "no"; then AM_PATH_SDL([1.2.0], [ @@ -4792,8 +4946,18 @@ 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 @@ -4804,6 +4968,18 @@ if test "$wxUSE_STACKWALKER" = "yes"; then AC_DEFINE(wxUSE_STACKWALKER) fi +if test "$wxUSE_DEBUGREPORT" = "yes"; then + if test "$USE_OS2" = "1"; then + AC_MSG_WARN([Creating debug reports not supported under OS/2 yet, disabled]) + wxUSE_DEBUGREPORT=no + else + AC_DEFINE(wxUSE_DEBUGREPORT) + if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt" + fi + fi +fi + if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then AC_DEFINE(wxUSE_SNGLINST_CHECKER) fi @@ -4816,6 +4992,14 @@ if test "$wxUSE_STD_IOSTREAM" = "yes"; then AC_DEFINE(wxUSE_STD_IOSTREAM) fi +if test "$wxUSE_STD_STRING" = "yes"; then + AC_DEFINE(wxUSE_STD_STRING) +fi + +if test "$wxUSE_STDPATHS" = "yes"; then + AC_DEFINE(wxUSE_STDPATHS) +fi + if test "$wxUSE_TEXTBUFFER" = "yes"; then AC_DEFINE(wxUSE_TEXTBUFFER) fi @@ -4862,6 +5046,9 @@ if test "$wxUSE_LOG" = "yes"; then if test "$wxUSE_LOGDIALOG" = "yes"; then AC_DEFINE(wxUSE_LOG_DIALOG) fi + + dnl the keyboard sample requires wxUSE_LOG + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS keyboard" fi if test "$wxUSE_LONGLONG" = "yes"; then @@ -5235,27 +5422,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 @@ -5391,6 +5580,7 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS" if test "$wxUSE_OLE" = "yes" ; then AC_DEFINE(wxUSE_OLE) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto" fi fi @@ -5416,11 +5606,15 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ fi if test "$wxUSE_IPC" = "yes"; then - if test "$wxUSE_SOCKETS" != "yes"; then + if test "$wxUSE_SOCKETS" != "yes" -a "$USE_WIN32" != 1; then AC_MSG_WARN(wxWidgets IPC classes require sockets... disabled) + wxUSE_IPC=no fi - AC_DEFINE(wxUSE_IPC) + if test "$wxUSE_IPC" = "yes"; then + AC_DEFINE(wxUSE_IPC) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc" + fi fi if test "$wxUSE_CLIPBOARD" = "yes"; then @@ -5474,6 +5668,10 @@ if test "$wxUSE_SPLINES" = "yes" ; then AC_DEFINE(wxUSE_SPLINES) fi +if test "$wxUSE_MOUSEWHEEL" = "yes" ; then + AC_DEFINE(wxUSE_MOUSEWHEEL) +fi + dnl --------------------------------------------------------------------------- dnl GUI controls dnl --------------------------------------------------------------------------- @@ -5543,7 +5741,7 @@ fi if test "$wxUSE_DISPLAY" = "yes"; then AC_DEFINE(wxUSE_DISPLAY) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon" fi if test "$wxUSE_GAUGE" = "yes"; then @@ -5569,6 +5767,7 @@ fi if test "$wxUSE_LISTBOX" = "yes"; then AC_DEFINE(wxUSE_LISTBOX) USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox" fi if test "$wxUSE_LISTCTRL" = "yes"; then @@ -5677,11 +5876,6 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then if test "$wxUSE_COCOA" = 1 ; then AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled]) wxUSE_TOGGLEBTN=no - else - if test "$wxUSE_PM" = 1; then - AC_MSG_WARN([Toggle button not yet supported under PM... disabled]) - wxUSE_TOGGLEBTN=no - fi fi if test "$wxUSE_UNIVERSAL" = "yes"; then AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled]) @@ -5747,6 +5941,7 @@ if test "$wxUSE_POPUPWIN" = "yes"; then AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled]) else AC_DEFINE(wxUSE_POPUPWIN) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup" USES_CONTROLS=1 fi @@ -5984,6 +6179,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 --------------------------------------------------------------------------- @@ -6029,6 +6329,9 @@ fi if test "$wxUSE_HTML" = "yes" ; then CORE_GUI_LIBS="html $CORE_GUI_LIBS" fi +if test "$wxUSE_DEBUGREPORT" = "yes" ; then + CORE_GUI_LIBS="qa $CORE_GUI_LIBS" +fi if test "$wxUSE_XRC" = "yes" ; then CORE_GUI_LIBS="xrc $CORE_GUI_LIBS" fi @@ -6063,9 +6366,11 @@ if test "$wxUSE_MAC" = 1 ; then else LDFLAGS="$LDFLAGS -lCarbonLib" fi +elif test "$USE_DARWIN" = 1; then + LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System" 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 @@ -6123,15 +6428,24 @@ if test "$wxUSE_GUI" = "yes"; then dnl TODO add checks that these samples will really compile (i.e. all the dnl library features they need are present) - dnl TODO some samples are never built so far: - dnl ipc, mfc, nativdlg, oleauto, ownerdrw - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \ - drawing dynamic erase event exec font image \ - minimal propsize rotate shaped widgets render" + dnl TODO some samples are never built so far: mfc (requires VC++) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ + dynamic erase event exec font image minimal mobile \ + mobile/wxedit mobile/styles propsize render \ + richedit rotate shaped vscroll widgets" if test "$wxUSE_MONOLITHIC" != "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" fi + if test "$TOOLKIT" = "MSW"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest" + if test "$wxUSE_UNIVERSAL" != "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg" + fi + fi + if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw" + fi else SAMPLES_SUBDIRS="console" fi @@ -6184,7 +6498,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" @@ -6203,32 +6517,29 @@ WXCONFIG_EXTRALIBS="$LIBS" dnl wx-config must output builtin 3rd party libs in --libs in static build: if test "$wxUSE_REGEX" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty regex${lib_unicode_suffix}" + wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty" fi if test "$wxUSE_EXPAT" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty expat" + wxconfig_3rdparty="expat $wxconfig_3rdparty" fi if test "$wxUSE_ODBC" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty odbc" + wxconfig_3rdparty="odbc $wxconfig_3rdparty" fi if test "$wxUSE_LIBTIFF" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty tiff" + wxconfig_3rdparty="tiff $wxconfig_3rdparty" fi if test "$wxUSE_LIBJPEG" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty jpeg" + wxconfig_3rdparty="jpeg $wxconfig_3rdparty" fi if test "$wxUSE_LIBPNG" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty png" + wxconfig_3rdparty="png $wxconfig_3rdparty" fi if test "$wxUSE_ZLIB" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty zlib" -fi -if test "$wxUSE_ODBC" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty odbc" + wxconfig_3rdparty="zlib $wxconfig_3rdparty" fi for i in $wxconfig_3rdparty ; do - WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" + WXCONFIG_EXTRALIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_EXTRALIBS" done @@ -6264,6 +6575,12 @@ else USE_ODBC=0 fi +if test "$wxUSE_DEBUGREPORT" = "yes" ; then + USE_QA=1 +else + USE_QA=0 +fi + if test $wxUSE_OFFICIAL_BUILD = "yes" ; then OFFICIAL_BUILD=1 else @@ -6344,6 +6661,15 @@ else EXE_LINKER="$CXX -o" fi +if test "$wxUSE_OMF" = "yes"; then + case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + LDFLAGS="$LDFLAGS -Zlinker /EXEPACK" + LDFLAGS_GUI="-Zlinker /PMTYPE:PM" + WXCONFIG_LDFLAGS_GUI="-Zlinker /PMTYPE:PM" + ;; + esac +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. @@ -6545,8 +6871,14 @@ for subdir in `echo $SUBDIRS`; do makefiles="samples/$sample/Makefile.in $makefiles" fi done - else dnl assume that everything compiles for utils &c - makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` + else + dnl assume that everything compiles for utils &c + dnl any that shouldn't be built can be added to + dnl DISABLED_UTILS, DISABLED_CONTRIB or DISABLED_DEMOS + disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`; + eval "disabled=\$$disabled_var" + disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ + makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"` fi else dnl we build wxBase only dnl don't take all samples/utils, just those which build with