X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34b08d2cf5789e469c60ed3ed1691174603a0b99..5f109709da1d477ed8071617b88074121e40223f:/configure.in diff --git a/configure.in b/configure.in index e495deb718..8d80d2d685 100644 --- a/configure.in +++ b/configure.in @@ -73,6 +73,7 @@ dnl ------------------------------------------------------------------------ dnl OS (assume Unix) USE_UNIX=1 +USE_OS2=0 USE_WIN32=0 USE_DOS=0 USE_BEOS=0 @@ -140,6 +141,7 @@ DEFAULT_DEFAULT_wxUSE_X11=0 PROGRAM_EXT= SO_SUFFIX=so SAMPLES_RPATH_FLAG= +SAMPLES_RPATH_POSTLINK= 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" @@ -287,8 +289,34 @@ case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) AC_DEFINE(__EMX__) + USE_OS2=1 PROGRAM_EXT=".exe" DEFAULT_DEFAULT_wxUSE_PM=1 + dnl "c++" wrapper is not always available, so always use plain gcc. + CXX=gcc + LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals" + dnl + dnl Some special code that's automatically added by autoconf-2.57 for OS/2 + dnl and hopefully also by autoconf-2.58 and newer on all other platforms. + dnl For now however, we still need it to make sure the configure script + dnl works on OS/2 no matter what platform it is generated on. + ac_executable_extensions=".exe" + export ac_executable_extensions + dnl This strange code is necessary to deal with handling of + dnl backslashes by ksh and pdksh's sh variant. + ac_save_IFS="$IFS" + IFS="\\" + ac_TEMP_PATH= + for ac_dir in $PATH; do + IFS=$ac_save_IFS + if test -z "$ac_TEMP_PATH"; then + ac_TEMP_PATH="$ac_dir" + else + ac_TEMP_PATH="$ac_TEMP_PATH/$ac_dir" + fi + done + export PATH="$ac_TEMP_PATH" + unset ac_TEMP_PATH ;; powerpc-*-darwin* ) @@ -360,6 +388,8 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CONTROLS=no DEFAULT_wxUSE_REGEX=no + DEFAULT_wxUSE_XML=no + DEFAULT_wxUSE_EXPAT=no DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no DEFAULT_wxUSE_LIBJPEG=no @@ -461,6 +491,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_IMAGLIST=no + DEFAULT_wxUSE_LISTBOOK=no DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no @@ -501,7 +532,8 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ICO_CUR=no DEFAULT_wxUSE_ACCESSIBILITY=no - DEFAULT_wxUSE_MONOLITHIC=yes + DEFAULT_wxUSE_MONOLITHIC=no + DEFAULT_wxUSE_OFFICIAL_BUILD=no else DEFAULT_wxUSE_UNIVERSAL=no DEFAULT_wxUSE_STL=no @@ -533,6 +565,8 @@ else DEFAULT_wxUSE_GUI=yes DEFAULT_wxUSE_REGEX=yes + DEFAULT_wxUSE_XML=yes + DEFAULT_wxUSE_EXPAT=yes DEFAULT_wxUSE_ZLIB=yes DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes @@ -634,6 +668,7 @@ else DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes + DEFAULT_wxUSE_LISTBOOK=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes @@ -674,7 +709,8 @@ else DEFAULT_wxUSE_ICO_CUR=yes DEFAULT_wxUSE_ACCESSIBILITY=no - DEFAULT_wxUSE_MONOLITHIC=yes + DEFAULT_wxUSE_MONOLITHIC=no + DEFAULT_wxUSE_OFFICIAL_BUILD=no fi dnl WX_ARG_WITH should be used to select whether an external package will be @@ -736,6 +772,7 @@ WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (http: WX_ARG_SYS_WITH(regex, [ --with-regex enable support for wxRegEx class], wxUSE_REGEX) WX_ARG_SYS_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB) WX_ARG_SYS_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC) +WX_ARG_SYS_WITH(expat, [ --with-expat enable XML support using expat parser], wxUSE_EXPAT) dnl --------------------------------------------------------------------------- dnl compile options @@ -749,9 +786,11 @@ WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], w if test "$wxUSE_DEBUG" = "yes"; then DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes + BUILD=debug elif test "$wxUSE_DEBUG" = "no"; then DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no + BUILD=release fi WX_ARG_ENABLE(debug_flag, [ --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)], wxUSE_DEBUG_FLAG) @@ -765,7 +804,6 @@ WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without C++ WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE) WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS) -WX_ARG_ENABLE(compat20, [ --enable-compat20 enable wxWindows 2.0 compatibility], WXWIN_COMPATIBILITY_2) WX_ARG_ENABLE(compat22, [ --enable-compat22 enable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2) WX_ARG_ENABLE(compat24, [ --disable-compat24 disable wxWindows 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable) @@ -906,6 +944,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes + DEFAULT_wxUSE_LISTBOOK=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes @@ -943,6 +982,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_IMAGLIST=no + DEFAULT_wxUSE_LISTBOOK=no DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no @@ -972,9 +1012,7 @@ fi ## FIXME: This is a blatant hack if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then wxUSE_PRINTING_ARCHITECTURE=no - wxUSE_CLIPBOARD=no wxUSE_DRAG_AND_DROP=no - wxUSE_DATAOBJ=no # Generic notebook requires tab dialog DEFAULT_wxUSE_TABDIALOG=yes DEFAULT_wxUSE_TOOLBAR_NATIVE=no @@ -996,6 +1034,7 @@ WX_ARG_ENABLE(display, [ --enable-display use wxDisplay class], wxUS WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE) WX_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID) WX_ARG_ENABLE(imaglist, [ --enable-imaglist use wxImageList class], wxUSE_IMAGLIST) +WX_ARG_ENABLE(listbook, [ --enable-listbook use wxListbook class], wxUSE_LISTBOOK) WX_ARG_ENABLE(listbox, [ --enable-listbox use wxListBox class], wxUSE_LISTBOX) WX_ARG_ENABLE(listctrl, [ --enable-listctrl use wxListCtrl class], wxUSE_LISTCTRL) WX_ARG_ENABLE(notebook, [ --enable-notebook use wxNotebook class], wxUSE_NOTEBOOK) @@ -1071,19 +1110,24 @@ WX_ARG_ENABLE(ico_cur, [ --enable-icocur use Windows ICO and CUR fo fi +dnl --------------------------------------------------------------------------- +dnl some win32 settings +dnl --------------------------------------------------------------------------- + +WX_ARG_ENABLE(official_build, [ --enable-official_build official build of wxWindows (win32 DLL only)], wxUSE_OFFICIAL_BUILD) +AC_ARG_ENABLE(vendor, [ --enable-vendor=VENDOR vendor name (win32 DLL only)], [VENDOR="$enableval"]) +if test "x$VENDOR" = "x"; then + VENDOR="custom" +fi + dnl General settings (needed for GUI and non-GUI compilations alike). dnl Path separator; ':' for unix, ';' for OS/2 -dnl Stem for flex output; lexyy for OS/2, lex.yy otherwise case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) PATH_IFS=';' -dnl Really ought to text for this as meanwhile there are flex versions using -dnl lex.yy as well due to FAT support being more and more dropped... - LEX_STEM="lexyy" ;; *) PATH_IFS=':' - LEX_STEM="lex.yy" ;; esac @@ -1291,7 +1335,10 @@ AC_PROG_RANLIB dnl ar command dnl defines AR with the appropriate command -AC_CHECK_PROG(AR, ar, ar, ar) +AC_CHECK_PROG(AR, ar, ar) +if test "x$AR" = "x" ; then + AC_MSG_ERROR([ar is needed to build wxWindows]) +fi dnl install checks dnl defines INSTALL with the appropriate command @@ -1396,27 +1443,18 @@ you are trying to compile. fi dnl make without VPATH fi dnl not GNU make -dnl YACC checks -dnl defines YACC with the appropriate command -AC_PROG_YACC - -dnl LEX checks -dnl defines LEX with the appropriate command -dnl defines LEXLIB with the appropriate library -AC_PROG_LEX - dnl needed for making link to setup.h AC_PROG_LN_S dnl --------------------------------------------------------------------------- dnl When we are using gcc on OS/2, we want to be either using resources (PM) dnl or a more complete POSIX emulation for Motif/GTK+/X11 +dnl Moreover we need to link explicitly against either stdcpp.a or stdcxx.a +dnl (depending on compiler version), since we are using "gcc", not "g++/c++". dnl --------------------------------------------------------------------------- dnl (OS/2-only piece) case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) - dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++". - LIBS="$LIBS -lstdcpp" if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then dnl More complete Unix emulation for unix-like ports dnl by linking in POSIX/2's cExt (if available). @@ -1425,6 +1463,26 @@ 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 3 or later], wx_cv_gcc3,[ + AC_TRY_COMPILE([#include ], + [ + #if (__GNUC__ < 3) + #error old gcc + #endif + ], + [ + wx_cv_gcc3=yes + ], + [ + wx_cv_gcc3=no + ] + ) + ]) + if test "$wx_cv_gcc3" = "no"; then + LIBS="$LIBS -lstdcpp" + else + LIBS="$LIBS -lstdcxx" + fi ;; esac dnl (end of OS/2-only piece) @@ -1490,9 +1548,15 @@ case "${host}" in esac if test "$wxUSE_GUI" = "yes"; then - if test "$wxUSE_UNIX" = "yes"; then + if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then dnl defines HAVE_X11_XKBLIB_H - AC_CHECK_HEADERS(X11/XKBlib.h) + AC_CHECK_HEADERS(X11/Xlib.h) + AC_CHECK_HEADERS([X11/XKBlib.h], [], [], + [ + #if HAVE_X11_XLIB_H + #include + #endif + ]) fi fi @@ -1607,6 +1671,51 @@ WX_CPP_EXPLICIT dnl check whether C++ compiler supports C++ casts AC_CXX_CONST_CAST +dnl check various STL features +if test "$wxUSE_STL" = "yes"; then + AC_LANG_PUSH(C++) + + dnl check for basic STL functionality + AC_MSG_CHECKING([for basic STL functionality]) + AC_TRY_COMPILE([#include + #include + #include + #include + #include ], + [std::vector moo; + std::list foo; + std::vector::iterator it = + std::find_if(moo.begin(), moo.end(), + std::bind2nd(std::less(), 3));], + [AC_MSG_RESULT([yes])], + [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 ], + [std::string foo, bar; + foo.compare(bar); + foo.compare(1, 1, bar); + foo.compare(1, 1, bar, 1, 1); + foo.compare(""); + foo.compare(1, 1, ""); + foo.compare(1, 1, "", 2);], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_STD_STRING_COMPARE)], + [AC_MSG_RESULT(no)]) + + AC_LANG_POP +fi + dnl --------------------------------------------------------------------------- dnl Define search path for includes and libraries: all headers and libs will be dnl looked for in all directories of this path @@ -2015,10 +2124,12 @@ if test "$wxUSE_LIBTIFF" != "no" ; then TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" fi AC_CHECK_HEADER(tiffio.h, - AC_CHECK_LIB(tiff, TIFFError, - TIFF_LINK=" -ltiff", - , - $TIFF_PREREQ_LINKS) + [ + AC_CHECK_LIB(tiff, TIFFError, + TIFF_LINK=" -ltiff", + , + $TIFF_PREREQ_LINKS) + ] ) if test "x$TIFF_LINK" = "x" ; then @@ -2039,6 +2150,54 @@ if test "$wxUSE_LIBTIFF" != "no" ; then fi fi +dnl ------------------------------------------------------------------------ +dnl Check for expat libraries +dnl ------------------------------------------------------------------------ + +if test "$wxUSE_EXPAT" != "no"; then + wxUSE_XML=yes + AC_DEFINE(wxUSE_EXPAT) + AC_DEFINE(wxUSE_XML) + + if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then + AC_CHECK_HEADER([expat.h], [found_expat_h=1]) + if test "x$found_expat_h" = "x1"; then + dnl Expat 1.95.6 comes with broken expat.h: + AC_CACHE_CHECK([if expat.h is valid C++ header], + wx_cv_expat_is_not_broken, + [ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include ],[], + wx_cv_expat_is_not_broken=yes, + wx_cv_expat_is_not_broken=no + ) + AC_LANG_RESTORE + ] + ) + if test "$wx_cv_expat_is_not_broken" = "yes" ; then + AC_CHECK_LIB(expat, XML_ParserCreate, EXPAT_LINK=" -lexpat") + fi + fi + if test "x$EXPAT_LINK" = "x" ; then + if test "$wxUSE_EXPAT" = "sys" ; then + AC_MSG_ERROR([system expat library not found! Use --with-expat=builtin to use built-in version]) + else + AC_MSG_WARN([system expat library not found, will use built-in instead]) + wxUSE_EXPAT=builtin + fi + else + dnl we are using the system library + wxUSE_EXPAT=sys + fi + fi + if test "$wxUSE_EXPAT" = "builtin" ; then + dnl Expat needs this: + AC_CONFIG_SUBDIRS([src/expat]) + fi +fi + + dnl ---------------------------------------------------------------- dnl search for toolkit (widget sets) dnl ---------------------------------------------------------------- @@ -2103,6 +2262,14 @@ if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_MSW" = 1 ; then TOOLKIT=MSW GUIDIST=MSW_DIST + + dnl -mwindows causes a heap of other default gui libs to be linked in. + dnl FIXME: If cygwin needs this, please push it above, if not, please + dnl remove this comment :-) + case "${host}" in + *-*-mingw32* ) + WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows" + esac fi if test "$wxUSE_GTK" = 1; then @@ -2631,6 +2798,9 @@ equivalent variable and GTK+ is version 1.2.3 or above. TOOLKIT=MAC dnl we can't call this MAC_DIST or autoconf thinks its a macro GUIDIST=MACX_DIST + dnl wxMac version of wxBase and wxCocoa or wxBase-only built on Darwin + dnl are different, so they need different names: + WXBASEPORT="_carbon" fi if test "$wxUSE_COCOA" = 1; then @@ -2642,8 +2812,6 @@ equivalent variable and GTK+ is version 1.2.3 or above. if test "$wxUSE_PM" = 1; then TOOLKIT=PM GUIDIST=GTK_DIST - AC_MSG_WARN([OS/2 threads are not yet supported... disabled]) - wxUSE_THREADS="no" fi dnl the name of the directory where the files for this toolkit live @@ -2747,31 +2915,42 @@ IODBC_C_SRC="" dnl ODBC is handled seperately for MSW if test "$TOOLKIT" != "MSW" ; then + if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then + dnl This is not ideal we really ough to use the unixodbc-config + dnl or iodbc-config if they exist. + + AC_CHECK_HEADER([sql.h], [found_sql_h=1]) + if test "x$found_sql_h" = "x1" ; then + AC_CHECK_LIB(SQLAllocEnv, iodbc, ODBC_LINK=" -liodbc", + [ + AC_CHECK_LIB(SQLAllocEnv, unixodbc, ODBC_LINK=" -lunixodbc", + [ + AC_CHECK_LIB(SQLAllocEnv, odbc, ODBC_LINK=" -lodbc") + ]) + ]) + fi + if test "x$ODBC_LINK" = "x" ; then + if test "$wxUSE_ODBC" = "sys" ; then + AC_MSG_ERROR([system ODBC library not found! Use --with-odbc=builtin to use built-in version]) + else + AC_MSG_WARN([system ODBC library not found, will use built-in instead]) + wxUSE_ODBC=builtin + fi + else + dnl we are using the system library + 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" = "sys" ; then - dnl This is not ideal we really ough to use the unixodbc-config - dnl or iodbc-config if they exist. - - AC_CHECK_HEADER(sql.h) - AC_SEARCH_LIBS(SQLAllocEnv,iodbc unixodbc odbc , , [ - wxUSE_ODBC=builtin; - AC_MSG_WARN( [ can't find system Odbc library falling back to builtin ]) - ] ) - fi - dnl Not "no" either... - if test "$wxUSE_ODBC" != "sys" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" - fi - fi - fi if test "$wxUSE_REGEX" = "builtin" ; then @@ -2799,10 +2978,8 @@ if test "$wxUSE_OPENGL" = "yes"; then WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, GL/gl.h) if test "$ac_find_includes" != "" ; then AC_MSG_RESULT(found in $ac_find_includes) - set -x WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS) CPPFLAGS="$CPPFLAGS$ac_path_to_include" - set +x fi AC_CHECK_HEADER(GL/gl.h, @@ -2834,7 +3011,7 @@ if test "$wxUSE_OPENGL" = "yes"; then fi fi - if "$found_gl" != 1; then + if test "$found_gl" != 1; then AC_MSG_RESULT([no]) AC_MSG_CHECKING([for -lMesaGL]) WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL) @@ -2861,7 +3038,7 @@ if test "$wxUSE_OPENGL" = "yes"; then USE_OPENGL=1 AC_DEFINE(wxUSE_OPENGL) AC_DEFINE(wxUSE_GLCANVAS) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf" fi fi @@ -2882,13 +3059,18 @@ if test "$wxUSE_UNICODE" = "yes"; then fi lib_debug_suffix= -BUILD=release +DEBUG_FLAG=0 if test "$wxUSE_DEBUG_FLAG" = "yes"; then lib_debug_suffix=d - BUILD=debug + DEBUG_FLAG=1 +fi + +DEBUG_INFO=0 +if test "$wxUSE_DEBUG_INFO" = "yes"; then + DEBUG_INFO=1 fi -WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"` +WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"` TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}" TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}" @@ -2896,12 +3078,14 @@ TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_su if test "$cross_compiling" = "yes"; then TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}" + HOST_SUFFIX="-${host_alias}" fi dnl library link name WX_LIBRARY="wx_${TOOLCHAIN_NAME}" WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}" -WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" +WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}" +WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" dnl the name of the shared library WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" @@ -2979,7 +3163,7 @@ if test "$wxUSE_SHARED" = "yes"; then case "${host}" in *-*-linux* | *-*-gnu* ) SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib" - ;; + ;; *-*-solaris2* ) if test "$GCC" = yes ; then @@ -3018,6 +3202,21 @@ if test "$wxUSE_SHARED" = "yes"; then SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib" fi ;; + + powerpc-*-darwin* ) + SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@" + cat <change-install-names +#!/bin/sh +libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` +inst_cmd="install_name_tool " +for i in \${libnames} ; do + inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}" +done +\${inst_cmd} \${3} +EOF + chmod +x change-install-names + ;; + esac dnl set target to shared if not explicitly chose static before @@ -3515,12 +3714,16 @@ AC_CHECK_FUNCS(inet_addr, [ AC_CHECK_LIB(nsl, inet_addr, INET_LINK="nsl", - AC_CHECK_LIB(resolv, inet_addr, - INET_LINK="resolv", - AC_CHECK_LIB(socket, inet_addr, - INET_LINK="socket" + [ + AC_CHECK_LIB(resolv, inet_addr, + INET_LINK="resolv", + [ + AC_CHECK_LIB(socket, inet_addr, + INET_LINK="socket" + ) + ] ) - ) + ] ) ] ) @@ -3546,12 +3749,13 @@ dnl Checks specific to contrib libs (MMedia) dnl ------------------------------------------ dnl Check for ESD: -ESD_LINK= -AC_CHECK_HEADER([esd.h], [ - AC_CHECK_LIB(esd, esd_close, [ - ESD_LINK="-lesd" +EXTRALIBS_ESD= +AC_CHECK_LIB(esd, esd_close, [ + AC_CHECK_HEADERS([esd.h], [ + EXTRALIBS_ESD="-lesd" ]) ]) +AC_SUBST(EXTRALIBS_ESD) dnl =========================================================================== @@ -3562,12 +3766,13 @@ dnl flush the cache AC_CACHE_SAVE dnl --------------------------------------------------------------------------- -dnl thread support for Unix (for Win32 see past the next matching "else") +dnl thread support for Unix (for Win32 and OS/2 see past +dnl the next matching "else") dnl --------------------------------------------------------------------------- dnl under MSW (except mingw32) we always have thread support CPP_MT_FLAG= -if test "$TOOLKIT" != "MSW"; then +if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then dnl the code below: dnl @@ -3888,6 +4093,11 @@ else CFLAGS="$CFLAGS_OLD" fi ;; + *-pc-os2*emx ) + CFLAGS="$CFLAGS -Zmt -D__ST_MT_ERRNO__" + CXXFLAGS="$CXXFLAGS -Zmt -D__ST_MT_ERRNO__" + LDFLAGS="$LDFLAGS -Zmt" + ;; esac fi fi @@ -4020,12 +4230,6 @@ dnl --------------------------------------------------------------------------- dnl compatibility level dnl --------------------------------------------------------------------------- -if test "$WXWIN_COMPATIBILITY_2" = "yes"; then - AC_DEFINE(WXWIN_COMPATIBILITY_2) - - WXWIN_COMPATIBILITY_2_2="yes" -fi - if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then AC_DEFINE(WXWIN_COMPATIBILITY_2_2) @@ -4110,10 +4314,6 @@ if test "$wxUSE_FILESYSTEM" = "yes"; then AC_DEFINE(wxUSE_FILESYSTEM) fi -if test "$wxUSE_FS_INET" = "yes"; then - AC_DEFINE(wxUSE_FS_INET) -fi - if test "$wxUSE_FS_ZIP" = "yes"; then AC_DEFINE(wxUSE_FS_ZIP) fi @@ -4348,12 +4548,16 @@ dnl ------------------------------------------------------------------------ dnl wxSocket dnl ------------------------------------------------------------------------ -dnl VZ: the GUI hooks wxSocket needs are not implemented yet in wxMGL +dnl VZ: the GUI hooks wxSocket needs are not implemented yet in some toolkits if test "$wxUSE_SOCKETS" = "yes"; then if test "$wxUSE_MGL" = "1"; then AC_MSG_WARN([wxSocket not yet supported under MGL... disabled]) wxUSE_SOCKETS="no" fi + if test "$wxUSE_COCOA" = "1"; then + AC_MSG_WARN([wxSocket not yet supported under Cocoa... disabled]) + wxUSE_SOCKETS="no" + fi fi if test "$wxUSE_SOCKETS" = "yes"; then @@ -4361,15 +4565,17 @@ if test "$wxUSE_SOCKETS" = "yes"; then if test "$TOOLKIT" != "MSW"; then dnl under Solaris and OS/2, socket functions live in -lsocket AC_CHECK_FUNC(socket,, - AC_CHECK_LIB(socket, socket, - if test "$INET_LINK" != " -lsocket"; then - INET_LINK="$INET_LINK -lsocket" - fi, - [ - AC_MSG_WARN([socket library not found - sockets will be disabled]) - wxUSE_SOCKETS=no - ] - ) + [ + AC_CHECK_LIB(socket, socket, + if test "$INET_LINK" != " -lsocket"; then + INET_LINK="$INET_LINK -lsocket" + fi, + [ + AC_MSG_WARN([socket library not found - sockets will be disabled]) + wxUSE_SOCKETS=no + ] + ) + ] ) fi fi @@ -4448,6 +4654,46 @@ if test "$wxUSE_SOCKETS" = "yes" ; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" fi +if test "$wxUSE_PROTOCOL" = "yes"; then + if test "$wxUSE_SOCKETS" != "yes"; then + AC_MSG_WARN(Protocol classes require sockets... disabled) + wxUSE_PROTOCOL=no + fi +fi + +if test "$wxUSE_PROTOCOL" = "yes"; then + AC_DEFINE(wxUSE_PROTOCOL) + + if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then + AC_DEFINE(wxUSE_PROTOCOL_HTTP) + fi + if test "$wxUSE_PROTOCOL_FTP" = "yes"; then + AC_DEFINE(wxUSE_PROTOCOL_FTP) + fi + if test "$wxUSE_PROTOCOL_FILE" = "yes"; then + AC_DEFINE(wxUSE_PROTOCOL_FILE) + fi +else + if test "$wxUSE_FS_INET" = "yes"; then + AC_MSG_WARN([HTTP filesystem require protocol classes... disabled]) + wxUSE_FS_INET="no" + fi +fi + +if test "$wxUSE_URL" = "yes"; then + if test "$wxUSE_PROTOCOL" != "yes"; then + AC_MSG_WARN(wxURL class requires wxProtocol... disabled) + wxUSE_URL=no + fi + if test "$wxUSE_URL" = "yes"; then + AC_DEFINE(wxUSE_URL) + fi +fi + +if test "$wxUSE_FS_INET" = "yes"; then + AC_DEFINE(wxUSE_FS_INET) +fi + dnl --------------------------------------------------------------------------- dnl Joystick support dnl --------------------------------------------------------------------------- @@ -4458,16 +4704,8 @@ if test "$wxUSE_GUI" = "yes"; then AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled]) wxUSE_JOYSTICK=no fi - if test "$TOOLKIT" = "MOTIF"; then - AC_MSG_WARN([Joystick not yet supported under Motif... disabled]) - wxUSE_JOYSTICK=no - fi - if test "$TOOLKIT" = "X11"; then - AC_MSG_WARN([Joystick not yet supported under X11... disabled]) - wxUSE_JOYSTICK=no - fi - - dnl under MSW we always have joystick support + + 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 @@ -4490,7 +4728,7 @@ dnl DLL support dnl ------------------------------------------------------------------------ dnl under MSW we always have LoadLibrary/GetProcAddress -if test "$TOOLKIT" != "MSW"; then +if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then HAVE_DL_FUNCS=0 HAVE_SHL_FUNCS=0 @@ -4533,8 +4771,11 @@ if test "$TOOLKIT" != "MSW"; then dnl check also for dlerror() if test "$HAVE_DL_FUNCS" = 1; then AC_CHECK_FUNCS(dlerror, - AC_DEFINE(HAVE_DLERROR), - AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))) + AC_DEFINE(HAVE_DLERROR), + [ + AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)) + ] + ) fi fi @@ -4554,7 +4795,8 @@ fi if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then AC_DEFINE(wxUSE_DYNAMIC_LOADER) -elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then +fi +if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then AC_DEFINE(wxUSE_DYNLIB_CLASS) fi @@ -4569,11 +4811,11 @@ fi if test "$wxUSE_UNICODE" = "yes" ; then AC_DEFINE(wxUSE_UNICODE) - if test "$wxUSE_MSW" != 1; then + if test "$USE_WIN32" != 1; then wxUSE_UNICODE_MSLU=no fi - if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then + if test "$USE_WIN32" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then AC_CHECK_LIB(unicows,main, [ AC_DEFINE(wxUSE_UNICODE_MSLU) @@ -4612,17 +4854,8 @@ if test "$wxUSE_CONSTRAINTS" = "yes"; then fi if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - -dnl There is now experimental generic MDI support -dnl if test "$wxUSE_UNIVERSAL" = "yes"; then -dnl AC_MSG_WARN(MDI not yet supported for wxUniversal... disabled) -dnl wxUSE_MDI_ARCHITECTURE=no -dnl fi - - if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - AC_DEFINE(wxUSE_MDI_ARCHITECTURE) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" - fi + AC_DEFINE(wxUSE_MDI_ARCHITECTURE) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" fi if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then @@ -4849,6 +5082,11 @@ if test "$wxUSE_IMAGLIST" = "yes"; then AC_DEFINE(wxUSE_IMAGLIST) fi +if test "$wxUSE_LISTBOOK" = "yes"; then + AC_DEFINE(wxUSE_LISTBOOK) + USES_CONTROLS=1 +fi + if test "$wxUSE_LISTBOX" = "yes"; then AC_DEFINE(wxUSE_LISTBOX) USES_CONTROLS=1 @@ -5080,43 +5318,13 @@ fi if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then AC_DEFINE(wxUSE_SYSTEM_OPTIONS) -if test "$TOOLKIT" = "MSW"; then +if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \ + "$TOOLKIT" = "MOTIF"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" fi fi -if test "$wxUSE_PROTOCOL" = "yes"; then - if test "$wxUSE_SOCKETS" != "yes"; then - AC_MSG_WARN(Protocol classes require sockets... disabled) - wxUSE_PROTOCOL=no - fi - - if test "$wxUSE_PROTOCOL" = "yes"; then - AC_DEFINE(wxUSE_PROTOCOL) - - if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then - AC_DEFINE(wxUSE_PROTOCOL_HTTP) - fi - if test "$wxUSE_PROTOCOL_FTP" = "yes"; then - AC_DEFINE(wxUSE_PROTOCOL_FTP) - fi - if test "$wxUSE_PROTOCOL_FILE" = "yes"; then - AC_DEFINE(wxUSE_PROTOCOL_FILE) - fi - fi -fi - -if test "$wxUSE_URL" = "yes"; then - if test "$wxUSE_PROTOCOL" != "yes"; then - AC_MSG_WARN(wxURL class requires wxProtocol... disabled) - wxUSE_URL=no - fi - if test "$wxUSE_URL" = "yes"; then - AC_DEFINE(wxUSE_URL) - fi -fi - if test "$wxUSE_MINIFRAME" = "yes"; then AC_DEFINE(wxUSE_MINIFRAME) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" @@ -5270,6 +5478,29 @@ AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX") dnl define the variables used in wx-config top_builddir_wxconfig=`pwd` + +dnl --------------------------------------------------------------------------- +dnl define variables with all built libraries for wx-config +dnl --------------------------------------------------------------------------- + +CORE_BASE_LIBS="net base" +CORE_GUI_LIBS="adv core" + +if test "$wxUSE_XML" = "yes" ; then + CORE_BASE_LIBS="xml $CORE_BASE_LIBS" +fi +if test "$wxUSE_ODBC" != "no" ; then + CORE_BASE_LIBS="odbc $CORE_BASE_LIBS" + CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS" +fi +if test "$wxUSE_HTML" = "yes" ; then + CORE_GUI_LIBS="html $CORE_GUI_LIBS" +fi + +AC_SUBST(CORE_BASE_LIBS) +AC_SUBST(CORE_GUI_LIBS) + + dnl --------------------------------------------------------------------------- dnl Output the makefiles and such from the results found above dnl --------------------------------------------------------------------------- @@ -5342,7 +5573,7 @@ if test "$wxUSE_GUI" = "yes"; then 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" + minimal propsize rotate shaped widgets render" if test "$wxUSE_MONOLITHIC" != "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" @@ -5382,6 +5613,8 @@ CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXW LIBS=`echo $LIBS | sed 's/ \+/ /g'` EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" +EXTRALIBS_XML="$EXPAT_LINK" +EXTRALIBS_ODBC="$ODBC_LINK" if test "$wxUSE_GUI" = "yes"; then EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'` fi @@ -5398,6 +5631,39 @@ else WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE" fi +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" +fi +if test "$wxUSE_EXPAT" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty expat" +fi +if test "$wxUSE_ODBC" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty odbc" +fi +if test "$wxUSE_LIBTIFF" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty tiff" +fi +if test "$wxUSE_LIBJPEG" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty jpeg" +fi +if test "$wxUSE_LIBPNG" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty png" +fi +if test "$wxUSE_ZLIB" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty zlib" +fi +if test "$wxUSE_ODBC" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty odbc" +fi + +for i in $wxconfig_3rdparty ; do + WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${HOST_SUFFIX}" +done + + if test "x$wxUSE_UNIVERSAL" = "xyes" ; then WXUNIV=1 else @@ -5406,6 +5672,7 @@ fi AC_SUBST(wxUSE_ZLIB) AC_SUBST(wxUSE_REGEX) +AC_SUBST(wxUSE_EXPAT) AC_SUBST(wxUSE_ODBC) AC_SUBST(wxUSE_LIBJPEG) AC_SUBST(wxUSE_LIBPNG) @@ -5417,28 +5684,65 @@ else MONOLITHIC=0 fi -dnl FIXME -- make configurable! -VENDOR="custom" -OFFICIAL_BUILD=0 +if test $wxUSE_ODBC != "no" ; then + USE_ODBC=1 +else + USE_ODBC=0 +fi + +if test $wxUSE_OFFICIAL_BUILD = "yes" ; then + OFFICIAL_BUILD=1 +else + OFFICIAL_BUILD=0 +fi + AC_SUBST(VENDOR) AC_SUBST(OFFICIAL_BUILD) AC_SUBST(WXUNIV) AC_SUBST(MONOLITHIC) +AC_SUBST(LIBS) AC_SUBST(EXTRALIBS) +AC_SUBST(EXTRALIBS_XML) +AC_SUBST(EXTRALIBS_ODBC) AC_SUBST(EXTRALIBS_GUI) AC_SUBST(EXTRALIBS_OPENGL) AC_SUBST(UNICODE) AC_SUBST(BUILD) +AC_SUBST(DEBUG_INFO) +AC_SUBST(DEBUG_FLAG) AC_SUBST(SHARED) TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [[A-Z]] [[a-z]]` AC_SUBST(TOOLKIT_LOWERCASE) AC_SUBST(TOOLKIT_VERSION) AC_SUBST(SAMPLES_RPATH_FLAG) +AC_SUBST(SAMPLES_RPATH_POSTLINK) +AC_SUBST(HOST_SUFFIX) AC_BAKEFILE +dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP: +if test $GCC_PCH = 1 ; then + CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS" +else + case "${host}" in + powerpc-*-darwin* ) + dnl Some Apple's GCC version are broken and can't handle the + dnl pragmas: + CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS" + ;; + esac +fi +dnl We have to output NO_GCC_PRAGMA with wx-config on Apple, too: +case "${host}" in + powerpc-*-darwin* ) + dnl Some Apple's GCC version are broken and can't handle the + dnl pragmas: + CODE_GEN_FLAGS_CXX="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS_CXX" + ;; +esac + dnl for convenience, sort the samples in alphabetical order dnl @@ -5451,7 +5755,6 @@ dnl only removes the Unix-like part of the introduced line break. SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" dnl makefile variables -AC_SUBST(LEX_STEM) AC_SUBST(PATH_IFS) dnl global options @@ -5460,7 +5763,8 @@ AC_SUBST(WX_MINOR_VERSION_NUMBER) AC_SUBST(WX_RELEASE_NUMBER) AC_SUBST(WX_LIBRARY_NAME_STATIC) AC_SUBST(WX_LIBRARY_NAME_SHARED) -AC_SUBST(WX_LIBRARY_BASENAME) +AC_SUBST(WX_LIBRARY_BASENAME_NOGUI) +AC_SUBST(WX_LIBRARY_BASENAME_GUI) AC_SUBST(WX_LIBRARY_IMPORTLIB) AC_SUBST(WX_TARGET_LIBRARY) AC_SUBST(WX_LIBRARY_LINK1) @@ -5503,12 +5807,14 @@ dnl wx-config options AC_SUBST(top_builddir_wxconfig) AC_SUBST(host_alias) AC_SUBST(cross_compiling) +AC_SUBST(WXCONFIG_EXTRALIBS) AC_SUBST(WXCONFIG_LIBS) AC_SUBST(WXCONFIG_LIBS_GL) AC_SUBST(WXCONFIG_LIBS_STATIC) AC_SUBST(WXCONFIG_LIBS_STATIC_GL) AC_SUBST(WXCONFIG_INCLUDE) AC_SUBST(WXCONFIG_RPATH) +AC_SUBST(WXCONFIG_LDFLAGS_GUI) AC_SUBST(WX_LARGEFILE_FLAGS) AC_SUBST(CODE_GEN_FLAGS) AC_SUBST(CODE_GEN_FLAGS_CXX) @@ -5560,9 +5866,6 @@ AC_SUBST(MAKEINFO) AC_SUBST(INSTALL_LIBRARY) AC_SUBST(INSTALL_DIR) -dnl contrib tests results: -AC_SUBST(ESD_LINK) - dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am @@ -5640,6 +5943,7 @@ for subdir in `echo $SUBDIRS`; do if test ${subdir} = "samples"; then dnl only take those samples which compile in the current dnl configuration and which exist + makefiles="samples/Makefile.in $makefiles" for sample in `echo $SAMPLES_SUBDIRS`; do if test -d $srcdir/samples/$sample; then makefiles="samples/$sample/Makefile.in $makefiles" @@ -5652,11 +5956,10 @@ for subdir in `echo $SUBDIRS`; do dnl don't take all samples/utils, just those which build with dnl wxBase if test ${subdir} = "samples"; then - makefiles="samples/console/Makefile.in" + makefiles="samples/Makefile.in samples/console/Makefile.in" else dnl utils makefiles="utils/HelpGen/Makefile.in \ - utils/HelpGen/src/Makefile.in \ - utils/makegen/Makefile.in" + utils/HelpGen/src/Makefile.in" fi fi @@ -5682,7 +5985,6 @@ echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:- echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}" echo " What level of wxWindows compatibility should be enabled?" -echo " wxWindows 2.0 ${WXWIN_COMPATIBILITY_2:-no}" echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}" echo " wxWindows 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}" @@ -5693,6 +5995,7 @@ echo " regex ${wxUSE_REGEX}" echo " tiff ${wxUSE_LIBTIFF-none}" echo " zlib ${wxUSE_ZLIB}" echo " odbc ${wxUSE_ODBC}" +echo " expat ${wxUSE_EXPAT}" echo ""