X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e8e867ff99be2e9d02e4e94766d27068ae66f57..e605541c3690af3e085b4b36581f3c0267bffbfa:/configure.in diff --git a/configure.in b/configure.in index edae0c269c..b558b707ab 100644 --- a/configure.in +++ b/configure.in @@ -56,7 +56,7 @@ 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=4 -wx_subrelease_number=0 +wx_subrelease_number=1 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_VERSION=$WX_RELEASE.$wx_release_number @@ -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 ;; @@ -418,6 +417,7 @@ 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_CMDLINE_PARSER=no @@ -426,6 +426,7 @@ if test $DEBUG_CONFIGURE = 1; then 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 @@ -611,6 +612,7 @@ 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_CMDLINE_PARSER=yes @@ -619,6 +621,7 @@ else 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 @@ -887,10 +890,11 @@ 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(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) @@ -907,9 +911,10 @@ 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(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) @@ -1142,7 +1147,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 +1367,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 +1391,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 +1512,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 +1570,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 +1707,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 ;; @@ -1691,51 +1765,26 @@ 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 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 + ] +) dnl checks needed to define wxVaCopy AC_CACHE_CHECK([for va_copy], @@ -1839,6 +1888,8 @@ 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_STL" = "yes"; then @@ -1994,8 +2045,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 @@ -3162,18 +3214,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 @@ -3610,7 +3663,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 "$ac_cv_sizeof_wchar_t" != "0"; then AC_DEFINE(wxUSE_WCHAR_T) dnl check for wcslen in all possible places @@ -4790,6 +4843,10 @@ if test "$wxUSE_STACKWALKER" = "yes"; then AC_DEFINE(wxUSE_STACKWALKER) fi +if test "$wxUSE_DEBUGREPORT" = "yes"; then + AC_DEFINE(wxUSE_DEBUGREPORT) +fi + if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then AC_DEFINE(wxUSE_SNGLINST_CHECKER) fi @@ -4802,6 +4859,10 @@ if test "$wxUSE_STD_IOSTREAM" = "yes"; then AC_DEFINE(wxUSE_STD_IOSTREAM) fi +if test "$wxUSE_STDPATHS" = "yes"; then + AC_DEFINE(wxUSE_STDPATHS) +fi + if test "$wxUSE_TEXTBUFFER" = "yes"; then AC_DEFINE(wxUSE_TEXTBUFFER) fi @@ -4848,6 +4909,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 @@ -5221,27 +5285,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 @@ -5377,6 +5443,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 @@ -5402,11 +5469,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 @@ -5529,7 +5600,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 @@ -5555,6 +5626,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 @@ -5733,6 +5805,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 @@ -6156,7 +6229,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 @@ -6214,15 +6287,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 @@ -6275,7 +6357,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"