--enable-ipc use interprocess communication (wxSocket etc.)
--enable-apple_ieee use the Apple IEEE codec
--enable-arcstream use wxArchive streams
- --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only)
--enable-backtrace use wxStackWalker class for getting backtraces
+ --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only)
--enable-cmdline use wxCmdLineParser class
--enable-datetime use wxDateTime class
+ --enable-debugreport use wxDebugReport class
--enable-dialupman use dialup network classes
--enable-dynlib use wxLibrary class for DLL loading
--enable-dynamicloader use (new) wxDynamicLibrary class
wx_major_version_number=2
wx_minor_version_number=5
wx_release_number=4
-wx_subrelease_number=1
+wx_subrelease_number=2
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number
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_CMDLINE_PARSER=no
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
DEFAULT_wxUSE_STACKWALKER=yes
+ DEFAULT_wxUSE_DEBUGREPORT=no
DEFAULT_wxUSE_SNGLINST_CHECKER=yes
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_CMDLINE_PARSER=yes
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-catch_segvs or --disable-catch_segvs was given.
-if test "${enable_catch_segvs+set}" = set; then
- enableval="$enable_catch_segvs"
+ # Check whether --enable-backtrace or --disable-backtrace was given.
+if test "${enable_backtrace+set}" = set; then
+ enableval="$enable_backtrace"
if test "$enableval" = yes; then
- ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
+ ac_cv_use_backtrace='wxUSE_STACKWALKER=yes'
else
- ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
+ ac_cv_use_backtrace='wxUSE_STACKWALKER=no'
fi
else
- LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_STACKWALKER" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION
+ ac_cv_use_backtrace='wxUSE_STACKWALKER='$DEFAULT_wxUSE_STACKWALKER
fi;
- eval "$ac_cv_use_catch_segvs"
+ eval "$ac_cv_use_backtrace"
if test "$no_cache" != 1; then
- echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_backtrace >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then
+ if test "$wxUSE_STACKWALKER" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-backtrace or --disable-backtrace was given.
-if test "${enable_backtrace+set}" = set; then
- enableval="$enable_backtrace"
+ # Check whether --enable-catch_segvs or --disable-catch_segvs was given.
+if test "${enable_catch_segvs+set}" = set; then
+ enableval="$enable_catch_segvs"
if test "$enableval" = yes; then
- ac_cv_use_backtrace='wxUSE_STACKWALKER=yes'
+ ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
else
- ac_cv_use_backtrace='wxUSE_STACKWALKER=no'
+ ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
fi
else
- LINE=`grep "wxUSE_STACKWALKER" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_backtrace='wxUSE_STACKWALKER='$DEFAULT_wxUSE_STACKWALKER
+ ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION
fi;
- eval "$ac_cv_use_backtrace"
+ eval "$ac_cv_use_catch_segvs"
if test "$no_cache" != 1; then
- echo $ac_cv_use_backtrace >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STACKWALKER" = yes; then
+ if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
fi
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debugreport" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-debugreport or --disable-debugreport was given.
+if test "${enable_debugreport+set}" = set; then
+ enableval="$enable_debugreport"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_debugreport='wxUSE_DEBUGREPORT=yes'
+ else
+ ac_cv_use_debugreport='wxUSE_DEBUGREPORT=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_DEBUGREPORT" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_debugreport='wxUSE_DEBUGREPORT='$DEFAULT_wxUSE_DEBUGREPORT
+
+fi;
+
+ eval "$ac_cv_use_debugreport"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_debugreport >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_DEBUGREPORT" = yes; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
+
+
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_mwerks" >&5
echo "${ECHO_T}$bakefile_cv_c_compiler_mwerks" >&6
-MWCC=`test $bakefile_compiler_mwerks = yes && echo yes`
+MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes`
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
echo "$as_me:$LINENO: result: $wx_cv_c_compiler_xlc" >&5
echo "${ECHO_T}$wx_cv_c_compiler_xlc" >&6
-XLCC=`test $wx_compiler_xlc = yes && echo yes`
+XLCC=`test $wx_cv_c_compiler_xlc = yes && echo yes`
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_mwerks" >&5
echo "${ECHO_T}$bakefile_cv_cxx_compiler_mwerks" >&6
-MWCXX=`test $bakefile_compiler_mwerks = yes && echo yes`
+MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes`
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
echo "$as_me:$LINENO: result: $wx_cv_cxx_compiler_xlc" >&5
echo "${ECHO_T}$wx_cv_cxx_compiler_xlc" >&6
-XLCXX=`test $wx_compiler_xlc = yes && echo yes`
+XLCXX=`test $wx_cv_cxx_compiler_xlc = yes && echo yes`
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
fi
-AC_CXX_DYNAMIC_CAST
if test "$wxUSE_STL" = "yes"; then
ac_ext=cc
+if test "$wxUSE_COCOA" = 1; then
+
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=m
+
+ echo "$as_me:$LINENO: checking if AppKit/NSEvent.h conflicts with CoreFoundation" >&5
+echo $ECHO_N "checking if AppKit/NSEvent.h conflicts with CoreFoundation... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <AppKit/NSEvent.h>
+#include <CoreFoundation/CoreFoundation.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ echo "$as_me:$LINENO: checking if defining __Point__ will fix it" >&5
+echo $ECHO_N "checking if defining __Point__ will fix it... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#define __Point__ 1
+#include <AppKit/NSEvent.h>
+#include <CoreFoundation/CoreFoundation.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ cat >>confdefs.h <<\_ACEOF
+#define __Point__ 1
+_ACEOF
+
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: no
+See \`config.log' for more details." >&5
+echo "$as_me: error: no
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
fi
+if test "$wxUSE_DEBUGREPORT" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_DEBUGREPORT 1
+_ACEOF
+
+fi
+
if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_SNGLINST_CHECKER 1
if test "$wxUSE_GUI" = "yes"; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
- drawing dynamic erase event exec font image \
- minimal propsize rotate shaped vscroll widgets render"
+ 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"
- BAKEFILE_BAKEFILE_M4_VERSION="0.1.7"
+ BAKEFILE_BAKEFILE_M4_VERSION="0.1.8"
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.7"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.8"
projects / wxWidgets.git / blobdiff