DEFAULT_wxUSE_X11=0
DEFAULT_wxUSE_DFB=0
-dnl these are the values which are really default for the given platform -
-dnl they're not cached and are only used if no --with-toolkit was given *and*
-dnl nothing was found in the cache
+dnl these are the values which are really default for the given platform:
+dnl they're used if no --with-<toolkit> options were given to detect the
+dnl toolkit to use by default for the target platform
DEFAULT_DEFAULT_wxUSE_COCOA=0
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MAC=0
dnl
dnl NB: see also DEFAULT_wxUSE<toolkit> variables defined above
-WX_ARG_CACHE_INIT
-
dnl it's only necessary to list the options which should be disabled by
dnl default, all the rest have default value of "yes" (or, rather, of
dnl wxUSE_ALL_FEATURES which is the only which has to be set to "yes" by
DEFAULT_wxUSE_ACCESSIBILITY=no
DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
+DEFAULT_wxUSE_IPV6=no
DEFAULT_wxUSE_MEDIACTRL=no
DEFAULT_wxUSE_TAB_DIALOG=no
+DEFAULT_wxUSE_GSTREAMER8=no
DEFAULT_wxUSE_UNICODE_UTF8=auto
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
dnl Always default to no. Only special cases require this.
DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
-
-for toolkit in `echo $ALL_TOOLKITS`; do
- LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
- if test "x$LINE" != "x" ; then
- has_toolkit_in_cache=1
- eval "DEFAULT_$LINE"
- eval "CACHE_$toolkit=1"
-
- LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}`
- if test "x$LINE" != "x" ; then
- eval "DEFAULT_$LINE"
- fi
- fi
-done
-
dnl ===========================
dnl deal with configure options
dnl ===========================
fi
dnl we use AC_ARG_WITH and not WX_ARG_WITH for the toolkit options as they
-dnl shouldn't default to wxUSE_ALL_FEATURES, and we don't need to cache them
-dnl automatically
+dnl shouldn't default to wxUSE_ALL_FEATURES
AC_ARG_WITH(gtk, [[ --with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mac, [ --with-mac use Mac OS X], [wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(macosx-sdk, [ --with-macosx-sdk=PATH use an OS X SDK at PATH], [
wxUSE_MACOSX_SDK=$withval
wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
- echo "wxUSE_MACOSX_SDK=$wxUSE_MACOSX_SDK" >> ${wx_arg_cache_file}.tmp
- ], [
- # NOTE: Empty string on purpose so that --without-macosx-sdk (thus no)
- # will override --enable-universal_binary's automatic SDK usage.
- wxUSE_MACOSX_SDK=
- LINE=`grep "^wxUSE_MACOSX_SDK=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "$LINE"
- echo "$LINE" >> ${wx_arg_cache_file}.tmp
- fi
])
AC_MSG_RESULT([$wxUSE_MACOSX_SDK])
AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VER build binaries which require at least this OS X version], [
wxUSE_MACOSX_VERSION_MIN=$withval
wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
- echo "wxUSE_MACOSX_VERSION_MIN=$wxUSE_MACOSX_VERSION_MIN" >> ${wx_arg_cache_file}.tmp
- ], [
- # default "yes" because when not using an SDK it means the same as no
- # but when using an SDK it means to use the SDK version
- wxUSE_MACOSX_VERSION_MIN=yes
- # See if there is a value in the cache
- LINE=`grep "^wxUSE_MACOSX_VERSION_MIN=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "$LINE"
- echo "$LINE" >> ${wx_arg_cache_file}.tmp
- fi
])
AC_MSG_RESULT([$wxUSE_MACOSX_VERSION_MIN])
WX_ARG_ENABLE_PARAM(utf8, [ --enable-utf8 use UTF-8 representation for strings (Unix only)], wxUSE_UNICODE_UTF8)
WX_ARG_ENABLE(utf8only, [ --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only)], wxUSE_UNICODE_UTF8_LOCALE)
WX_ARG_ENABLE(extended_rtti, [ --enable-extended_rtti use extended RTTI (XTI)], wxUSE_EXTENDED_RTTI)
-if test "$USE_OS2" = "1"; then
+if test "$USE_OS2" = 1; then
DEFAULT_wxUSE_OMF=no
WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF)
fi
WX_ARG_FEATURE(http, [ --enable-http use wxHTTP (requires wxProtocol], wxUSE_PROTOCOL_HTTP)
WX_ARG_FEATURE(fileproto, [ --enable-fileproto use wxFileProto class (requires wxProtocol], wxUSE_PROTOCOL_FILE)
WX_ARG_FEATURE(sockets, [ --enable-sockets use socket/network classes], wxUSE_SOCKETS)
+WX_ARG_FEATURE(ipv6, [ --enable-ipv6 enable IPv6 support in wxSocket], wxUSE_IPV6)
WX_ARG_FEATURE(ole, [ --enable-ole use OLE classes (Win32 only)], wxUSE_OLE)
WX_ARG_FEATURE(dataobj, [ --enable-dataobj use data object classes], wxUSE_DATAOBJ)
WX_ARG_FEATURE(listbox, [ --enable-listbox use wxListBox class], wxUSE_LISTBOX)
WX_ARG_FEATURE(listctrl, [ --enable-listctrl use wxListCtrl class], wxUSE_LISTCTRL)
WX_ARG_FEATURE(notebook, [ --enable-notebook use wxNotebook class], wxUSE_NOTEBOOK)
+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(radiobox, [ --enable-radiobox use wxRadioBox class], wxUSE_RADIOBOX)
WX_ARG_FEATURE(radiobtn, [ --enable-radiobtn use wxRadioButton class], wxUSE_RADIOBTN)
WX_ARG_FEATURE(dccache, [ --enable-dccache cache temporary wxDC objects (Win32 only)], wxUSE_DC_CACHEING)
WX_ARG_FEATURE(ps-in-msw, [ --enable-ps-in-msw use PS printing in wxMSW (Win32 only)], wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
-WX_ARG_FEATURE(ownerdrawn, [ --enable-ownerdrawn use owner drawn controls (Win32 only)], wxUSE_OWNER_DRAWN)
+WX_ARG_FEATURE(ownerdrawn, [ --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only)], wxUSE_OWNER_DRAWN)
WX_ARG_FEATURE(uxtheme, [ --enable-uxtheme enable support for Windows XP themed look (Win32 only)], wxUSE_UXTHEME)
WX_ARG_FEATURE(wxdib, [ --enable-wxdib use wxDIB class (Win32 only)], wxUSE_DIB)
fi
dnl for GUI only
-dnl cache the options values before (may be) aborting below
-WX_ARG_CACHE_FLUSH
-
dnl check that no more than one toolkit is given and that if none are given that
dnl we have a default one
if test "$TOOLKIT_GIVEN" = 1; then
dnl convert "yes", "any" or a number to 1 and "no" to 0
- for toolkit in `echo $ALL_TOOLKITS`; do
+ for toolkit in $ALL_TOOLKITS; do
var=wxUSE_$toolkit
eval "value=\$${var}"
if test "x$value" = "xno"; then
done
else
dnl try to guess the most apropriate toolkit for this platform
- for toolkit in `echo $ALL_TOOLKITS`; do
- if test "$has_toolkit_in_cache" != 1; then
- var=DEFAULT_DEFAULT_wxUSE_$toolkit
- else
- var=DEFAULT_wxUSE_$toolkit
-
- eval "version=\$DEFAULT_wx${toolkit}_VERSION"
- if test "x$version" != "x"; then
- eval "wx${toolkit}_VERSION=$version"
- fi
- fi
+ for toolkit in $ALL_TOOLKITS; do
+ var=DEFAULT_DEFAULT_wxUSE_$toolkit
eval "wxUSE_$toolkit=\$${var}"
done
fi
AC_MSG_ERROR(Please specify a toolkit -- cannot determine the default for ${host})
;;
*)
- AC_MSG_ERROR(Please specify at most one toolkit (maybe some are cached in configarg.cache?))
+ AC_MSG_ERROR(Please specify at most one toolkit)
esac
# to be removed when --disable-gtk2 isn't needed
wxGTK_VERSION=1
fi
- dnl cache the wxUSE_<TOOLKIT> values too
- for toolkit in `echo $ALL_TOOLKITS`; do
- var=wxUSE_$toolkit
- eval "value=\$${var}"
- if test "x$value" != x; then
- cache_var=CACHE_$toolkit
- eval "cache=\$${cache_var}"
- if test "$cache" = 1; then
- echo "$var=$value" >> ${wx_arg_cache_file}
- eval "version=\$wx${toolkit}_VERSION"
- if test "x$version" != "x"; then
- echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file}
- fi
- fi
+ for toolkit in $ALL_TOOLKITS; do
+ var=wxUSE_$toolkit
+ eval "value=\$${var}"
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
done
else
if test "x$host_alias" != "x"; then
;;
*-hp-hpux* )
AC_CHECK_SIZEOF(long long, 0)
- if test "$ac_cv_sizeof_long_long" != "0"; then
+ if test "$ac_cv_sizeof_long_long" != 0; then
dnl HPUX 10.20 headers need this define in order to use long long definitions
CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS"
fi
#include <stdio.h>
]
)
-if test "$ac_cv_sizeof_wchar_t" != "0"; then
+if test "$ac_cv_sizeof_wchar_t" != 0; then
wxUSE_WCHAR_T=yes
else
wxUSE_WCHAR_T=no
if test "$wx_cv_class_stdbasicstring" != yes; then
if test "$wxUSE_STL" = "yes"; then
AC_MSG_ERROR([Can't use --enable-stl without $std_string or std::basic_string<$char_type>])
- elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
+ elif test "$wxUSE_STD_STRING" = "yes"; then
AC_MSG_ERROR([Can't use --enable-std_string without $std_string or std::basic_string<$char_type>])
else
AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string])
[#include <iostream>])
if test "$wxUSE_STD_IOSTREAM" != "yes"; then
- if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then
+ if test "$wxUSE_STD_IOSTREAM" = "yes"; then
AC_MSG_ERROR([Can't use --enable-std_iostreams without std::istream and std::ostream])
else
AC_MSG_WARN([No std::iostreams, switching to --disable-std_iostreams])
fi
fi
-dnl ------------------------------------------------------------------------
-dnl Check for tiff library
-dnl ------------------------------------------------------------------------
-
-TIFF_LINK=
-TIFF_PREREQ_LINKS=-lm
-if test "$wxUSE_LIBTIFF" != "no" ; then
- AC_DEFINE(wxUSE_LIBTIFF)
-
- if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
- dnl libtiff may depend on libjpeg and libz so use them in the test
- dnl below or it would fail
- if test "$wxUSE_LIBJPEG" = "sys"; then
- TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
- fi
- if test "$wxUSE_ZLIB" = "sys"; then
- TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
- fi
- AC_CHECK_HEADER(tiffio.h,
- [
- AC_CHECK_LIB(tiff, TIFFError,
- TIFF_LINK=" -ltiff",
- ,
- $TIFF_PREREQ_LINKS)
- ],
- [],
- [ ]
- )
-
- if test "x$TIFF_LINK" = "x" ; then
- if test "$wxUSE_LIBTIFF" = "sys" ; then
- AC_MSG_ERROR([system tiff library not found! Use --with-libtiff=builtin to use built-in version])
- else
- AC_MSG_WARN([system tiff library not found, will use built-in instead])
- wxUSE_LIBTIFF=builtin
- fi
- else
- dnl we are using the system library
- wxUSE_LIBTIFF=sys
- fi
- fi
- if test "$wxUSE_LIBTIFF" = "builtin" ; then
- AC_CONFIG_SUBDIRS([src/tiff])
- fi
-fi
-
dnl ------------------------------------------------------------------------
dnl Check for jpeg library
dnl ------------------------------------------------------------------------
+dnl this check must be done before the check for libtiff as libtiff uses
+dnl libjpeg itself
JPEG_LINK=
if test "$wxUSE_LIBJPEG" != "no" ; then
AC_DEFINE(wxUSE_LIBJPEG)
fi
fi
fi
-else dnl wxUSE_LIBJPEG = "no"
- if test "$wxUSE_LIBTIFF" = "builtin"; then
- dnl we have to prevent the builtin libtiff configure from building the
- dnl library with JPEG support as this was explicitly disabled by user,
- dnl but unfortunately it needs --disable-jpeg and not --without-libjpeg
- dnl (which will be passed to it anyhow as configure passes arguments to
- dnl the top-level script to all the other ones called recursively), so
- dnl we need to hack around this
- ac_configure_args="$ac_configure_args --disable-jpeg"
+fi
+
+dnl ------------------------------------------------------------------------
+dnl Check for tiff library
+dnl ------------------------------------------------------------------------
+
+TIFF_LINK=
+TIFF_PREREQ_LINKS=-lm
+if test "$wxUSE_LIBTIFF" != "no" ; then
+ AC_DEFINE(wxUSE_LIBTIFF)
+
+ if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
+ dnl libtiff may depend on libjpeg and libz so use them in the test
+ dnl below or it would fail
+ if test "$wxUSE_LIBJPEG" = "sys"; then
+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
+ fi
+ if test "$wxUSE_ZLIB" = "sys"; then
+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
+ fi
+ AC_CHECK_HEADER(tiffio.h,
+ [
+ AC_CHECK_LIB(tiff, TIFFError,
+ TIFF_LINK=" -ltiff",
+ ,
+ $TIFF_PREREQ_LINKS)
+ ],
+ [],
+ [ ]
+ )
+
+ if test "x$TIFF_LINK" = "x" ; then
+ if test "$wxUSE_LIBTIFF" = "sys" ; then
+ AC_MSG_ERROR([system tiff library not found! Use --with-libtiff=builtin to use built-in version])
+ else
+ AC_MSG_WARN([system tiff library not found, will use built-in instead])
+ wxUSE_LIBTIFF=builtin
+ fi
+ else
+ dnl we are using the system library
+ wxUSE_LIBTIFF=sys
+ fi
+ fi
+ if test "$wxUSE_LIBTIFF" = "builtin" ; then
+ if test "$wxUSE_LIBJPEG" = "no"; then
+ dnl we have to prevent the builtin libtiff configure from building the
+ dnl library with JPEG support as this was explicitly disabled by user,
+ dnl but unfortunately it needs --disable-jpeg and not --without-libjpeg
+ dnl (which will be passed to it anyhow as configure passes arguments to
+ dnl the top-level script to all the other ones called recursively), so
+ dnl we need to hack around this
+ ac_configure_args="$ac_configure_args --disable-jpeg"
+ fi
+ AC_CONFIG_SUBDIRS([src/tiff])
fi
fi
WXGTK12=
WXGTK127=
- WXGTK20=
+ WXGTK2=
WXGPE=
if test "$wxUSE_COCOA" = 1 ; then
fi
esac
- AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
+ AM_PATH_GTK_2_0(2.4.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
dnl Solaris also requires -lX11 for static lib
case "${host}" in
fi
case "$wx_cv_lib_gtk" in
- 2.0) WXGTK20=1
+ 2.0) WXGTK2=1
TOOLKIT_VERSION=2
;;
1.2.7) WXGTK127=1
;;
esac
- if test "$WXGTK20" = 1; then
+ if test "$WXGTK2" = 1; then
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
LIBS="$LIBS $wx_cv_libs_gtk"
- dnl gtk_icon_size_lookup is not available in the GTK+ headers
- dnl that have shipped with some versions of Sun's JDS. Not using
- dnl AC_CHECK_FUNCS here since it only checks the function exists
- dnl in the lib (not the header).
- AC_CHECK_DECLS([gtk_icon_size_lookup], [],
- [AC_DEFINE(NEED_GTK_ICON_SIZE_LOOKUP)],
- [#include <gtk/gtk.h>])
-
-
dnl test if we have at least GTK+ 2.10:
AC_MSG_CHECKING([if GTK+ is version >= 2.10])
AC_TRY_COMPILE([
[
AC_DEFINE(__WXGTK210__)
AC_DEFINE(__WXGTK26__)
- AC_DEFINE(__WXGTK24__)
AC_MSG_RESULT([yes])
ac_wxgtk210=1
],
],
[
AC_DEFINE(__WXGTK26__)
- AC_DEFINE(__WXGTK24__)
AC_MSG_RESULT([yes])
ac_wxgtk26=1
],
])
fi
- if test "$ac_wxgtk26" = 0; then
- dnl test if we have at least GTK+ 2.4:
- AC_MSG_CHECKING([if GTK+ is version >= 2.4])
- AC_TRY_COMPILE([
- #include <gtk/gtk.h>
- ],
- [
- #if !GTK_CHECK_VERSION(2,4,0)
- Not GTK+ 2.4
- #endif
- ],
- [
- AC_DEFINE(__WXGTK24__)
- AC_MSG_RESULT([yes])
- ],
- [
- AC_MSG_RESULT([no])
- ])
- fi
-
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
else
libsm_ice_link=""
libs_found=0
for libp in "" " -lXp"; do
- if test "$libs_found" = "0"; then
+ if test "$libs_found" = 0; then
for libsm_ice in "" " -lSM -lICE"; do
- if test "$libs_found" = "0"; then
+ if test "$libs_found" = 0; then
save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
save_CFLAGS=$CFLAGS
fi
done
- if test "$libs_found" = "0"; then
+ if test "$libs_found" = 0; then
AC_MSG_RESULT([can't find the right libraries])
AC_MSG_ERROR([can't link a simple motif program])
fi
if test "$TOOLKIT" = "PM" ; then
TOOLKIT_DIR="os2"
else
- TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"`
+ TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[[A-Z]]' '[[a-z]]'`
fi
if test "$wxUSE_UNIVERSAL" = "yes"; then
dnl If UTF-8 support wasn't explicitly enabled or disabled, enable it only
dnl for ports where it makes sense by default (GTK+, DirectFB):
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then
- if test "$USE_UNIX" = "1" -a "$wxUSE_DARWIN" != "1" ; then
+ if test "$USE_UNIX" = 1 -a "$wxUSE_DARWIN" != 1 ; then
wxUSE_UNICODE_UTF8=yes
- elif test "$USE_OS2" = "1" ; then
+ elif test "$USE_OS2" = 1 ; then
dnl wide char support is quite incomplete in libc;
dnl UTF-8 might actually work when evaluating/setting
dnl code pages correctly, even for ports other than GTK20.
USE_OPENGL=0
if test "$wxUSE_OPENGL" = "yes"; then
- if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = "1"; then
+ if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
wxUSE_OPENGL="no"
- elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+ elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
DEBUG_INFO=1
fi
-WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]'`
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
AC_TYPE_PID_T
dnl defines size_t if not already defined
AC_TYPE_SIZE_T
-dnl defines uid_t and gid_t if not already defined
-AC_TYPE_UID_T
dnl sets HAVE_SSIZE_T if ssize_t is defined
AC_CHECK_TYPES(ssize_t)
fi
fi
-if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then
+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
fi
fi
-if test "$WXGTK20" = 1 ; then
- AC_DEFINE_UNQUOTED(__WXGTK20__,$WXGTK20)
+if test "$WXGTK2" = 1 ; then
+ AC_DEFINE_UNQUOTED(__WXGTK20__,$WXGTK2)
WXGTK12=1
fi
dnl Unix implementation needs additional checks because audio support
dnl comes in many favours:
-if test "$USE_UNIX" = "1" ; then
+if test "$USE_UNIX" = 1 ; then
dnl mmedia doesn't compile with wxMGL, remove this if this is ever fixed
if test "$wxUSE_MGL" != 1; then
dnl it's not enough to check for just the header because OSS under NetBSD
WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then
- if test "$USE_UNIX" = "1" ; then
+ if test "$USE_UNIX" = 1 ; then
if test "$wxUSE_LIBSDL" != "no"; then
AM_PATH_SDL([1.2.0],
[
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
fi
-if test "$WXGTK20" = 1; then
+if test "$WXGTK2" = 1; then
PKG_PROG_PKG_CONFIG()
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
fi
if test "$wxUSE_DEBUGREPORT" = "yes"; then
- if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then
+ if test "$USE_UNIX" != 1 -a "$USE_WIN32" != 1; then
AC_MSG_WARN([Creating debug reports not currently supported on this system, disabled])
wxUSE_DEBUGREPORT=no
else
dnl VZ: the GUI hooks wxSocket needs are not implemented yet in some toolkits
if test "$wxUSE_SOCKETS" = "yes"; then
- if test "$wxUSE_MGL" = "1"; then
+ if test "$wxUSE_MGL" = 1; then
AC_MSG_WARN([wxSocket not yet supported under MGL... disabled])
wxUSE_SOCKETS="no"
fi
fi
if test "$wxUSE_SOCKETS" = "yes" ; then
+ if test "$wxUSE_IPV6" = "yes"; then
+ AC_CACHE_CHECK(
+ [whether we have sockaddr_in6],
+ [wx_cv_type_sockaddr_in6],
+ [
+ AC_TRY_COMPILE(
+ [
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ ],
+ [
+ struct sockaddr_in6 sa6;
+ ],
+ wx_cv_type_sockaddr_in6=yes,
+ wx_cv_type_sockaddr_in6=no
+ )
+ ]
+ )
+
+ if test "$wx_cv_type_sockaddr_in6"="yes"; then
+ AC_DEFINE(wxUSE_IPV6)
+ else
+ AC_MSG_WARN([IPv6 support not available... disabled])
+ fi
+ fi
+
AC_DEFINE(wxUSE_SOCKETS)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
fi
dnl joystick support is only for Linux 2.1.x or greater
else
dnl wxJoystick not supported by wxMGL at all
- if test "$wxUSE_MGL" != "1"; then
+ if test "$wxUSE_MGL" != 1; then
dnl notice the dummy includes argument: without it, AC_CHECK_HEADER
dnl checks only whether the header can be preprocessed, not that it
dnl can be compiled and in Linux 2.6.16 joystick.h is present but
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
fi
+if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes"; then
+ AC_DEFINE(wxUSE_NOTIFICATION_MESSAGE)
+fi
+
if test "$wxUSE_ODCOMBOBOX" = "yes"; then
AC_DEFINE(wxUSE_ODCOMBOBOX)
USES_CONTROLS=1
fi
if test "$wxUSE_POPUPWIN" = "yes"; then
- if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
+ if test "$wxUSE_COCOA" = 1 ; then
AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
else
if test "$wxUSE_PM" = 1; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
fi
+dnl ---------------------------------------------------------------------------
+dnl options used under wxMSW and wxPM
+dnl ---------------------------------------------------------------------------
+
+if test "$wxUSE_MSW" = 1 -o "$wxUSE_PM" = 1; then
+ if test "$wxUSE_OWNER_DRAWN" = "yes"; then
+ AC_DEFINE(wxUSE_OWNER_DRAWN)
+ fi
+fi
+
dnl ---------------------------------------------------------------------------
dnl wxMSW-only options
dnl ---------------------------------------------------------------------------
AC_DEFINE(wxUSE_WXDIB)
fi
- if test "$wxUSE_OWNER_DRAWN" = "yes"; then
- AC_DEFINE(wxUSE_OWNER_DRAWN)
- fi
-
if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
AC_DEFINE(wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
fi
dnl ---------------------------------------------------------------------------
if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
- if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
elif test "$wxUSE_GTK" != 1; then
dnl for other builds we'll just wing it for now...
if test "$wxUSE_GSTREAMER" = "yes"; then
CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
- LIBS="$GST_LIBS $LIBS"
+ EXTRALIBS_MEDIA="$GST_LIBS"
AC_DEFINE(wxUSE_GSTREAMER)
else
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
EXTRALIBS_XML="$EXPAT_LINK"
EXTRALIBS_HTML="$MSPACK_LINK"
+EXTRALIBS_MEDIA="$GST_LIBS"
EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
if test "$wxUSE_GUI" = "yes"; then
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
;;
*)
- for t in `echo $wxUNIV_THEMES | tr , ' ' | tr a-z A-Z`; do
+ for t in `echo $wxUNIV_THEMES | tr , ' ' | tr '[[a-z]]' '[[A-Z]]'`; do
AC_DEFINE_UNQUOTED(wxUSE_THEME_$t)
done
esac
AC_SUBST(EXTRALIBS)
AC_SUBST(EXTRALIBS_XML)
AC_SUBST(EXTRALIBS_HTML)
+AC_SUBST(EXTRALIBS_MEDIA)
AC_SUBST(EXTRALIBS_GUI)
AC_SUBST(EXTRALIBS_OPENGL)
AC_SUBST(EXTRALIBS_SDL)
AC_SUBST(BUILD)
AC_SUBST(DEBUG_INFO)
AC_SUBST(DEBUG_FLAG)
-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)
case "$TOOLKIT" in
GTK)
TOOLKIT_DESC="GTK+"
- if test "$WXGTK20" = 1; then
+ if test "$WXGTK2" = 1; then
TOOLKIT_DESC="$TOOLKIT_DESC 2"
if test "$wxUSE_GTKPRINT" = "yes" ; then
TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing";
dnl Configure samples, demos etc. directories, but only if they are present:
if test "$wxUSE_GUI" = "yes"; then
SUBDIRS="samples demos utils"
-else dnl we build wxBase only
+else
+ dnl we build wxBase only
dnl there are no wxBase programs in demos
SUBDIRS="samples utils"
fi
dnl Add tests to the list of subdirs if cppunit 1.8.0+ is detected
AM_PATH_CPPUNIT(1.8.0, [SUBDIRS="$SUBDIRS tests"])
-for subdir in `echo $SUBDIRS`; do
+for subdir in $SUBDIRS; do
if test -d ${srcdir}/${subdir} ; then
if test "$wxUSE_GUI" = "yes"; then
if test ${subdir} = "samples"; then
dnl only take those samples which compile in the current
dnl configuration and which exist
makefiles="samples/Makefile.in $makefiles"
- for sample in `echo $SAMPLES_SUBDIRS`; do
+ for sample in $SAMPLES_SUBDIRS; do
if test -d $srcdir/samples/$sample; then
makefiles="samples/$sample/Makefile.in $makefiles"
fi
dnl assume that everything compiles for utils &c
dnl any that shouldn't be built can be added to
dnl DISABLED_UTILS, DISABLED_DEMOS
- disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`;
+ disabled_var=DISABLED_`echo $subdir | tr '[[a-z]]' '[[A-Z]]'`
eval "disabled=\$$disabled_var"
disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
fi
- else dnl we build wxBase only
+ else
+ dnl we build wxBase only
dnl don't take all samples/utils, just those which build with
dnl wxBase
if test ${subdir} = "samples"; then
$makefiles"
fi
done
- else dnl assume that everything compiles for tests
+ else
+ dnl assume that everything compiles for tests
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
fi
fi
projects / wxWidgets.git / blobdiff