#! /bin/sh
# From configure.in Id.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.2.
+# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.3.
#
# Report bugs to <wx-dev@lists.wxwidgets.org>.
#
# Identity of this package.
PACKAGE_NAME='wxWidgets'
PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.9.2'
-PACKAGE_STRING='wxWidgets 2.9.2'
+PACKAGE_VERSION='2.9.3'
+PACKAGE_STRING='wxWidgets 2.9.3'
PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
ac_unique_file="wx-config.in"
{ (exit 1); exit 1; }; }
done
-# There might be people who depend on the old broken behaviour: `$host'
+# There might be people who depend on the old broken behavior: `$host'
# used to hold the argument of --host etc.
# FIXME: To remove some day.
build=$build_alias
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures wxWidgets 2.9.2 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.9.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wxWidgets 2.9.2:";;
+ short | recursive ) echo "Configuration of wxWidgets 2.9.3:";;
esac
cat <<\_ACEOF
--enable-debug_cntxt obsolete, don't use: use wxDebugContext
--enable-mem_tracing obsolete, don't use: create code with memory tracing
--disable-shared create static library instead of shared
- --enable-stl use STL for containers
+ --enable-stl use standard C++ classes for everything
+ --enable-std_containers use standard C++ container classes
--enable-std_iostreams use standard C++ stream classes
--enable-std_string use standard C++ string classes
+ --enable-std_string_conv_in_wxstring provide implicit conversion to std::string in wxString
--disable-unicode compile without Unicode support
--enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only)
--enable-utf8 use UTF-8 representation for strings (Unix only)
--enable-graphics_ctx use graphics context 2D drawing API
--enable-clipboard use wxClipboard class
--enable-dnd use Drag'n'Drop classes
- --enable-metafile use win32 metafiles
--disable-controls disable compilation of all standard controls
--enable-markup support wxControl::SetLabelMarkup
--enable-accel use accelerators
--enable-animatectrl use wxAnimationCtrl class
+ --enable-bannerwindow use wxBannerWindow class
--enable-artstd use standard XPM icons in wxArtProvider
--enable-arttango use Tango icons in wxArtProvider
--enable-bmpbutton use wxBitmapButton class
--enable-toolbook use wxToolbook class
--enable-treebook use wxTreebook class
--enable-treectrl use wxTreeCtrl class
+ --enable-treelist use wxTreeListCtrl class
--enable-commondlg use all common dialogs
--enable-aboutdlg use wxAboutBox
--enable-choicedlg use wxChoiceDialog
--enable-mousewheel use mousewheel
--enable-validators use wxValidator and derived classes
--enable-busyinfo use wxBusyInfo
+ --enable-hotkey use wxWindow::RegisterHotKey()
--enable-joystick use wxJoystick
- --enable-metafiles use wxMetaFile (Win32 only)
+ --enable-metafiles use wxMetaFile
--enable-dragimage use wxDragImage
--enable-accessibility enable accessibility support
--enable-uiactionsim use wxUIActionSimulator (experimental)
+ --enable-dctransform use wxDC::SetTransformMatrix and related
--enable-palette use wxPalette class
--enable-image use wxImage class
--enable-gif use gif images (GIF file format)
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-wxWidgets configure 2.9.2
+wxWidgets configure 2.9.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wxWidgets $as_me 2.9.2, which was
+It was created by wxWidgets $as_me 2.9.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
wx_major_version_number=2
wx_minor_version_number=9
-wx_release_number=2
+wx_release_number=3
wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
DEFAULT_wxUSE_ALL_FEATURES=yes
+DEFAULT_wxUSE_STD_CONTAINERS=no
DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
DEFAULT_wxUSE_OPENGL=auto
DEFAULT_wxUSE_MEDIACTRL=auto
DEFAULT_wxUSE_COMPILER_TLS=auto
+DEFAULT_wxUSE_HOTKEY=auto
+DEFAULT_wxUSE_METAFILE=auto
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
+if test "$wxUSE_STL" = "yes"; then
+ DEFAULT_wxUSE_STD_CONTAINERS=yes
+ DEFAULT_wxUSE_STD_IOSTREAM=yes
+ DEFAULT_wxUSE_STD_STRING=yes
+fi
+
+ enablestring=
+ defaultval=
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_containers" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_containers... $ECHO_C" >&6; }
+ # Check whether --enable-std_containers was given.
+if test "${enable_std_containers+set}" = set; then
+ enableval=$enable_std_containers;
+ if test "$enableval" = yes; then
+ wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=yes'
+ else
+ wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=no'
+ fi
+
+else
+
+ wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=${'DEFAULT_wxUSE_STD_CONTAINERS":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_std_containers"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_STD_CONTAINERS = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_STD_CONTAINERS
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
enablestring=
defaultval=
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string_conv_in_wxstring" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_string_conv_in_wxstring... $ECHO_C" >&6; }
+ # Check whether --enable-std_string_conv_in_wxstring was given.
+if test "${enable_std_string_conv_in_wxstring+set}" = set; then
+ enableval=$enable_std_string_conv_in_wxstring;
+ if test "$enableval" = yes; then
+ wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=yes'
+ else
+ wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=no'
+ fi
+
+else
+
+ wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=${'DEFAULT_wxUSE_STD_STRING_CONV_IN_WXSTRING":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_std_string_conv_in_wxstring"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_STD_STRING_CONV_IN_WXSTRING = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_STD_STRING_CONV_IN_WXSTRING
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=disable
defaultval=
if test -z "$defaultval"; then
echo "${ECHO_T}$result" >&6; }
- enablestring=
- defaultval=$wxUSE_ALL_FEATURES
- if test -z "$defaultval"; then
- if test x"$enablestring" = xdisable; then
- defaultval=yes
- else
- defaultval=no
- fi
- fi
-
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
- # Check whether --enable-metafile was given.
-if test "${enable_metafile+set}" = set; then
- enableval=$enable_metafile;
- if test "$enableval" = yes; then
- wx_cv_use_metafile='wxUSE_METAFILE=yes'
- else
- wx_cv_use_metafile='wxUSE_METAFILE=no'
- fi
-
-else
-
- wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_metafile"
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_METAFILE = no; then
- result=yes
- else
- result=no
- fi
- else
- result=$wxUSE_METAFILE
- fi
-
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
DEFAULT_wxUSE_CONTROLS=none
if test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_ACCEL=no
DEFAULT_wxUSE_ANIMATIONCTRL=no
+ DEFAULT_wxUSE_BANNERWINDOW=no
DEFAULT_wxUSE_BMPBUTTON=no
DEFAULT_wxUSE_BUTTON=no
DEFAULT_wxUSE_CALCTRL=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_TREEBOOK=no
DEFAULT_wxUSE_TREECTRL=no
+ DEFAULT_wxUSE_TREELISTCTRL=no
fi
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bannerwindow" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-bannerwindow... $ECHO_C" >&6; }
+ # Check whether --enable-bannerwindow was given.
+if test "${enable_bannerwindow+set}" = set; then
+ enableval=$enable_bannerwindow;
+ if test "$enableval" = yes; then
+ wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=yes'
+ else
+ wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=no'
+ fi
+
+else
+
+ wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=${'DEFAULT_wxUSE_BANNERWINDOW":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_bannerwindow"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_BANNERWINDOW = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_BANNERWINDOW
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treelist" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-treelist... $ECHO_C" >&6; }
+ # Check whether --enable-treelist was given.
+if test "${enable_treelist+set}" = set; then
+ enableval=$enable_treelist;
+ if test "$enableval" = yes; then
+ wx_cv_use_treelist='wxUSE_TREELISTCTRL=yes'
+ else
+ wx_cv_use_treelist='wxUSE_TREELISTCTRL=no'
+ fi
+
+else
+
+ wx_cv_use_treelist='wxUSE_TREELISTCTRL=${'DEFAULT_wxUSE_TREELISTCTRL":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_treelist"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_TREELISTCTRL = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_TREELISTCTRL
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hotkey" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-hotkey... $ECHO_C" >&6; }
+ # Check whether --enable-hotkey was given.
+if test "${enable_hotkey+set}" = set; then
+ enableval=$enable_hotkey;
+ if test "$enableval" = yes; then
+ wx_cv_use_hotkey='wxUSE_HOTKEY=yes'
+ else
+ wx_cv_use_hotkey='wxUSE_HOTKEY=no'
+ fi
+
+else
+
+ wx_cv_use_hotkey='wxUSE_HOTKEY=${'DEFAULT_wxUSE_HOTKEY":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_hotkey"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_HOTKEY = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_HOTKEY
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dctransform" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dctransform... $ECHO_C" >&6; }
+ # Check whether --enable-dctransform was given.
+if test "${enable_dctransform+set}" = set; then
+ enableval=$enable_dctransform;
+ if test "$enableval" = yes; then
+ wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=yes'
+ else
+ wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=no'
+ fi
+
+else
+
+ wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=${'DEFAULT_wxUSE_DC_TRANSFORM_MATRIX":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_dctransform"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_DC_TRANSFORM_MATRIX = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_DC_TRANSFORM_MATRIX
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
{ echo "$as_me:$LINENO: result: exists" >&5
echo "${ECHO_T}exists" >&6; }
fi
- MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK"
- eval "CC=\"$CC $MACOSX_SDK_OPTS\""
- eval "CXX=\"$CXX $MACOSX_SDK_OPTS\""
- eval "LD=\"$LD $MACOSX_SDK_OPTS\""
+ MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK"
retest_macosx_linking=yes
fi
CCVERSION=`$CC --version | grep 4.[2-9].`
if test "x$CCVERSION" != "x"; then
echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead."
- CC="/usr/bin/gcc-4.0"
+ CC="gcc-4.0"
fi
fi
if test "x$CXX" = "xg++"; then
CCVERSION=`$CXX --version | grep 4.[2-9].`
if test "x$CCVERSION" != "x"; then
- CXX="/usr/bin/g++-4.0"
+ CXX="g++-4.0"
fi
fi
fi
+if test "x$MACOSX_SDK_OPTS" != "x"; then
+ eval "CC=\"$CC $MACOSX_SDK_OPTS\""
+ eval "CXX=\"$CXX $MACOSX_SDK_OPTS\""
+ eval "LD=\"$LD $MACOSX_SDK_OPTS\""
+fi
+
if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
if test "$wxUSE_OSX_IPHONE" = 1; then
MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN"
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h> /* for off_t */
- #include <stdio.h>
+#include <stdio.h>
int
main ()
{
-int (*fp) (FILE *, off_t, int) = fseeko;
- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
;
return 0;
}
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
- #include <stdio.h>
+#include <stdio.h>
int
main ()
{
-int (*fp) (FILE *, off_t, int) = fseeko;
- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
;
return 0;
}
GUI_TK_LIBRARY=
- WXGTK12=
WXGTK127=
WXGTK2=
WXGPE=
rm -f conf.gtktest
-
- case "${host}" in
- *-*-solaris2* )
- if test "$wxUSE_SHARED" != "yes"; then
- GTK_LIBS="$GTK_LIBS -lX11"
- fi
- esac
fi
if test -z "$wx_cv_lib_gtk"; then
if test -z "$wx_cv_lib_gtk"; then
wx_cv_lib_gtk=none
else
+ GTK_LIBS="$GTK_LIBS -lX11"
+
wx_cv_cflags_gtk=$GTK_CFLAGS
wx_cv_libs_gtk=$GTK_LIBS
fi
TOOLKIT_VERSION=2
;;
1.2.7) WXGTK127=1
- WXGTK12=1
- ;;
- 1.2.3) WXGTK12=1
;;
+ 1.2*) ;;
*) { { echo "$as_me:$LINENO: error:
The development files for GTK+ were not found. For GTK+ 2, please
ensure that pkg-config is in the path and that gtk+-2.0.pc is
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
-
- TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -DG_DISABLE_CAST_CHECKS"
-
AFMINSTALL=afminstall
TOOLKIT=GTK
GUIDIST=GTK_DIST
error this platform has no visibility;
#endif
+ /* at the time of Xcode 4.1 / Clang 3, Clang++ still didn't have the bugs sorted out: */
+ #if defined(__clang__)
+ clang compiler is still broken w.r.t. visibility;
+ #endif
+
extern __attribute__((__visibility__("hidden"))) int hiddenvar;
extern __attribute__((__visibility__("default"))) int exportedvar;
extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
cat <<EOF >change-install-names
#!/bin/sh
-libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
+libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
for i in \${libnames} ; do
- ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
+ ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
for dep in \${libnames} ; do
- ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
+ ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
done
done
EOF
chmod +x change-install-names
- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
+ DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
fi
HEADER_PAD_OPTION="-headerpad_max_install_names"
if test "$WXGTK2" = 1 ; then
cat >>confdefs.h <<_ACEOF
#define __WXGTK20__ $WXGTK2
-_ACEOF
-
- WXGTK12=1
-fi
-
-if test "$WXGTK12" = 1 ; then
- cat >>confdefs.h <<_ACEOF
-#define __WXGTK12__ $WXGTK12
_ACEOF
fi
if test "$wxUSE_GTK" = 1 ; then
if test "x$wxGTK_VERSION" = "x1" ; then
CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
+ else
+ CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
fi
fi
fi
else
wxUSE_FSWATCHER=no
fi
+ else
+ if test "$wxUSE_THREADS" != "yes"; then
+ { echo "$as_me:$LINENO: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&5
+echo "$as_me: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&2;}
+ wxUSE_FSWATCHER=no
+ fi
fi
if test "$wxUSE_FSWATCHER" = "yes"; then
fi
+if test "$wxUSE_HOTKEY" = "yes"; then
+ if test "$wxUSE_MSW" != 1 -a "$wxUSE_OSX_COCOA" != 1 -a "$wxUSE_OSX_CARBON" != 1; then
+ { echo "$as_me:$LINENO: WARNING: Hot keys not supported by the current toolkit, disabled" >&5
+echo "$as_me: WARNING: Hot keys not supported by the current toolkit, disabled" >&2;}
+ wxUSE_HOTKEY=no
+ fi
+elif test "$wxUSE_HOTKEY" = "auto"; then
+ if test "$wxUSE_MSW" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OSX_CARBON" = 1; then
+ wxUSE_HOTKEY=yes
+ fi
+fi
+if test "$wxUSE_HOTKEY" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_HOTKEY 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_STD_CONTAINERS" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STD_CONTAINERS 1
+_ACEOF
+
+fi
+
if test "$wxUSE_STD_IOSTREAM" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_STD_IOSTREAM 1
fi
+if test "$wxUSE_STD_STRING_CONV_IN_WXSTRING" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING 1
+_ACEOF
+
+fi
+
if test "$wxUSE_STDPATHS" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_STDPATHS 1
echo "$as_me: WARNING: wxMetafile is not available on this system... disabled" >&2;}
wxUSE_METAFILE=no
fi
+elif test "$wxUSE_METAFILE" = "auto"; then
+ if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then
+ wxUSE_METAFILE=yes
+ fi
+fi
+
+if test "$wxUSE_METAFILE" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_METAFILE 1
+_ACEOF
+
+ if test "$wxUSE_MSW" = 1; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ENH_METAFILE 1
+_ACEOF
+
+ fi
fi
wxUSE_DATAOBJ=no
wxUSE_OLE=no
fi
-
- if test "$wxUSE_METAFILE" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_METAFILE 1
-_ACEOF
-
-
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ENH_METAFILE 1
-_ACEOF
-
- fi
fi
if test "$wxUSE_IPC" = "yes"; then
fi
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
- if test "$wxUSE_GTK" = 1; then
- if test "$WXGTK12" != 1; then
- { echo "$as_me:$LINENO: WARNING: Drag and drop is only supported under GTK+ 1.2... disabled" >&5
-echo "$as_me: WARNING: Drag and drop is only supported under GTK+ 1.2... disabled" >&2;}
- wxUSE_DRAG_AND_DROP=no
- fi
- fi
-
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
"$wxUSE_DFB" = 1; then
{ echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction"
fi
+if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_DC_TRANSFORM_MATRIX 1
+_ACEOF
+
+fi
+
USES_CONTROLS=0
if test "$wxUSE_CONTROLS" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate"
fi
+if test "$wxUSE_BANNERWINDOW" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_BANNERWINDOW 1
+_ACEOF
+
+fi
+
if test "$wxUSE_BUTTON" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_BUTTON 1
fi
fi
+if test "$wxUSE_TREECTRL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_TREELISTCTRL 1
+_ACEOF
+
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_POPUPWIN" = "yes"; then
if test "$wxUSE_OLD_COCOA" = 1 ; then
{ echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
fi
-if test "$wxUSE_METAFILE" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_METAFILE 1
-_ACEOF
-
-fi
-
if test "$wxUSE_MIMETYPE" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_MIMETYPE 1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by wxWidgets $as_me 2.9.2, which was
+This file was extended by wxWidgets $as_me 2.9.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-wxWidgets config.status 2.9.2
+wxWidgets config.status 2.9.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
projects / wxWidgets.git / blobdiff