X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b9d41a5ea2ea34079f5a99dfb2a741169d31d51..90b6b974677c26b434fd9810202f4334af2efc27:/configure.in diff --git a/configure.in b/configure.in index 3ceba0cc19..cea535ab16 100644 --- a/configure.in +++ b/configure.in @@ -330,6 +330,7 @@ dnl usage DEBUG_CONFIGURE=0 if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_UNIVERSAL=no + DEFAULT_wxUSE_STL=no DEFAULT_wxUSE_NANOX=no @@ -348,7 +349,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_PRECOMP=no DEFAULT_wxUSE_APPLE_IEEE=no DEFAULT_wxUSE_LOG=yes @@ -360,6 +360,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 @@ -504,6 +506,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_MONOLITHIC=yes else DEFAULT_wxUSE_UNIVERSAL=no + DEFAULT_wxUSE_STL=no DEFAULT_wxUSE_NANOX=no @@ -522,7 +525,6 @@ else DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_PRECOMP=no DEFAULT_wxUSE_APPLE_IEEE=yes DEFAULT_wxUSE_LOG=yes @@ -533,6 +535,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 @@ -736,6 +740,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 @@ -744,9 +749,7 @@ dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(shared, [ --enable-shared create shared library code], wxUSE_SHARED) WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wxUSE_OPTIMISE) WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG) - -dnl allow the precompiled header option to be disabled under Mac OS X/Darwin -WX_ARG_ENABLE(precomp, [ --enable-precomp enable use of precompiled headers (Mac OS X/Darwin)], wxUSE_PRECOMP) +WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL) if test "$wxUSE_DEBUG" = "yes"; then DEFAULT_wxUSE_DEBUG_FLAG=yes @@ -974,31 +977,15 @@ fi ## FIXME: This is a blatant hack if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then wxUSE_PRINTING_ARCHITECTURE=no - wxUSE_HELP=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 - DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_SCROLLBAR=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_CALCTRL=no - DEFAULT_wxUSE_SPINBTN=no - DEFAULT_wxUSE_SPINCTRL=no DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_DRAGIMAGE=no - DEFAULT_wxUSE_FINDREPLDLG=no - DEFAULT_wxUSE_FONTDLG=no - DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_NUMBERDLG=no - DEFAULT_wxUSE_PROGRESSDLG=no - DEFAULT_wxUSE_SASH=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_WIZARDDLG=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_STARTUP_TIPS=no fi WX_ARG_ENABLE(accel, [ --enable-accel use accelerators], wxUSE_ACCEL) @@ -1186,7 +1173,11 @@ if test "$wxUSE_GUI" = "yes"; then fi done else - AC_MSG_RESULT(base ($host_alias hosted) only) + if test "x$host_alias" != "x"; then + AC_MSG_RESULT(base ($host_alias hosted) only) + else + AC_MSG_RESULT(base only) + fi fi dnl --------------------------------------------------------------------------- @@ -1621,6 +1612,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 @@ -2053,6 +2089,54 @@ if test "$wxUSE_LIBTIFF" != "no" ; then fi fi +dnl ------------------------------------------------------------------------ +dnl Check for expat libraries +dnl ------------------------------------------------------------------------ + +if test "$wxUSE_EXPAT" != "no"; then + wxUSE_XML=1 + 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 ---------------------------------------------------------------- @@ -2073,32 +2157,9 @@ if test "$USE_WIN32" = 1 ; then AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) ]) - dnl check if can use _WIN32_IE macro - AC_CACHE_CHECK([if w32api has good enough MSIE support], wx_cv_w32api_win32_ie, - [ - AC_TRY_COMPILE([#include ], - [ - #define wxCHECK_W32API_VERSION( major, minor ) \ - ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ - && ( ( __W32API_MAJOR_VERSION > (major) ) \ - || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor)))) - - #if !wxCHECK_W32API_VERSION(1,1) - #error You need w32api 1.1 or newer - #endif - ], [ - wx_cv_w32api_win32_ie=yes - ], [ - wx_cv_w32api_win32_ie=no - ]) - ]) - if test "$wx_cv_w32api_win32_ie" = "yes" ; then - CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400" - fi - dnl --- FIXME: This is still a somewhat random list of libs, dnl --- some of them should probably be included conditionally. - LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32" if test "$wxUSE_ACCESSIBILITY" = "yes" ; then LIBS="$LIBS -loleacc" @@ -2107,7 +2168,7 @@ if test "$USE_WIN32" = 1 ; then case "${host}" in *-*-cygwin* ) dnl Cygwin doesn't include these by default - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32" + LIBS="$LIBS -lkernel32 -luser32" TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__" esac @@ -2128,16 +2189,6 @@ if test "$USE_WIN32" = 1 ; then WIN32INSTALL=win32install fi -if test "$USE_DARWIN" = 1; then - dnl Mac OS X/Darwin GCC uses precompiled headers by default - dnl this can cause problems both when compiling wxMac and wxBase - if test "$wxUSE_PRECOMP" = "yes"; then - CPPFLAGS="$CPPFLAGS -cpp-precomp" - else - CPPFLAGS="$CPPFLAGS -no-cpp-precomp" - fi -fi - if test "$wxUSE_GUI" = "yes"; then USE_GUI=1 @@ -2224,7 +2275,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. PKG_CHECK_MODULES(PANGOFT2, pangoft2, [ CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS" - LIBS="$LIBS $PANGOFT2_LIBS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS" ], [ AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support]) @@ -2246,7 +2297,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. fi TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" - GUI_TK_LIBRARY="$wx_cv_libs_gtk" + GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY" AFMINSTALL=afminstall TOOLKIT=GTK @@ -2415,7 +2466,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. PKG_CHECK_MODULES(PANGOX, pangox, [ CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS" - LIBS="$LIBS $PANGOX_LIBS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS" ], [ AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode]) @@ -2424,7 +2475,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. PKG_CHECK_MODULES(PANGOFT2, pangoft2, [ CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS" - LIBS="$LIBS $PANGOFT2_LIBS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS" ], [ AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support]) @@ -2434,7 +2485,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. PKG_CHECK_MODULES(PANGOXFT, pangoxft, [ CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS" - LIBS="$LIBS $PANGOXFT_LIBS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS" ], [ AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support]) @@ -2832,6 +2883,7 @@ dnl --------------------------------------------------------------------------- dnl OpenGL libraries dnl --------------------------------------------------------------------------- +USE_OPENGL=0 if test "$wxUSE_OPENGL" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then OPENGL_LIBS="-framework OpenGL -framework AGL" @@ -2904,6 +2956,7 @@ if test "$wxUSE_OPENGL" = "yes"; then fi if test "$wxUSE_OPENGL" = "yes"; then + USE_OPENGL=1 AC_DEFINE(wxUSE_OPENGL) AC_DEFINE(wxUSE_GLCANVAS) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" @@ -2941,6 +2994,7 @@ 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 @@ -2960,22 +3014,8 @@ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" case "${host}" in *-*-cygwin* | *-*-mingw32* ) - - dnl If we are cross compiling we want to use the 'full' unix type name for the - dnl lib, but for a native install use the windows style naming convention. - dnl (excepting again that we strip the ELF style version numbers off it). - - dnl FIXME: is this GL stuff actually even used for wxMSW? should it be?? - - if test "$cross_compiling" != "yes" -a "$TOOLKIT_DIR" = "msw"; then - WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" - WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" - WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}" - WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}" - else - WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}" - WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" - fi + WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}" + WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" ;; *-*-darwin* ) @@ -3032,70 +3072,11 @@ SHARED=0 if test "$wxUSE_SHARED" = "yes"; then SHARED=1 - dnl install targets - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}" - fi - - dnl the extra compiler flags needed for compilation of shared library - if test "$GCC" = "yes"; then - dnl the switch for gcc is the same under all platforms - PIC_FLAG="-fPIC" - fi - - dnl use versioned symbols if available on the platform WX_VERSIONED_SYMBOLS([\$(top_builddir)version-script]) - dnl the command to use for creating the shared library - SHARED_LD="${CXX} -shared -o" - case "${host}" in - *-hp-hpux* ) - dnl default settings are good for gcc but not for the native HP-UX - if test "$GCC" = "yes"; then - dnl -o flag must be after PIC flag - SHARED_LD="${CXX} -shared ${PIC_FLAG} -o" - else - dnl no idea why it wants it, but it does - LDFLAGS="$LDFLAGS -L/usr/lib" - - SHARED_LD="${CXX} -b -o" - PIC_FLAG="+Z" - fi - - dnl install shared libs without symlinks - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}" - else - WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}" - fi - ;; - *-*-linux* | *-*-gnu* ) - if test "$GCC" != "yes"; then - AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc, - [ - AC_TRY_COMPILE([], - [ - #ifndef __INTEL_COMPILER - #error Not icc - #endif - ], - wx_cv_prog_icc=yes, - wx_cv_prog_icc=no - ) - ]) - if test "$wx_cv_prog_icc" = "yes"; then - PIC_FLAG="-KPIC" - fi - fi - SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib" ;; @@ -3136,73 +3117,6 @@ if test "$wxUSE_SHARED" = "yes"; then SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib" fi ;; - - *-*-darwin* ) - dnl For Unix to MacOS X porting instructions, see: - dnl http://fink.sourceforge.net/doc/porting/porting.html - TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXMAKINGDLL" - CFLAGS="$CFLAGS -fno-common" - CXXFLAGS="$CXXFLAGS -fno-common" - dnl wxWindows must be fully binded (lazy binding breaks RTTI classinfo) - dnl this can be done either with the exe linker flag -Wl,-bind_at_load - dnl or with a double stage link in order to create a single module - dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved - SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o" - PIC_FLAG="-dynamic -fPIC" - ;; - - *-*-aix* ) - dnl default settings are ok for gcc - if test "$GCC" != "yes"; then - dnl the abs path below used to be hardcoded here so I guess it must - dnl be some sort of standard location under AIX? - AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib, - makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib) - - SHARED_LD="$(AIX_CXX_LD) -p 0 -o" - fi - ;; - - *-*-cygwin* | *-*-mingw32* ) - WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a" - - SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o" - TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1" - - PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1" - - dnl Don't build seperate GL library - WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - - if test "$wxUSE_OPENGL" = "yes"; then - LIBS="${LIBS} ${OPENGL_LIBS}" - fi - ;; - - *-*-beos* ) - dnl can't use gcc under BeOS for shared library creation because it - dnl complains about missing 'main' - SHARED_LD="${LD} -shared -o" - ;; - - *-*-irix* ) - dnl default settings are ok for gcc - if test "$GCC" != "yes"; then - PIC_FLAG="-KPIC" - fi - ;; - - *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ - *-*-sunos4* | \ - *-*-osf* | \ - *-*-dgux5* | \ - *-*-sysv5* ) - dnl defaults are ok - ;; - - *) - AC_MSG_ERROR(unknown system type $host.) esac dnl set target to shared if not explicitly chose static before @@ -4157,12 +4071,6 @@ if test "$GCC" = "yes" ; then if test "$wxUSE_PERMISSIVE" = "yes" ; then CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive" fi - if test "$USE_WIN32" = 1 ; then - # I'm not even really sure what this was ever added to solve, - # but someone added it for mingw native builds, so I guess - # they had a reason, right?? - CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return" - fi dnl Ian Brown reports that versions of gcc before dnl 3.0 overflow the table of contents on rs6000 as they create an entry @@ -4261,6 +4169,10 @@ dnl --------------------------------------------------------------------------- dnl Register non-GUI class options for makefiles and setup.h dnl --------------------------------------------------------------------------- +if test "$wxUSE_STL" = "yes"; then + AC_DEFINE(wxUSE_STL) +fi + if test "$wxUSE_APPLE_IEEE" = "yes"; then AC_DEFINE(wxUSE_APPLE_IEEE) fi @@ -4297,10 +4209,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 @@ -4535,12 +4443,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 @@ -4635,6 +4547,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 --------------------------------------------------------------------------- @@ -4799,17 +4751,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 @@ -5273,45 +5216,16 @@ 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" fi +USE_HTML=0 if test "$wxUSE_HTML" = "yes"; then AC_DEFINE(wxUSE_HTML) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html htlbox" + USE_HTML=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox" fi if test "$wxUSE_VALIDATORS" = "yes"; then @@ -5520,8 +5434,6 @@ fi if test "$wxUSE_GUI" = "yes"; then - LIBS="$GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LIBS" - dnl TODO add checks that these samples will really compile (i.e. all the dnl library features they need are present) @@ -5530,6 +5442,10 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \ drawing dynamic erase event exec font image \ minimal propsize rotate shaped widgets" + + if test "$wxUSE_MONOLITHIC" != "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" + fi else SAMPLES_SUBDIRS="console" fi @@ -5547,6 +5463,34 @@ INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \ $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \ $TOOLKIT_INCLUDE" +dnl C/C++ compiler options used to compile wxWindows +if test "$GXX" = yes ; then + dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" + CXXWARNINGS="-Wall" + dnl should enable this one day... + dnl CXXWARNINGS="-Wall -Werror" +fi + +EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE" + +dnl remove the extra white space from the cc/c++/ld options +CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'` +CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'` +CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` + + +LIBS=`echo $LIBS | sed 's/ \+/ /g'` +EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" +EXTRALIBS_XML="$EXPAT_LINK" +if test "$wxUSE_GUI" = "yes"; then + EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'` +fi +if test "$wxUSE_OPENGL" = "yes"; then + EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS" +fi + +LDFLAGS="$LDFLAGS $PROFILE" + dnl wxGTK does not need TOOLKIT includes in wx-config if test "$wxUSE_GTK" = 1; then WXCONFIG_INCLUDE= @@ -5562,22 +5506,30 @@ 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) AC_SUBST(wxUSE_LIBTIFF) -EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" - if test $wxUSE_MONOLITHIC = "yes" ; then MONOLITHIC=1 else MONOLITHIC=0 fi +dnl FIXME -- make configurable! +VENDOR="custom" +OFFICIAL_BUILD=0 +AC_SUBST(VENDOR) +AC_SUBST(OFFICIAL_BUILD) + AC_SUBST(WXUNIV) AC_SUBST(MONOLITHIC) AC_SUBST(EXTRALIBS) +AC_SUBST(EXTRALIBS_XML) +AC_SUBST(EXTRALIBS_GUI) +AC_SUBST(EXTRALIBS_OPENGL) AC_SUBST(UNICODE) AC_SUBST(BUILD) AC_SUBST(SHARED) @@ -5585,26 +5537,11 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [[A-Z]] [[a-z]]` AC_SUBST(TOOLKIT_LOWERCASE) AC_SUBST(TOOLKIT_VERSION) AC_SUBST(SAMPLES_RPATH_FLAG) +AC_SUBST(HOST_SUFFIX) AC_BAKEFILE -dnl C/C++ compiler options used to compile wxWindows -if test "$GXX" = yes ; then - dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" - CXXWARNINGS="-Wall" - dnl should enable this one day... - dnl CXXWARNINGS="-Wall -Werror" -fi - -EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE" - -dnl remove the extra white space from the cc/c++/ld options -CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'` -CFLAGS=`echo $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'` -CXXFLAGS=`echo $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` -LIBS=`echo $LIBS | sed 's/ \+/ /g'` -LDFLAGS="$LDFLAGS $PROFILE" dnl for convenience, sort the samples in alphabetical order dnl @@ -5646,8 +5583,6 @@ AC_SUBST(WX_ALL_INSTALLED) AC_SUBST(SHARED_LD) AC_SUBST(PIC_FLAG) -AC_SUBST(CODE_GEN_FLAGS) -AC_SUBST(CODE_GEN_FLAGS_CXX) AC_SUBST(WX_TARGET_LIBRARY_TYPE) @@ -5678,6 +5613,8 @@ AC_SUBST(WXCONFIG_LIBS_STATIC_GL) AC_SUBST(WXCONFIG_INCLUDE) AC_SUBST(WXCONFIG_RPATH) AC_SUBST(WX_LARGEFILE_FLAGS) +AC_SUBST(CODE_GEN_FLAGS) +AC_SUBST(CODE_GEN_FLAGS_CXX) dnl the list of files to compile/install AC_SUBST(ALL_OBJECTS) @@ -5793,9 +5730,39 @@ AC_CONFIG_COMMANDS([default], dnl Configure samples, contrib etc. directories, but only if they are present: -for subdir in samples demos utils contrib ; do +if test "$wxUSE_GUI" = "yes"; then + SUBDIRS="samples demos utils contrib" +else dnl we build wxBase only + dnl there are no wxBase programs in contrib nor demos + SUBDIRS="samples utils" +fi + +for subdir in `echo $SUBDIRS`; do if test -d ${srcdir}/${subdir} ; then - makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` + if test "$wxUSE_GUI" = "yes"; then + if test ${subdir} = "samples"; then + dnl only take those samples which compile in the current + dnl configuration and which exist + for sample in `echo $SAMPLES_SUBDIRS`; do + if test -d $srcdir/samples/$sample; then + 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)` + fi + else dnl we build wxBase only + dnl don't take all samples/utils, just those which build with + dnl wxBase + if test ${subdir} = "samples"; then + makefiles="samples/console/Makefile.in" + else dnl utils + makefiles="utils/HelpGen/Makefile.in \ + utils/HelpGen/src/Makefile.in \ + utils/makegen/Makefile.in" + fi + fi + for mkin in $makefiles ; do mk=`echo $mkin | sed 's/Makefile\.in/Makefile/g'` AC_CONFIG_FILES([$mk]) @@ -5829,6 +5796,7 @@ echo " regex ${wxUSE_REGEX}" echo " tiff ${wxUSE_LIBTIFF-none}" echo " zlib ${wxUSE_ZLIB}" echo " odbc ${wxUSE_ODBC}" +echo " expat ${wxUSE_EXPAT}" echo ""