X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f12a2bcfe9795fef47ccf995bca3fdd985baba30..70b7a5fe0cb26e15c52bcdeb730f43eb3838360f:/configure.in?ds=sidebyside diff --git a/configure.in b/configure.in index 8dac74e849..7726d2779a 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=4 -wx_subrelease_number=1 +wx_minor_version_number=6 +wx_release_number=0 +wx_subrelease_number=0 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=4 +WX_CURRENT=0 WX_REVISION=0 -WX_AGE=4 +WX_AGE=0 dnl ------------------------------------------------------------------------ @@ -417,14 +418,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 @@ -453,6 +457,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 @@ -604,25 +609,28 @@ else DEFAULT_wxUSE_LIBXPM=yes DEFAULT_wxUSE_LIBMSPACK=yes DEFAULT_wxUSE_LIBSDL=no - DEFAULT_wxUSE_LIBGNOMEPRINT=no + DEFAULT_wxUSE_LIBGNOMEPRINT=yes DEFAULT_wxUSE_ODBC=no - DEFAULT_wxUSE_OPENGL=no + DEFAULT_wxUSE_OPENGL=yes 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=yes + DEFAULT_wxUSE_STD_STRING=yes 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 +654,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 @@ -738,7 +747,7 @@ else DEFAULT_wxUSE_POPUPWIN=yes DEFAULT_wxUSE_TIPWINDOW=yes - DEFAULT_wxUSE_UNICODE=no + DEFAULT_wxUSE_UNICODE=yes DEFAULT_wxUSE_UNICODE_MSLU=yes DEFAULT_wxUSE_WCSRTOMBS=no @@ -836,6 +845,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 @@ -886,10 +896,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) @@ -906,9 +917,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) @@ -1139,6 +1152,7 @@ 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], wxUSE_JOYSTICK) @@ -1360,14 +1374,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_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 +AC_BAKEFILE_PROG_CC dnl is -traditional needed for correct compilations dnl adds -traditional for gcc if needed @@ -1384,14 +1391,7 @@ dnl defines CXXFLAGS 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_BAKEFILE_PROG_CXX AC_LANG_RESTORE @@ -1569,7 +1569,7 @@ case "${host}" in 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_CACHE_CHECK([for gcc/libc version], wx_cv_gccversion,[ AC_TRY_RUN( dnl Check the gcc version macro. [ @@ -1615,9 +1615,6 @@ case "${host}" in wxUSE_OMF=yes enable_omf=yes fi - if test "$wxUSE_OMF" = "yes"; then - LDFLAGS="$LDFLAGS -Zlinker /EXEPACK -Zlinker /PMTYPE:PM" - fi dnl (end of OS/2-only piece) ;; *) @@ -1882,9 +1879,46 @@ dnl check whether C++ compiler supports C++ casts AC_CXX_CONST_CAST AC_CXX_REINTERPRET_CAST AC_CXX_STATIC_CAST -AC_CXX_DYNAMIC_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++) @@ -1904,14 +1938,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 ], @@ -2606,8 +2632,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]) @@ -2864,6 +2890,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 @@ -3305,6 +3335,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" @@ -3313,6 +3345,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]) @@ -3324,11 +3357,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 @@ -3513,6 +3549,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) @@ -3844,7 +3909,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); @@ -3863,6 +3928,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) @@ -4836,6 +4907,16 @@ 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) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt" + fi +fi + if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then AC_DEFINE(wxUSE_SNGLINST_CHECKER) fi @@ -4848,6 +4929,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 @@ -5516,6 +5605,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 --------------------------------------------------------------------------- @@ -5720,11 +5813,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]) @@ -6178,6 +6266,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 @@ -6212,6 +6303,8 @@ 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 IOKit -framework Cocoa" @@ -6272,16 +6365,23 @@ 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: mfc, ownerdrw - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \ - drawing dynamic erase event exec font image \ - minimal propsize rotate shaped vscroll 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 nativdlg regtest richedit" + 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" @@ -6354,32 +6454,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 @@ -6415,6 +6512,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 @@ -6495,6 +6598,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.