X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/759b3c7e2fb5fcb555c382b00d5a6b938a474057..85ebb95c27e53ec60f2c3376bb840c89d4b3b625:/configure.in?ds=sidebyside diff --git a/configure.in b/configure.in index a8b6fc907b..e310e7fea1 100644 --- a/configure.in +++ b/configure.in @@ -62,7 +62,7 @@ WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER -WX_CURRENT=0 +WX_CURRENT=1 WX_REVISION=0 WX_AGE=0 @@ -290,6 +290,7 @@ case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) AC_DEFINE(__EMX__) USE_OS2=1 + AC_DEFINE(__OS2__) PROGRAM_EXT=".exe" DEFAULT_DEFAULT_wxUSE_PM=1 dnl "c++" wrapper is not always available, so always use plain gcc. @@ -395,6 +396,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LIBPNG=no DEFAULT_wxUSE_LIBJPEG=no DEFAULT_wxUSE_LIBTIFF=no + DEFAULT_wxUSE_LIBXPM=no DEFAULT_wxUSE_ODBC=no DEFAULT_wxUSE_OPENGL=no @@ -477,6 +479,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FS_ZIP=no DEFAULT_wxUSE_BUSYINFO=no DEFAULT_wxUSE_ZIPSTREAM=no + DEFAULT_wxUSE_GZSTREAM=no DEFAULT_wxUSE_VALIDATORS=no DEFAULT_wxUSE_ACCEL=no @@ -573,6 +576,8 @@ else DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes DEFAULT_wxUSE_LIBTIFF=yes + DEFAULT_wxUSE_LIBXPM=yes + DEFAULT_wxUSE_LIBMSPACK=yes DEFAULT_wxUSE_ODBC=no DEFAULT_wxUSE_OPENGL=no @@ -655,6 +660,7 @@ else DEFAULT_wxUSE_FS_ZIP=yes DEFAULT_wxUSE_BUSYINFO=yes DEFAULT_wxUSE_ZIPSTREAM=yes + DEFAULT_wxUSE_GZSTREAM=yes DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=yes @@ -765,6 +771,8 @@ WX_ARG_ENABLE(gtk2, [ --enable-gtk2 use GTK+ 2.0 if available WX_ARG_SYS_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG) WX_ARG_SYS_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG) WX_ARG_SYS_WITH(libtiff, [ --with-libtiff use libtiff (TIFF file format)], wxUSE_LIBTIFF) +WX_ARG_SYS_WITH(libxpm, [ --with-libxpm use libxpm (XPM file format)], wxUSE_LIBXPM) +WX_ARG_WITH(libmspack, [ --with-libmspack use libmspack (CHM help files loading)], wxUSE_LIBMSPACK) WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL) fi @@ -865,6 +873,7 @@ WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Un WX_ARG_ENABLE(wave, [ --enable-wave use wxWave class], wxUSE_WAVE) WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF) WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZipInputStream], wxUSE_ZIPSTREAM) +WX_ARG_ENABLE(gzstream, [ --enable-gzstream use wxGzipInputStream], wxUSE_GZSTREAM) WX_ARG_ENABLE(url, [ --enable-url use wxURL class], wxUSE_URL) WX_ARG_ENABLE(protocol, [ --enable-protocol use wxProtocol class], wxUSE_PROTOCOL) @@ -1207,7 +1216,7 @@ if test "$wxUSE_GUI" = "yes"; then echo "$var=$value" >> ${wx_arg_cache_file} fi if test "$value" = 1; then - toolkit_echo=`echo $toolkit | tr [[A-Z]] [[a-z]]` + toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"` AC_MSG_RESULT($toolkit_echo) fi fi @@ -1465,7 +1474,7 @@ case "${host}" in RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" fi AC_CACHE_CHECK([for gcc 3 or later], wx_cv_gcc3,[ - AC_TRY_COMPILE([#include ], + AC_TRY_COMPILE([], [ #if (__GNUC__ < 3) #error old gcc @@ -2199,6 +2208,25 @@ if test "$wxUSE_EXPAT" != "no"; then fi +dnl ------------------------------------------------------------------------ +dnl Check for libmspack +dnl ------------------------------------------------------------------------ + +if test "$wxUSE_LIBMSPACK" != "no"; then + + AC_CHECK_HEADER([mspack.h], [found_mspack_h=1]) + if test "x$found_mspack_h" = "x1"; then + AC_CHECK_LIB(mspack, mspack_create_chm_decompressor, + MSPACK_LINK=" -lmspack") + fi + if test "x$MSPACK_LINK" = "x" ; then + wxUSE_LIBMSPACK=no + else + AC_DEFINE(wxUSE_LIBMSPACK) + fi +fi + + dnl ---------------------------------------------------------------- dnl search for toolkit (widget sets) dnl ---------------------------------------------------------------- @@ -2497,44 +2525,6 @@ equivalent variable and GTK+ is version 1.2.3 or above. fi fi - xpm_link= - AC_MSG_CHECKING(for Xpm library) - WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) - if test "$ac_find_libraries" != "" ; then - WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) - GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" - xpm_link=" -lXpm" - AC_DEFINE(wxHAVE_LIB_XPM) - AC_MSG_RESULT(found at $ac_find_libraries) - else - AC_TRY_COMPILE( - [ - #include - ], - [ - int version; - version = XpmLibraryVersion(); - ], - [ - xpm_link=" -lXpm" - AC_DEFINE(wxHAVE_LIB_XPM) - AC_MSG_RESULT(found in default search path) - COMPILED_X_PROGRAM=0 - ], - [ - AC_MSG_RESULT(no) - AC_MSG_WARN(library will be compiled without support for images in XPM format) - ] - ) - fi - - AC_CHECK_LIB([Xext], [XShapeQueryExtension], - [ - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext" - wxHAVE_XEXT_LIB=1 - ], - [], [$GUI_TK_LIBRARY -lX11]) - if test "$wxUSE_UNICODE" = "yes"; then PKG_CHECK_MODULES(PANGOX, pangox, [ @@ -2573,7 +2563,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1" GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a" else - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11" fi TOOLKIT_VPATH="\${top_srcdir}/src/x11" @@ -2660,53 +2650,16 @@ equivalent variable and GTK+ is version 1.2.3 or above. fi fi - xpm_link= - AC_MSG_CHECKING(for Xpm library) - WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) - if test "$ac_find_libraries" != "" ; then - WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) - GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" - - xpm_link=" -lXpm" - AC_DEFINE(wxHAVE_LIB_XPM) - AC_MSG_RESULT(found at $ac_find_libraries) - else - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" - - AC_TRY_COMPILE( - [ - #include - ], - [ - int version; - version = XpmLibraryVersion(); - ], - [ - xpm_link=" -lXpm" - AC_DEFINE(wxHAVE_LIB_XPM) - AC_MSG_RESULT(found in default search path) - COMPILED_X_PROGRAM=0 - ], - [ - AC_MSG_RESULT(no) - AC_MSG_WARN(library will be compiled without support for images in XPM format) - ] - ) - - CFLAGS=$save_CFLAGS - fi - AC_MSG_CHECKING([if we need -lXp and/or -lSM -lICE]) libp_link="" libsm_ice_link="" libs_found=0 for libp in "" " -lXp"; do if test "$libs_found" = "0"; then - for libsm_ice in " -lSM -lICE"; do + for libsm_ice in "" " -lSM -lICE"; do if test "$libs_found" = "0"; then save_LIBS="$LIBS" - LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11" + LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11" save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" @@ -2763,40 +2716,101 @@ equivalent variable and GTK+ is version 1.2.3 or above. ]) CFLAGS=$save_CFLAGS - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11" TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11" TOOLKIT=MOTIF GUIDIST=MOTIF_DIST - wxHAVE_XEXT_LIB=1 fi - if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1 && - test "$wxHAVE_XEXT_LIB" = 1; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" + if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then + dnl test for external libxpm if we're configured to use it + if test "$wxUSE_LIBXPM" = "sys"; then + AC_MSG_CHECKING(for Xpm library) + WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) + if test "$ac_find_libraries" != "" ; then + WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) + GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" + AC_MSG_RESULT(found at $ac_find_libraries) - AC_MSG_CHECKING([for X11/extensions/shape.h]) - AC_TRY_COMPILE([ - #include - #include - ], - [ - int dummy1, dummy2; - XShapeQueryExtension((Display*)NULL, - (int*)NULL, (int*)NULL); - ], - [ - AC_DEFINE(HAVE_XSHAPE) - AC_MSG_RESULT([found]) - ], - [ - AC_MSG_RESULT([not found]) - ]) - CFLAGS="$save_CFLAGS" + AC_CACHE_CHECK([for X11/xpm.h], + wx_cv_x11_xpm_h, + [ + save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" + + AC_TRY_COMPILE( + [ + #include + ], + [ + int version; + version = XpmLibraryVersion(); + ], + wx_cv_x11_xpm_h=yes, + wx_cv_x11_xpm_h=no + ) + + CFLAGS=$save_CFLAGS + ] + ) + + if test $wx_cv_x11_xpm_h = "yes"; then + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXpm" + AC_DEFINE(wxHAVE_LIB_XPM) + else + AC_MSG_WARN([built-in less efficient XPM decoder will be used]) + fi + fi + + fi + + dnl XShapeQueryExtension checks: first the library, then prototype + AC_CHECK_LIB([Xext], [XShapeQueryExtension], + [ + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext" + wxHAVE_XEXT_LIB=1 + ], + [], [$GUI_TK_LIBRARY -lX11]) + + if test "$wxHAVE_XEXT_LIB" = 1; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" + + AC_MSG_CHECKING([for X11/extensions/shape.h]) + AC_TRY_COMPILE([ + #include + #include + ], + [ + int dummy1, dummy2; + XShapeQueryExtension((Display*)NULL, + (int*)NULL, (int*)NULL); + ], + [ + AC_DEFINE(HAVE_XSHAPE) + AC_MSG_RESULT([found]) + ], + [ + AC_MSG_RESULT([not found]) + ]) + CFLAGS="$save_CFLAGS" + + fi fi if test "$wxUSE_MAC" = 1; then - CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon" + AC_MSG_CHECKING([for compiler syntax to enable Pascal strings]) + if test "$GCC" = yes; then + AC_MSG_RESULT([gcc]) + CPPFLAGS_PASCAL="-fpascal-strings" + elif test "`echo $CXX | sed -e 's@.*/@@'`" = "xlC"; then + AC_MSG_RESULT([xlc]) + CPPFLAGS_PASCAL="-qmacpstr" + else + AC_MSG_RESULT([none]) + fi + + CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon" TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex" TOOLKIT=MAC @@ -4343,6 +4357,10 @@ if test "$wxUSE_ZIPSTREAM" = "yes"; then AC_DEFINE(wxUSE_ZIPSTREAM) fi +if test "$wxUSE_GZSTREAM" = "yes"; then + AC_DEFINE(wxUSE_GZSTREAM) +fi + if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION) fi @@ -5279,16 +5297,12 @@ if test "$wxUSE_POPUPWIN" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled]) else - if test "$wxUSE_MOTIF" = 1; then - AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled]) + if test "$wxUSE_PM" = 1; then + AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled]) else - if test "$wxUSE_PM" = 1; then - AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled]) - else - AC_DEFINE(wxUSE_POPUPWIN) + AC_DEFINE(wxUSE_POPUPWIN) - USES_CONTROLS=1 - fi + USES_CONTROLS=1 fi fi fi @@ -5522,6 +5536,10 @@ if test "$wxUSE_HTML" = "yes" ; then CORE_GUI_LIBS="html $CORE_GUI_LIBS" fi +if test "$wxUSE_GUI" != "yes"; then + CORE_GUI_LIBS="" +fi + AC_SUBST(CORE_BASE_LIBS) AC_SUBST(CORE_GUI_LIBS) @@ -5639,6 +5657,7 @@ 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_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 | sed 's/ \+/ /g'` @@ -5729,6 +5748,7 @@ AC_SUBST(MONOLITHIC) AC_SUBST(LIBS) AC_SUBST(EXTRALIBS) AC_SUBST(EXTRALIBS_XML) +AC_SUBST(EXTRALIBS_HTML) AC_SUBST(EXTRALIBS_ODBC) AC_SUBST(EXTRALIBS_GUI) AC_SUBST(EXTRALIBS_OPENGL) @@ -5737,7 +5757,7 @@ AC_SUBST(BUILD) AC_SUBST(DEBUG_INFO) AC_SUBST(DEBUG_FLAG) AC_SUBST(SHARED) -TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [[A-Z]] [[a-z]]` +TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[[A-Z]]" "[[a-z]]"` AC_SUBST(TOOLKIT_LOWERCASE) AC_SUBST(TOOLKIT_VERSION) AC_SUBST(SAMPLES_RPATH_FLAG) @@ -5749,24 +5769,18 @@ AC_BAKEFILE dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP: if test $GCC_PCH = 1 ; then + CODE_GEN_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CODE_GEN_FLAGS" 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: + CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS" 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 @@ -5984,7 +5998,9 @@ for subdir in `echo $SUBDIRS`; do makefiles="samples/Makefile.in samples/console/Makefile.in" else dnl utils makefiles="utils/HelpGen/Makefile.in \ - utils/HelpGen/src/Makefile.in" + utils/HelpGen/src/Makefile.in \ + utils/tex2rtf/Makefile.in \ + utils/tex2rtf/src/Makefile.in" fi fi @@ -6002,7 +6018,7 @@ dnl report on what we decided to do echo echo "Configured wxWindows ${WX_VERSION} for \`${host}'" echo "" -echo " Which GUI toolkit should wxWindows use? ${TOOLKIT:-base only}" +echo " Which GUI toolkit should wxWindows use? ${TOOLKIT_LOWERCASE:-base only}" echo " Should wxWindows be compiled into single library? ${wxUSE_MONOLITHIC:-yes}" echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-no}" @@ -6018,9 +6034,13 @@ echo " jpeg ${wxUSE_LIBJPEG- echo " png ${wxUSE_LIBPNG-none}" echo " regex ${wxUSE_REGEX}" echo " tiff ${wxUSE_LIBTIFF-none}" +if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then +echo " xpm ${wxUSE_LIBXPM-none}" +fi echo " zlib ${wxUSE_ZLIB}" echo " odbc ${wxUSE_ODBC}" echo " expat ${wxUSE_EXPAT}" +echo " libmspack ${wxUSE_LIBMSPACK}" echo ""