X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58dc544700817a40908f98bb8a223ae78fceeca6..f2f0e641109bf54db3e630e1570c74c153e57044:/configure.in diff --git a/configure.in b/configure.in index d5fe0e1990..1c30b387e0 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,4 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Id$)dnl AC_PREREQ(2.58) @@ -9,15 +8,13 @@ dnl Top-level configure.in for wxWidgets by Robert Roebling, Phil Blecker, dnl Vadim Zeitlin and Ron Lee dnl dnl This script is under the wxWindows licence. -dnl -dnl Version: $Id$ dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [2.9.5], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [3.0.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]) @@ -41,9 +38,9 @@ dnl When making releases do: dnl dnl wx_release_number += 1 -wx_major_version_number=2 -wx_minor_version_number=9 -wx_release_number=5 +wx_major_version_number=3 +wx_minor_version_number=0 +wx_release_number=0 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -591,7 +588,6 @@ WX_ARG_SYS_WITH(libxpm, [ --with-libxpm use libxpm (XPM file forma WX_ARG_WITH(libiconv, [ --with-libiconv use libiconv (character conversion)], wxUSE_LIBICONV) WX_ARG_WITH(libmspack, [ --with-libmspack use libmspack (CHM help files loading)], wxUSE_LIBMSPACK) WX_ARG_WITHOUT(gtkprint, [ --without-gtkprint don't use GTK printing support], wxUSE_GTKPRINT) -WX_ARG_WITHOUT(gnomeprint, [ --without-gnomeprint don't use GNOME printing libraries], wxUSE_LIBGNOMEPRINT) WX_ARG_WITH(gnomevfs, [ --with-gnomevfs use GNOME VFS for associating MIME types], wxUSE_LIBGNOMEVFS) WX_ARG_WITH(libnotify, [ --with-libnotify use libnotify for notifications], wxUSE_LIBNOTIFY) WX_ARG_WITH(hildon, [ --with-hildon use Hildon framework for Nokia 770/800/810], wxUSE_LIBHILDON) @@ -971,6 +967,7 @@ WX_ARG_FEATURE(notebook, [ --enable-notebook use wxNotebook class], wx WX_ARG_FEATURE(notifmsg, [ --enable-notifmsg use wxNotificationMessage class], wxUSE_NOTIFICATION_MESSAGE) WX_ARG_FEATURE(odcombobox, [ --enable-odcombobox use wxOwnerDrawnComboBox class], wxUSE_ODCOMBOBOX) WX_ARG_FEATURE(popupwin, [ --enable-popupwin use wxPopUpWindow class], wxUSE_POPUPWIN) +WX_ARG_FEATURE(prefseditor, [ --enable-prefseditor use wxPreferencesEditor class], wxUSE_PREFERENCES_EDITOR) WX_ARG_FEATURE(radiobox, [ --enable-radiobox use wxRadioBox class], wxUSE_RADIOBOX) WX_ARG_FEATURE(radiobtn, [ --enable-radiobtn use wxRadioButton class], wxUSE_RADIOBTN) WX_ARG_FEATURE(richmsgdlg, [ --enable-richmsgdlg use wxRichMessageDialog class], wxUSE_RICHMSGDLG) @@ -1434,7 +1431,6 @@ if test "$wants_win32" = 1 ; then USE_UNIX=0 USE_WIN32=1 AC_DEFINE(__WIN32__) - AC_DEFINE(__WIN95__) AC_DEFINE(__WINDOWS__) AC_DEFINE(__GNUWIN32__) AC_DEFINE(STRICT) @@ -1465,9 +1461,6 @@ case "${host}" in dnl More complete Unix emulation for unix-like ports dnl by linking in POSIX/2's cExt (if available). AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt") - else - dnl Include resources for the "native" port (wxPM). - RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" fi dnl Check for the gcc version (and thereby for the C runtime library). dnl wx_cv_gccversion = EMX2 -> Standard EMX environment @@ -1522,50 +1515,6 @@ case "${host}" in fi dnl (end of OS/2-only piece) ;; - *) - dnl --------------------------------------------------------------------- - dnl look for strcasecmp() in string.h and then strings.h if it's not - dnl there. Don't do this on OS/2, where "stricmp" is the function to be - dnl used. - dnl --------------------------------------------------------------------- - dnl (non-OS/2-only piece) - - AC_CACHE_CHECK([for strcasecmp() in string.h], ac_cv_string_strcasecmp, [ - AC_TRY_LINK([ - #include - ], - [ - strcasecmp("foo", "bar"); - ], - ac_cv_string_strcasecmp=yes, - ac_cv_string_strcasecmp=no - ) - ]) - - if test x"$ac_cv_string_strcasecmp" = "xyes"; then - AC_DEFINE(HAVE_STRCASECMP_IN_STRING_H) - else - AC_CACHE_CHECK([for strcasecmp() in strings.h], ac_cv_strings_strcasecmp, [ - AC_TRY_LINK([ - #include - ], - [ - strcasecmp("foo", "bar"); - ], - ac_cv_strings_strcasecmp=yes, - ac_cv_strings_strcasecmp=no - ) - ]) - - if test x"$ac_cv_strings_strcasecmp" = "xyes"; then - AC_DEFINE(HAVE_STRCASECMP_IN_STRINGS_H) - else - AC_MSG_ERROR([No case-insensitive string comparison function found.]) - fi - fi - - dnl (end of non-OS/2-only piece) - ;; esac dnl ------------------------------------------------------------------------ @@ -2154,7 +2103,7 @@ if test "$wxUSE_STL" = "yes"; then fi fi -AC_CHECK_HEADERS([type_traits tr1/type_traits]) +AC_CHECK_HEADERS([type_traits tr1/type_traits], break) dnl check for atomic operations builtins for wx/atomic.h: WX_ATOMIC_BUILTINS @@ -2797,9 +2746,6 @@ dnl ---------------------------------------------------------------- dnl search for toolkit (widget sets) dnl ---------------------------------------------------------------- -AFMINSTALL= -WIN32INSTALL= - TOOLKIT= TOOLKIT_INCLUDE= WIDGET_SET= @@ -2833,17 +2779,8 @@ if test "$USE_WIN32" = 1 ; then LIBS="$LIBS -lkernel32 -luser32" esac - dnl This one is still used by some sample makefiles. - RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" - RESPROGRAMOBJ="\$(PROGRAM)_resources.o" - - dnl This lot we export to wx-config. It must add the relevant - dnl include directories at the point when they can be known. - dnl (but are these (still) required anyway?) - WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" - - dnl install Win32-specific files in "make install" - WIN32INSTALL=win32install + dnl Flags to be passed to windres by the applications using wxWidgets. + WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" fi if test "$wxUSE_GUI" = "yes"; then @@ -3056,7 +2993,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY" - AFMINSTALL=afminstall TOOLKIT=GTK GUIDIST=GTK_DIST @@ -3125,7 +3061,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config wxUSE_UNIVERSAL="yes" - AFMINSTALL=afminstall TOOLKIT=MICROWIN GUIDIST=MICROWIN_DIST @@ -3148,7 +3083,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config dnl this junk out GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'` TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'` - AFMINSTALL=afminstall COMPILED_X_PROGRAM=0 fi @@ -3853,16 +3787,18 @@ if test "$wxUSE_SHARED" = "yes"; then DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" cat <change-install-names #!/bin/sh -libnames=\`cd \${2} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` +libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` +changes='' +for dep in \${libnames} ; do + changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}" +done for i in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i} - for dep in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i} - done + ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i} done +${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE} EOF chmod +x change-install-names - DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}" + DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib" fi dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error: @@ -4114,7 +4050,18 @@ if test "$WCSLEN_FOUND" = 1; then AC_DEFINE(HAVE_WCSLEN) fi -AC_CHECK_FUNCS([wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp]) +dnl Notice that unlike the functions below, this one seems to be present in all +dnl support OS X versions so it's OK to test for it here. +AC_CHECK_FUNCS(wcsftime) + +dnl OS X provides the wide character functions (and also strnlen(), for some +dnl reason) only starting from 10.7 so our tests would succeed if we're +dnl configuring under 10.7 or later, yet the compiled programs would fail if +dnl ran under 10.6 or earlier. To avoid this problem, define the corresponding +dnl HAVE_XXX in wx/osx/config_xcode.h instead of testing for them here. +if test "$wxUSE_MAC" != 1; then + AC_CHECK_FUNCS([strnlen wcsdup wcsnlen wcscasecmp wcsncasecmp]) +fi dnl On HP-UX aCC need this define to find mbstrtowcs() &c dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict @@ -5679,31 +5626,6 @@ if test "$WXGTK2" = 1; then ] ) fi - - if test "$WXGTK3" = 1; then - wxUSE_LIBGNOMEPRINT=no - fi - - if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then - - PKG_CHECK_MODULES(LIBGNOMEPRINTUI, - [libgnomeprintui-2.2 >= 2.8], - [ - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBGNOMEPRINTUI_LIBS" - CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS" - CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS" - AC_DEFINE(wxUSE_LIBGNOMEPRINT) - ], - [ - if test "$wxUSE_GTKPRINT" = yes; then - AC_MSG_RESULT(no) - else - AC_MSG_WARN([libgnomeprintui not found, library will use standard PostScript printing]) - fi - wxUSE_LIBGNOMEPRINT="no" - ] - ) - fi fi if test "$wxUSE_MIMETYPE" = "yes" ; then @@ -7087,6 +7009,11 @@ if test "$wxUSE_POPUPWIN" = "yes"; then fi fi +if test "$wxUSE_PREFERENCES_EDITOR" = "yes"; then + AC_DEFINE(wxUSE_PREFERENCES_EDITOR) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS prefseditor" +fi + if test "$wxUSE_DIALUP_MANAGER" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then AC_MSG_WARN([Dialup manager not supported on this platform... disabled]) @@ -7823,7 +7750,7 @@ if test "$wxUSE_GUI" = "yes"; then dnl TODO some samples are never built so far: mfc (requires VC++) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ - erase event exec font image minimal preferences render \ + erase event exec font image minimal render \ shaped svg taborder vscroll widgets wrapsizer" if test "$wxUSE_MONOLITHIC" != "yes"; then @@ -8075,9 +8002,6 @@ case "$TOOLKIT" in if test "$wxUSE_GTKPRINT" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing"; fi - if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then - TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint"; - fi if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomevfs" fi @@ -8248,11 +8172,11 @@ dnl when we've configured a Universal binary build. dnl The next version of Bakefile will have the correct fix for this dnl at which time, this hack can be removed. -if test "$wxUSE_MAC" = 1 ; then +if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then if test "x$disable_macosx_deps" = "xyes"; then sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp - mv temp bk-deps + mv temp bk-deps chmod +x bk-deps fi fi @@ -8345,8 +8269,6 @@ AC_SUBST(WX_LIBRARY_BASENAME_GUI) dnl toolkit options AC_SUBST(USE_GUI) -AC_SUBST(AFMINSTALL) -AC_SUBST(WIN32INSTALL) AC_SUBST(TOOLKIT) AC_SUBST(TOOLKIT_DIR) AC_SUBST(TOOLCHAIN_NAME) @@ -8399,8 +8321,6 @@ dnl additional resurces settings AC_SUBST(RESCOMP) AC_SUBST(WINDRES) AC_SUBST(REZ) -AC_SUBST(RESFLAGS) -AC_SUBST(RESPROGRAMOBJ) AC_SUBST(WX_RESOURCES_MACOSX_ASCII) AC_SUBST(WX_RESOURCES_MACOSX_DATA)