dnl initialization
dnl ---------------------------------------------------------------------------
-AC_INIT([wxWidgets], [2.5.4], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.5.5], [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])
wx_major_version_number=2
wx_minor_version_number=5
-wx_release_number=4
-wx_subrelease_number=1
+wx_release_number=5
+wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number
WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
-WX_CURRENT=4
+WX_CURRENT=5
WX_REVISION=0
-WX_AGE=4
+WX_AGE=5
dnl ------------------------------------------------------------------------
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_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_STRING=no
DEFAULT_wxUSE_CMDLINE_PARSER=yes
DEFAULT_wxUSE_DATETIME=yes
DEFAULT_wxUSE_TIMER=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
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
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)
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(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)
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
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
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.
[
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)
;;
*)
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])
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"
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])
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
+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 <AppKit/NSEvent.h>
+#include <CoreFoundation/CoreFoundation.h>
+ ],[],
+ [AC_MSG_RESULT([no])],
+ [AC_MSG_RESULT([yes])
+ AC_MSG_CHECKING([if defining __Point__ will fix it])
+ AC_TRY_COMPILE([#define __Point__ 1
+#include <AppKit/NSEvent.h>
+#include <CoreFoundation/CoreFoundation.h>
+ ],[],
+ [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)
else
AC_CACHE_CHECK([for __cxa_demangle() in <cxxabi.h>], wx_cv_func_cxa_demangle,
[
- AC_TRY_COMPILE([#include <cxxabi.h>],
+ AC_TRY_LINK([#include <cxxabi.h>],
[
int rc;
__cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
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)
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
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_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
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"
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
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
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.
projects / wxWidgets.git / blobdiff