#! /bin/sh
-# From configure.in Id: configure.in 47611 2007-07-21 07:31:28Z VZ .
+# From configure.in Id: configure.in 49661 2007-11-05 22:32:45Z VZ .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
CXX
CXXFLAGS
ac_ct_CXX
-RANLIB
AR
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-STRIP
-WINDRES
-DLLTOOL
-IF_GNU_MAKE
-LN_S
subdirs
PKG_CONFIG
GTK_CFLAGS
PANGOXFT_LIBS
CFLAGS_VISIBILITY
CXXFLAGS_VISIBILITY
-REZ
-DEREZ
-SETFILE
LIBICONV
SDL_CONFIG
SDL_CFLAGS
SDL_LIBS
+GTKPRINT_CFLAGS
+GTKPRINT_LIBS
LIBGNOMEPRINTUI_CFLAGS
LIBGNOMEPRINTUI_LIBS
GNOMEVFS_CFLAGS
wxUSE_ZLIB
wxUSE_REGEX
wxUSE_EXPAT
-wxUSE_ODBC
wxUSE_LIBJPEG
wxUSE_LIBPNG
wxUSE_LIBTIFF
EXTRALIBS
EXTRALIBS_XML
EXTRALIBS_HTML
-EXTRALIBS_ODBC
EXTRALIBS_GUI
EXTRALIBS_OPENGL
EXTRALIBS_SDL
WITH_PLUGIN_SDL
+EXTRALIBS_GTKPRINT
EXTRALIBS_GNOMEPRINT
EXTRALIBS_GNOMEVFS
EXTRALIBS_HILDON
HOST_SUFFIX
CPPUNIT_CFLAGS
CPPUNIT_LIBS
+RANLIB
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+LN_S
SET_MAKE
MAKE_SET
AROPTIONS
+STRIP
NM
INSTALL_DIR
LDFLAGS_GUI
+IF_GNU_MAKE
PLATFORM_UNIX
PLATFORM_WIN32
PLATFORM_MSDOS
SONAME_FLAG
DEPS_TRACKING
BK_DEPS
+WINDRES
+REZ
+SETFILE
GCC_PCH
ICC_PCH
BK_MAKE_PCH
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
-COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_SHARED_0_USE_STC_1
COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
-COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
COND_MONOLITHIC_0_SHARED_1_USE_STC_1
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
COND_MONOLITHIC_0_USE_AUI_1
COND_MONOLITHIC_0_USE_GUI_1
COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1
-COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1
COND_MONOLITHIC_0_USE_HTML_1
COND_MONOLITHIC_0_USE_MEDIA_1
-COND_MONOLITHIC_0_USE_ODBC_1
COND_MONOLITHIC_0_USE_QA_1
COND_MONOLITHIC_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_USE_STC_1
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
COND_PLATFORM_MACOS_1
COND_PLATFORM_MAC_1
-COND_PLATFORM_MSDOS_0
COND_PLATFORM_MSDOS_1
COND_PLATFORM_OS2_1
COND_PLATFORM_UNIX_0
COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
COND_SHARED_0_USE_STC_1
-COND_SHARED_0_USE_XRC_1
COND_SHARED_0_WXUSE_EXPAT_BUILTIN
-COND_SHARED_0_WXUSE_ODBC_BUILTIN
COND_SHARED_0_WXUSE_REGEX_BUILTIN
COND_SHARED_0_WXUSE_ZLIB_BUILTIN
COND_SHARED_1
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
-COND_SHARED_1_USE_XRC_1
COND_TOOLKIT_
COND_TOOLKIT_COCOA
COND_TOOLKIT_COCOA_USE_GUI_1
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
-COND_USE_ODBC_1
-COND_USE_OPENGL_1
COND_USE_PCH_1
COND_USE_PLUGINS_0
COND_USE_RTTI_0
COND_WXUSE_LIBJPEG_BUILTIN
COND_WXUSE_LIBPNG_BUILTIN
COND_WXUSE_LIBTIFF_BUILTIN
-COND_WXUSE_ODBC_BUILTIN
COND_WXUSE_REGEX_BUILTIN
COND_WXUSE_ZLIB_BUILTIN
+DEREZ
SHARED
WX_LIBRARY_BASENAME_NOGUI
WX_LIBRARY_BASENAME_GUI
WXCONFIG_RPATH
WXCONFIG_LDFLAGS_GUI
WXCONFIG_RESFLAGS
-EXE_LINKER
GUIDIST
DISTDIR
SAMPLES_SUBDIRS
POSTLINK_COMMAND
MACSETFILE
GCC
+DLLTOOL
CPPUNIT_CONFIG
LIBOBJS
LTLIBOBJS'
PANGOFT2_LIBS
PANGOXFT_CFLAGS
PANGOXFT_LIBS
+GTKPRINT_CFLAGS
+GTKPRINT_LIBS
LIBGNOMEPRINTUI_CFLAGS
LIBGNOMEPRINTUI_LIBS
GNOMEVFS_CFLAGS
CAIRO_LIBS
GST_CFLAGS
GST_LIBS'
-ac_subdirs_all='src/expat'
+ac_subdirs_all='src/tiff
+src/expat'
# Initialize some variables set by options.
ac_init_help=
--enable-permissive compile code disregarding strict ANSI
--enable-no_deps create code without dependency information
--disable-vararg_macros don't use vararg macros, even if they are supported
- --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working)
+ --enable-universal_binary create Mac PowerPC and Intel Universal binary
--enable-compat26 enable wxWidgets 2.6 compatibility
--disable-compat28 disable wxWidgets 2.8 compatibility
--disable-rpath disable use of rpath for uninstalled builds
--enable-dataobj use data object classes
--enable-ipc use interprocess communication (wxSocket etc.)
--enable-baseevtloop use event loop in console programs too
- --enable-epoolloop use wxEpollDispatcher class (Linux only)
+ --enable-epollloop use wxEpollDispatcher class (Linux only)
--enable-selectloop use wxSelectDispatcher class
--enable-apple_ieee use the Apple IEEE codec
--enable-arcstream use wxArchive streams
--enable-protocol-ftp FTP support in wxProtocol
--enable-protocol-file FILE support in wxProtocol
--enable-threads use threads
+ --enable-iniconf use wxIniConfig (Win32 only)
+ --enable-regkey use wxRegKey class (Win32 only)
--enable-docview use document view architecture
--enable-help use help subsystem
--enable-mshtmlhelp use MS HTML Help (win32)
--enable-detect_sm use code to detect X11 session manager
--enable-editablebox use wxEditableListBox class
--enable-filepicker use wxFilePickerCtrl class
+ --enable-filectrl use wxFileCtrl class
--enable-fontpicker use wxFontPickerCtrl class
--enable-gauge use wxGauge class
--enable-grid use wxGrid class
--enable-xpm use xpm images (XPM file format)
--enable-icocur use Windows ICO and CUR formats
--enable-dccache cache temporary wxDC objects (Win32 only)
+ --enable-ps-in-msw use PS printing in wxMSW (Win32 only)
+ --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only)
--enable-uxtheme enable support for Windows XP themed look (Win32 only)
- --enable-wxdib compile wxDIB class (Win32 only)
+ --enable-wxdib use wxDIB class (Win32 only)
--disable-largefile omit support for large files
--disable-gtktest do not try to compile and run a test GTK+ program
--disable-gtktest Do not try to compile and run a test GTK program
--with-libtiff use libtiff (TIFF file format)
--with-libxpm use libxpm (XPM file format)
--with-libmspack use libmspack (CHM help files loading)
+ --without-gtkprint don't use GTK printing support
--without-gnomeprint don't use GNOME printing libraries
--with-gnomevfs use GNOME VFS for associating MIME types
--with-hildon use Hildon framework for Nokia 770
--with-sdl use SDL for audio on Unix
--with-regex enable support for wxRegEx class
--with-zlib use zlib for LZW compression
- --with-odbc use the IODBC and wxODBC classes
--with-expat enable XML support using expat parser
+ --with-macosx-sdk=PATH use an OS X SDK at PATH
+ --with-macosx-version-min=VER build binaries which require at least this OS X version
--with-gtk-prefix=PFX Prefix where GTK is installed (optional)
--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
--with-x use the X Window System
C compiler flags for PANGOXFT, overriding pkg-config
PANGOXFT_LIBS
linker flags for PANGOXFT, overriding pkg-config
+ GTKPRINT_CFLAGS
+ C compiler flags for GTKPRINT, overriding pkg-config
+ GTKPRINT_LIBS
+ linker flags for GTKPRINT, overriding pkg-config
LIBGNOMEPRINTUI_CFLAGS
C compiler flags for LIBGNOMEPRINTUI, overriding pkg-config
LIBGNOMEPRINTUI_LIBS
DEFAULT_wxUSE_LIBHILDON=no
DEFAULT_wxUSE_LIBMSPACK=no
DEFAULT_wxUSE_LIBSDL=no
-DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ACCESSIBILITY=no
DEFAULT_wxUSE_UNICODE_UTF8=auto
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
+DEFAULT_wxUSE_UNIVERSAL_BINARY=no
+
DEFAULT_wxUSE_OFFICIAL_BUILD=no
DEFAULT_wxUSE_GTK2=yes
DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
-for toolkit in `echo $ALL_TOOLKITS`; do
+for toolkit in $ALL_TOOLKITS; do
LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
if test "x$LINE" != "x" ; then
has_toolkit_in_cache=1
LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
eval "$wx_cv_use_subdirs"
- if test "x$cache" != xyes; then
+ if test "x$cache" = xyes; then
echo "wxWITH_SUBDIRS=$wxWITH_SUBDIRS" >> ${wx_arg_cache_file}.tmp
fi
LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
eval "$wx_cv_use_libmspack"
- if test "x$cache" != xyes; then
+ if test "x$cache" = xyes; then
echo "wxUSE_LIBMSPACK=$wxUSE_LIBMSPACK" >> ${wx_arg_cache_file}.tmp
fi
echo "${ECHO_T}$result" >&6; }
+ withstring=without
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$withstring" = xwithout; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+ { echo "$as_me:$LINENO: checking for --${withstring:-with}-gtkprint" >&5
+echo $ECHO_N "checking for --${withstring:-with}-gtkprint... $ECHO_C" >&6; }
+
+# Check whether --with-gtkprint was given.
+if test "${with_gtkprint+set}" = set; then
+ withval=$with_gtkprint;
+ if test "$withval" = yes; then
+ wx_cv_use_gtkprint='wxUSE_GTKPRINT=yes'
+ else
+ wx_cv_use_gtkprint='wxUSE_GTKPRINT=no'
+ fi
+ cache=yes
+
+else
+
+ LINE=`grep "^wxUSE_GTKPRINT=" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
+ fi
+
+ wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_gtkprint"
+ if test "x$cache" = xyes; then
+ echo "wxUSE_GTKPRINT=$wxUSE_GTKPRINT" >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test x"$withstring" = xwithout; then
+ if test $wxUSE_GTKPRINT = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_GTKPRINT
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
withstring=without
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
eval "$wx_cv_use_gnomeprint"
- if test "x$cache" != xyes; then
+ if test "x$cache" = xyes; then
echo "wxUSE_LIBGNOMEPRINT=$wxUSE_LIBGNOMEPRINT" >> ${wx_arg_cache_file}.tmp
fi
LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
eval "$wx_cv_use_gnomevfs"
- if test "x$cache" != xyes; then
+ if test "x$cache" = xyes; then
echo "wxUSE_LIBGNOMEVFS=$wxUSE_LIBGNOMEVFS" >> ${wx_arg_cache_file}.tmp
fi
LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
eval "$wx_cv_use_hildon"
- if test "x$cache" != xyes; then
+ if test "x$cache" = xyes; then
echo "wxUSE_LIBHILDON=$wxUSE_LIBHILDON" >> ${wx_arg_cache_file}.tmp
fi
LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
eval "$wx_cv_use_opengl"
- if test "x$cache" != xyes; then
+ if test "x$cache" = xyes; then
echo "wxUSE_OPENGL=$wxUSE_OPENGL" >> ${wx_arg_cache_file}.tmp
fi
LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
eval "$wx_cv_use_dmalloc"
- if test "x$cache" != xyes; then
+ if test "x$cache" = xyes; then
echo "wxUSE_DMALLOC=$wxUSE_DMALLOC" >> ${wx_arg_cache_file}.tmp
fi
LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
eval "$wx_cv_use_sdl"
- if test "x$cache" != xyes; then
+ if test "x$cache" = xyes; then
echo "wxUSE_LIBSDL=$wxUSE_LIBSDL" >> ${wx_arg_cache_file}.tmp
fi
LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
fi
- { echo "$as_me:$LINENO: checking for --with-odbc" >&5
-echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6; }
-
-# Check whether --with-odbc was given.
-if test "${with_odbc+set}" = set; then
- withval=$with_odbc;
- if test "$withval" = yes; then
- wx_cv_use_odbc='wxUSE_ODBC=yes'
- elif test "$withval" = no; then
- wx_cv_use_odbc='wxUSE_ODBC=no'
- elif test "$withval" = sys; then
- wx_cv_use_odbc='wxUSE_ODBC=sys'
- elif test "$withval" = builtin; then
- wx_cv_use_odbc='wxUSE_ODBC=builtin'
- else
- { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
-echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
- { (exit 1); exit 1; }; }
- fi
- cache=yes
-
-else
-
- LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- fi
-
- wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
-
-fi
-
-
- eval "$wx_cv_use_odbc"
- if test "x$cache" = xyes; then
- echo "wxUSE_ODBC=$wxUSE_ODBC" >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_ODBC" = yes; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- elif test "$wxUSE_ODBC" = no; then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- elif test "$wxUSE_ODBC" = sys; then
- { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
- elif test "$wxUSE_ODBC" = builtin; then
- { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
- else
- { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
-echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
{ echo "$as_me:$LINENO: checking for --with-expat" >&5
echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6; }
LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
fi
+{ echo "$as_me:$LINENO: checking for --with-macosx-sdk" >&5
+echo $ECHO_N "checking for --with-macosx-sdk... $ECHO_C" >&6; }
+
+# Check whether --with-macosx-sdk was given.
+if test "${with_macosx_sdk+set}" = set; then
+ withval=$with_macosx_sdk;
+ 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
+
+else
+
+ # 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
+
+fi
+
+{ echo "$as_me:$LINENO: result: $wxUSE_MACOSX_SDK" >&5
+echo "${ECHO_T}$wxUSE_MACOSX_SDK" >&6; }
+
+{ echo "$as_me:$LINENO: checking for --with-macosx-version-min" >&5
+echo $ECHO_N "checking for --with-macosx-version-min... $ECHO_C" >&6; }
+
+# Check whether --with-macosx-version-min was given.
+if test "${with_macosx_version_min+set}" = set; then
+ withval=$with_macosx_version_min;
+ 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
+
+else
+
+ # 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
+
+fi
+
+{ echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5
+echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
+
enablestring=disable
LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
-if test "$USE_OS2" = "1"; then
+if test "$USE_OS2" = 1; then
DEFAULT_wxUSE_OMF=no
enablestring=
LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epoolloop" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-epoolloop... $ECHO_C" >&6; }
- # Check whether --enable-epoolloop was given.
-if test "${enable_epoolloop+set}" = set; then
- enableval=$enable_epoolloop;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epollloop" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-epollloop... $ECHO_C" >&6; }
+ # Check whether --enable-epollloop was given.
+if test "${enable_epollloop+set}" = set; then
+ enableval=$enable_epollloop;
if test "$enableval" = yes; then
- wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=yes'
+ wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=yes'
else
- wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=no'
+ wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no'
fi
cache=yes
LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
- wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
+ wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
fi
- eval "$wx_cv_use_epoolloop"
+ eval "$wx_cv_use_epollloop"
if test "x$cache" = xyes; then
echo "wxUSE_EPOLL_DISPATCHER=$wxUSE_EPOLL_DISPATCHER" >> ${wx_arg_cache_file}.tmp
fi
LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}"
LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$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}-iniconf" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-iniconf... $ECHO_C" >&6; }
+ # Check whether --enable-iniconf was given.
+if test "${enable_iniconf+set}" = set; then
+ enableval=$enable_iniconf;
+ if test "$enableval" = yes; then
+ wx_cv_use_iniconf='wxUSE_INICONF=yes'
+ else
+ wx_cv_use_iniconf='wxUSE_INICONF=no'
+ fi
+ cache=yes
+
+else
+
+ LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
+ fi
+
+ wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_iniconf"
+ if test "x$cache" = xyes; then
+ echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_INICONF = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_INICONF
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+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}-regkey" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-regkey... $ECHO_C" >&6; }
+ # Check whether --enable-regkey was given.
+if test "${enable_regkey+set}" = set; then
+ enableval=$enable_regkey;
+ if test "$enableval" = yes; then
+ wx_cv_use_regkey='wxUSE_REGKEY=yes'
+ else
+ wx_cv_use_regkey='wxUSE_REGKEY=no'
+ fi
+ cache=yes
+
+else
+
+ LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
+ fi
+
+ wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_regkey"
+ if test "x$cache" = xyes; then
+ echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_REGKEY = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_REGKEY
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
if test "$wxUSE_GUI" = "yes"; then
LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
DEFAULT_wxUSE_DISPLAY=yes
DEFAULT_wxUSE_DETECT_SM=yes
DEFAULT_wxUSE_DIRPICKERCTRL=yes
+ DEFAULT_wxUSE_FILECTRL=yes
DEFAULT_wxUSE_FILEPICKERCTRL=yes
DEFAULT_wxUSE_FONTPICKERCTRL=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_DISPLAY=no
DEFAULT_wxUSE_DETECT_SM=no
DEFAULT_wxUSE_DIRPICKERCTRL=no
+ DEFAULT_wxUSE_FILECTRL=no
DEFAULT_wxUSE_FILEPICKERCTRL=no
DEFAULT_wxUSE_FONTPICKERCTRL=no
DEFAULT_wxUSE_GAUGE=no
LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
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}-filectrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filectrl... $ECHO_C" >&6; }
+ # Check whether --enable-filectrl was given.
+if test "${enable_filectrl+set}" = set; then
+ enableval=$enable_filectrl;
+ if test "$enableval" = yes; then
+ wx_cv_use_filectrl='wxUSE_FILECTRL=yes'
+ else
+ wx_cv_use_filectrl='wxUSE_FILECTRL=no'
+ fi
+ cache=yes
+
+else
+
+ LINE=`grep "^wxUSE_FILECTRL=" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
+ fi
+
+ wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_filectrl"
+ if test "x$cache" = xyes; then
+ echo "wxUSE_FILECTRL=$wxUSE_FILECTRL" >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_FILECTRL = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_FILECTRL
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
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}-ps-in-msw" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ps-in-msw... $ECHO_C" >&6; }
+ # Check whether --enable-ps-in-msw was given.
+if test "${enable_ps_in_msw+set}" = set; then
+ enableval=$enable_ps_in_msw;
+ if test "$enableval" = yes; then
+ wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes'
+ else
+ wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no'
+ fi
+ cache=yes
+
+else
+
+ LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
+ fi
+
+ wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_ps_in_msw"
+ if test "x$cache" = xyes; then
+ echo "wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+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}-ownerdrawn" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ownerdrawn... $ECHO_C" >&6; }
+ # Check whether --enable-ownerdrawn was given.
+if test "${enable_ownerdrawn+set}" = set; then
+ enableval=$enable_ownerdrawn;
+ if test "$enableval" = yes; then
+ wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes'
+ else
+ wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no'
+ fi
+ cache=yes
+
+else
+
+ LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
+ fi
+
+ wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_ownerdrawn"
+ if test "x$cache" = xyes; then
+ echo "wxUSE_OWNER_DRAWN=$wxUSE_OWNER_DRAWN" >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_OWNER_DRAWN = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_OWNER_DRAWN
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
+ eval "DEFAULT_$LINE"
+ cache=yes
+ else
+ cache=no
fi
wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}"
fi
if test "$TOOLKIT_GIVEN" = 1; then
- 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
fi
done
else
- for toolkit in `echo $ALL_TOOLKITS`; do
+ for toolkit in $ALL_TOOLKITS; do
if test "$has_toolkit_in_cache" != 1; then
var=DEFAULT_DEFAULT_wxUSE_$toolkit
else
wxGTK_VERSION=1
fi
- for toolkit in `echo $ALL_TOOLKITS`; do
+ for toolkit in $ALL_TOOLKITS; do
var=wxUSE_$toolkit
eval "value=\$${var}"
if test "x$value" != x; then
fi
fi
if test "$value" = 1; then
- toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"`
+ toolkit_echo=`echo $toolkit | tr A-Z a-z`
{ echo "$as_me:$LINENO: result: $toolkit_echo" >&5
echo "${ECHO_T}$toolkit_echo" >&6; }
fi
{ (exit 1); exit 1; }; }
fi
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- RANLIB=$ac_ct_RANLIB
- fi
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
if test "x$SUNCXX" != xyes; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
fi
fi
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- done
- done
- ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-case ${INSTALL} in
- /* ) # Absolute
- ;;
- ?:* ) # Drive letter, considered as absolute.
- ;;
- *)
- INSTALL=`pwd`/${INSTALL} ;;
-esac
-
-
-case "${host}" in
-
- *-*-darwin* )
- INSTALL_PROGRAM="cp -fp"
- INSTALL_DATA="cp -fp"
- ;;
- *)
- ;;
-esac
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+retest_macosx_linking=no
+#if test "$wxUSE_MAC" = 1; then
+ if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
+ if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
+ # Implicitly turn on the new --with-macosx-sdk using the default
+ # SDK which provides the behavior this option has always had.
+ if test "x$wxUSE_MACOSX_SDK" = "x"; then
+ { echo "$as_me:$LINENO: WARNING: Enabling default SDK due to --enable-universal_binary." >&5
+echo "$as_me: WARNING: Enabling default SDK due to --enable-universal_binary." >&2;}
+ { echo "$as_me:$LINENO: WARNING: If you don't want this, specify --without-macosx-sdk" >&5
+echo "$as_me: WARNING: If you don't want this, specify --without-macosx-sdk" >&2;}
+ wxUSE_MACOSX_SDK=yes
+ fi
+ else
+ # Complain to user if he specified an argument to --enable-universal_binary
+ # and also 1) specified --with-macosx-sdk using the default (yes) or
+ # 2) specified --with-macosx-sdk using a path or 3) specified
+ # --without-macosx-sdk (no).
+ if test "x$wxUSE_MACOSX_SDK" != "x" ; then
+ { { echo "$as_me:$LINENO: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary
+See \`config.log' for more details." >&5
+echo "$as_me: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ # Put the SDK path into the wxUSE_MACOSX_SDK. We don't have to
+ # special-case the empty string because the below test simply
+ # converts "no" to the empty string anyway.
+ wxUSE_MACOSX_SDK="$wxUSE_UNIVERSAL_BINARY"
+ { echo "$as_me:$LINENO: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&5
+echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;}
+ fi
+ fi
+ OSX_UNIV_OPTS="-arch ppc -arch i386"
+ CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
+ CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
+ LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
+ retest_macosx_linking=yes
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
+ { echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5
+echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;}
+ bk_use_pch=no
+ fi
+#fi
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+if test "x$wxUSE_MACOSX_SDK" = "xno"; then
+ wxUSE_MACOSX_SDK=
+elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then
+ # TODO: Search for most recent SDK and use it.
+ wxUSE_MACOSX_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
fi
- if test "x$ac_ct_STRIP" = x; then
- STRIP="true"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- STRIP=$ac_ct_STRIP
- fi
-else
- STRIP="$ac_cv_prog_STRIP"
-fi
+if test "x$wxUSE_MACOSX_SDK" != "x"; then
+ { echo "$as_me:$LINENO: checking for SDK directory $wxUSE_MACOSX_SDK" >&5
+echo $ECHO_N "checking for SDK directory $wxUSE_MACOSX_SDK... $ECHO_C" >&6; }
+ if ! test -d "$wxUSE_MACOSX_SDK"; then
+ { { echo "$as_me:$LINENO: error: not found
+See \`config.log' for more details." >&5
+echo "$as_me: error: not found
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ { 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\""
+ retest_macosx_linking=yes
+ fi
-if test "$wxUSE_WINE" = "yes"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}wrc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wrc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$WINDRES"; then
- ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_WINDRES="${ac_tool_prefix}wrc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
+if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then
+ wxUSE_MACOSX_VERSION_MIN=
+elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then
+ if test "x$wxUSE_MACOSX_SDK" != "x"; then
+ { echo "$as_me:$LINENO: checking SDK deployment version" >&5
+echo $ECHO_N "checking SDK deployment version... $ECHO_C" >&6; }
-fi
-fi
-WINDRES=$ac_cv_prog_WINDRES
-if test -n "$WINDRES"; then
- { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+ MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
+ # If that failed, try again with the new key
+ if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
-fi
-if test -z "$ac_cv_prog_WINDRES"; then
- ac_ct_WINDRES=$WINDRES
- # Extract the first word of "wrc", so it can be a program name with args.
-set dummy wrc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_WINDRES"; then
- ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_WINDRES="wrc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
+ MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
-fi
-fi
-ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
-if test -n "$ac_ct_WINDRES"; then
- { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+ fi
- if test "x$ac_ct_WINDRES" = x; then
- WINDRES=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- WINDRES=$ac_ct_WINDRES
- fi
-else
- WINDRES="$ac_cv_prog_WINDRES"
+ if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then
+ wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN
+ { echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5
+echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
+ else
+ { echo "$as_me:$LINENO: WARNING: Could not determine deployment target from SDKSettings.plist" >&5
+echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.plist" >&2;}
+ wxUSE_MACOSX_VERSION_MIN=
+ fi
+ else
+ wxUSE_MACOSX_VERSION_MIN=
+ fi
fi
- RESCOMP="$WINDRES"
-else
- case "${host}" in
- *-*-cygwin* | *-*-mingw32* )
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
-set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$WINDRES"; then
- ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-WINDRES=$ac_cv_prog_WINDRES
-if test -n "$WINDRES"; then
- { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
+ MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN"
+ eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\""
+ eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\""
+ eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\""
+ retest_macosx_linking=yes
fi
+if test "x$retest_macosx_linking" = "xyes"; 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
-fi
-if test -z "$ac_cv_prog_WINDRES"; then
- ac_ct_WINDRES=$WINDRES
- # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_WINDRES"; then
- ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_WINDRES="windres"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
+ { echo "$as_me:$LINENO: checking if C compiler works with SDK/version options" >&5
+echo $ECHO_N "checking if C compiler works with SDK/version options... $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. */
-fi
-fi
-ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
-if test -n "$ac_ct_WINDRES"; then
- { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+int
+main ()
+{
- if test "x$ac_ct_WINDRES" = x; then
- WINDRES=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
- WINDRES=$ac_ct_WINDRES
- fi
-else
- WINDRES="$ac_cv_prog_WINDRES"
-fi
-
- RESCOMP="$WINDRES"
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_DLLTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$DLLTOOL"; then
- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 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); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
- { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { { echo "$as_me:$LINENO: error: no. Try a different SDK
+See \`config.log' for more details." >&5
+echo "$as_me: error: no. Try a different SDK
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; exit 1
fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext 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 -z "$ac_cv_prog_DLLTOOL"; then
- ac_ct_DLLTOOL=$DLLTOOL
- # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_DLLTOOL"; then
- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
- { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- if test "x$ac_ct_DLLTOOL" = x; then
- DLLTOOL=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- DLLTOOL=$ac_ct_DLLTOOL
- fi
-else
- DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
+ { echo "$as_me:$LINENO: checking if C++ compiler works with SDK/version options" >&5
+echo $ECHO_N "checking if C++ compiler works with SDK/version options... $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. */
- ;;
- esac
-fi
+int
+main ()
+{
-{ echo "$as_me:$LINENO: checking if make is GNU make" >&5
-echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6; }
-if test "${wx_cv_prog_makeisgnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 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); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
- $EGREP -s GNU > /dev/null); then
- wx_cv_prog_makeisgnu="yes"
- else
- wx_cv_prog_makeisgnu="no"
- fi
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_prog_makeisgnu" >&5
-echo "${ECHO_T}$wx_cv_prog_makeisgnu" >&6; }
-
-if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
- IF_GNU_MAKE=""
-else
- IF_GNU_MAKE="#"
+ { { echo "$as_me:$LINENO: error: no. Try a different SDK
+See \`config.log' for more details." >&5
+echo "$as_me: error: no. Try a different SDK
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; exit 1
fi
-
-
-if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
-{ echo "$as_me:$LINENO: checking if make supports VPATH" >&5
-echo $ECHO_N "checking if make supports VPATH... $ECHO_C" >&6; }
-if test "${wx_cv_prog_makevpath+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-cat - << EOF > confMake
-check : file
- cp \$? \$@
- cp \$? final_file
-EOF
-
-if test ! -d sub ; then
- mkdir sub
-fi
-echo dummy > sub/file
-${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null
-RESULT=$?
-rm -f sub/file check final_file confMake
-rmdir sub
-if test "$RESULT" = 0; then
- wx_cv_prog_makevpath="yes"
-else
- wx_cv_prog_makevpath="no"
-fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext 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
-{ echo "$as_me:$LINENO: result: $wx_cv_prog_makevpath" >&5
-echo "${ECHO_T}$wx_cv_prog_makevpath" >&6; }
-if test "x$wx_cv_prog_makevpath" != "xyes"; then
-{ { echo "$as_me:$LINENO: error:
-You need a make-utility that is able to use the variable
-VPATH correctly.
-If your version of make does not support VPATH correctly,
-please install GNU-make (possibly as gmake), and start
-configure with the following command:
-export MAKE=gmake; ./configure for sh-type shells
-setenv MAKE gmake; ./configure for csh-type shells
-Also please do remember to use gmake in this case every time
-you are trying to compile.
-" >&5
-echo "$as_me: error:
-You need a make-utility that is able to use the variable
-VPATH correctly.
-If your version of make does not support VPATH correctly,
-please install GNU-make (possibly as gmake), and start
-configure with the following command:
-export MAKE=gmake; ./configure for sh-type shells
-setenv MAKE gmake; ./configure for csh-type shells
-Also please do remember to use gmake in this case every time
-you are trying to compile.
-" >&2;}
- { (exit 1); exit 1; }; }
-fi fi
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
-fi
+case "${host}" in
+ *-*-darwin* )
+ INSTALL_PROGRAM="cp -fp"
+ INSTALL_DATA="cp -fp"
+ ;;
+ *)
+ ;;
+esac
if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
-
-
-
-
-for ac_header in stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h
+for ac_header in langinfo.h wchar.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
_ACEOF
- if test "$ac_cv_sizeof_long_long" != "0"; then
+ if test "$ac_cv_sizeof_long_long" != 0; then
CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS"
fi
;;
_ACEOF
-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
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_class_stdhashmapset=yes
+ wx_cv_class_stdhashmapset=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_class_stdhashmapset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
+echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
+fi
+
+
+
+ if test "$wx_cv_class_stdhashmapset" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_HASH_MAP 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_HASH_MAP 1
+_ACEOF
+
+ fi
+
+ { echo "$as_me:$LINENO: checking for ext/hash_map" >&5
+echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
+if test "${ac_cv_header_ext_hash_map+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+
+#include <ext/hash_map>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_ext_hash_map=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_ext_hash_map=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
+echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; }
+if test $ac_cv_header_ext_hash_map = yes; then
+ { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
+echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; }
+if test "${wx_cv_class_gnuhashmapset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ext/hash_map>
+ #include <ext/hash_set>
+int
+main ()
+{
+__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
+ __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ wx_cv_class_gnuhashmapset=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_class_gnuhashmapset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
+echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
+fi
+
+
+
+ if test "$wx_cv_class_gnuhashmapset" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_EXT_HASH_MAP 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GNU_CXX_HASH_MAP 1
+_ACEOF
+
+ fi
+fi
+
+
+
+ if test -n "$GCC"; then
+ { echo "$as_me:$LINENO: checking for __sync_fetch_* builtins" >&5
+echo $ECHO_N "checking for __sync_fetch_* builtins... $ECHO_C" >&6; }
+ if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ int value=0;
+ __sync_fetch_and_add(&value, 1);
+ __sync_sub_and_fetch(&value, 1);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ wx_cv_cc_gcc_atomic_builtins=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- wx_cv_class_stdhashmapset=no
+ wx_cv_cc_gcc_atomic_builtins=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
-fi
-
-
- if test "$wx_cv_class_stdhashmapset" = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_HASH_MAP 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_HASH_MAP 1
+ { echo "$as_me:$LINENO: result: $wx_cv_cc_gcc_atomic_builtins" >&5
+echo "${ECHO_T}$wx_cv_cc_gcc_atomic_builtins" >&6; }
+ if test $wx_cv_cc_gcc_atomic_builtins = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GCC_ATOMIC_BUILTINS 1
_ACEOF
fi
+ fi
- { echo "$as_me:$LINENO: checking for ext/hash_map" >&5
-echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
-if test "${ac_cv_header_ext_hash_map+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-
-#include <ext/hash_map>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_ext_hash_map=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_header_ext_hash_map=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
-echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; }
-if test $ac_cv_header_ext_hash_map = yes; then
- { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
-echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; }
-if test "${wx_cv_class_gnuhashmapset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ext/hash_map>
- #include <ext/hash_set>
-int
-main ()
-{
-__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
- __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- wx_cv_class_gnuhashmapset=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- wx_cv_class_gnuhashmapset=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
-fi
-
-
-
- if test "$wx_cv_class_gnuhashmapset" = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXT_HASH_MAP 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNU_CXX_HASH_MAP 1
-_ACEOF
-
- fi
-fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
if eval test \$wx_cv_func_$wx_func = yes
then
cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
_ACEOF
if eval test \$wx_cv_func_$wx_func = yes
then
cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
_ACEOF
fi
fi
fi
-
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
fi
wxUSE_LIBTIFF=sys
fi
fi
+ if test "$wxUSE_LIBTIFF" = "builtin" ; then
+ if test "$wxUSE_LIBJPEG" = "no"; then
+ ac_configure_args="$ac_configure_args --disable-jpeg"
+ fi
+ subdirs="$subdirs src/tiff"
+
+ fi
fi
LIBS="$LIBS -lkernel32 -luser32"
esac
- if test "$wxUSE_ODBC" = "sys" ; then
- wxUSE_ODBC = "yes"
- fi
- if test "$wxUSE_ODBC" = "yes" ; then
- LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
-_ACEOF
-
- fi
-
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
WXGTK12=
WXGTK127=
- WXGTK20=
+ WXGTK2=
WXGPE=
if test "$wxUSE_COCOA" = 1 ; then
no_gtk=yes
fi
- min_gtk_version=2.0.0
+ min_gtk_version=2.4.0
{ echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; }
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"
cat >>confdefs.h <<\_ACEOF
#define __WXGTK26__ 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
_ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
cat >>confdefs.h <<\_ACEOF
#define __WXGTK26__ 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
_ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
- if test "$ac_wxgtk26" = 0; then
- { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.4" >&5
-echo $ECHO_N "checking if GTK+ is version >= 2.4... $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 <gtk/gtk.h>
-
-int
-main ()
-{
-
- #if !GTK_CHECK_VERSION(2,4,0)
- Not GTK+ 2.4
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-
- cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
-_ACEOF
-
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
fi
if test "$wxUSE_MOTIF" = 1; then
- if test "$wxUSE_UNICODE" = "yes"; then
- { { echo "$as_me:$LINENO: error: Unicode configuration not supported with Motif" >&5
-echo "$as_me: error: Unicode configuration not supported with Motif" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
{ echo "$as_me:$LINENO: checking for Motif/Lesstif headers" >&5
echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6; }
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
{ echo "$as_me:$LINENO: result: can't find the right libraries" >&5
echo "${ECHO_T}can't find the right libraries" >&6; }
{ { echo "$as_me:$LINENO: error: can't link a simple motif program" >&5
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
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then
- if test "$TOOLKIT" = "DFB" ; then
- wxUSE_UNICODE_UTF8=yes
- elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "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
wxUSE_UNICODE_UTF8=yes
else
wxUSE_UNICODE_UTF8=no
done
-for ac_header in X11/XKBlib.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #if HAVE_X11_XLIB_H
- #include <X11/Xlib.h>
- #endif
-
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
- fi
-fi
-
-
-
-IODBC_C_SRC=""
-
-
-if test "$TOOLKIT" != "MSW" ; then
-
- if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
-
- { echo "$as_me:$LINENO: checking for sql.h" >&5
-echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sql_h+set}" = set; then
+for ac_header in X11/XKBlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+ #if HAVE_X11_XLIB_H
+ #include <X11/Xlib.h>
+ #endif
-#include <sql.h>
+
+#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_header_sql_h=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_header_sql_h=no
+ eval "$as_ac_Header=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5
-echo "${ECHO_T}$ac_cv_header_sql_h" >&6; }
-if test $ac_cv_header_sql_h = yes; then
- found_sql_h=1
-fi
-
-
- if test "x$found_sql_h" = "x1" ; then
- { echo "$as_me:$LINENO: checking for SQLAllocEnv in -liodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -liodbc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_iodbc_SQLAllocEnv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-liodbc $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SQLAllocEnv ();
-int
-main ()
-{
-return SQLAllocEnv ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_iodbc_SQLAllocEnv=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_iodbc_SQLAllocEnv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_iodbc_SQLAllocEnv" >&6; }
-if test $ac_cv_lib_iodbc_SQLAllocEnv = yes; then
- ODBC_LINK=" -liodbc"
-else
-
- { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lunixodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -lunixodbc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_unixodbc_SQLAllocEnv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lunixodbc $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SQLAllocEnv ();
-int
-main ()
-{
-return SQLAllocEnv ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_unixodbc_SQLAllocEnv=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_unixodbc_SQLAllocEnv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_unixodbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_unixodbc_SQLAllocEnv" >&6; }
-if test $ac_cv_lib_unixodbc_SQLAllocEnv = yes; then
- ODBC_LINK=" -lunixodbc"
-else
-
- { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -lodbc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_odbc_SQLAllocEnv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lodbc $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SQLAllocEnv ();
-int
-main ()
-{
-return SQLAllocEnv ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_odbc_SQLAllocEnv=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_odbc_SQLAllocEnv=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_odbc_SQLAllocEnv" >&6; }
-if test $ac_cv_lib_odbc_SQLAllocEnv = yes; then
- ODBC_LINK=" -lodbc"
-fi
-
-
-fi
-
-
-fi
-
- fi
- if test "x$ODBC_LINK" = "x" ; then
- if test "$wxUSE_ODBC" = "sys" ; then
- { { echo "$as_me:$LINENO: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&5
-echo "$as_me: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&2;}
- { (exit 1); exit 1; }; }
- else
- { echo "$as_me:$LINENO: WARNING: system ODBC library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system ODBC library not found, will use built-in instead" >&2;}
- wxUSE_ODBC=builtin
- fi
- else
- wxUSE_ODBC=sys
- fi
- fi
-
- if test "$wxUSE_ODBC" = "builtin" ; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_BUILTIN_IODBC 1
-_ACEOF
+done
fi
fi
-if test "$wxUSE_ODBC" != "no" ; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
-_ACEOF
-
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-
- WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_IODBC_"
-fi
if test "$wxUSE_DISPLAY" = "yes"; then
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
{ echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
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"
echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; }
if test $ac_cv_header_GL_gl_h = yes; then
- if test "${ac_cv_header_GL_glu_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for GL/glu.h" >&5
+ { echo "$as_me:$LINENO: checking for GL/glu.h" >&5
echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6; }
if test "${ac_cv_header_GL_glu_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5
-echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; }
else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking GL/glu.h usability" >&5
-echo $ECHO_N "checking GL/glu.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
+
+
#include <GL/glu.h>
_ACEOF
rm -f conftest.$ac_objext
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ ac_cv_header_GL_glu_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
+ ac_cv_header_GL_glu_h=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking GL/glu.h presence" >&5
-echo $ECHO_N "checking GL/glu.h presence... $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 <GL/glu.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: GL/glu.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: GL/glu.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: GL/glu.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: GL/glu.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: GL/glu.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: GL/glu.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: GL/glu.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: GL/glu.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: GL/glu.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwidgets.org ##
-## ----------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for GL/glu.h" >&5
-echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_GL_glu_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_GL_glu_h=$ac_header_preproc
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5
echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; }
-
-fi
if test $ac_cv_header_GL_glu_h = yes; then
found_gl=0
error this gcc is too old;
#endif
+ /* visibility only makes sense for ELF shared libs: */
+ #if !defined(__ELF__) && !defined(__APPLE__)
+ error this platform has no visibility;
+ #endif
+
extern __attribute__((__visibility__("hidden"))) int hiddenvar;
extern __attribute__((__visibility__("default"))) int exportedvar;
extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
{ echo "$as_me:$LINENO: result: $wx_cv_cc_visibility" >&5
echo "${ECHO_T}$wx_cv_cc_visibility" >&6; }
+ if test $wx_cv_cc_visibility = yes; then
+ { echo "$as_me:$LINENO: checking for broken libstdc++ visibility" >&5
+echo $ECHO_N "checking for broken libstdc++ visibility... $ECHO_C" >&6; }
+ if test "${wx_cv_cc_broken_libstdcxx_visibility+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ wx_save_CXXFLAGS="$CXXFLAGS"
+ wx_save_LDFLAGS="$LDFLAGS"
+ CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+ LDFLAGS="$LDFLAGS -shared -fPIC"
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+ #include <string>
+
+int
+main ()
+{
+
+ std::string s("hello");
+ return s.length();
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 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); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ wx_cv_cc_broken_libstdcxx_visibility=no
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_cc_broken_libstdcxx_visibility=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext 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
+
+ CXXFLAGS="$wx_save_CXXFLAGS"
+ LDFLAGS="$wx_save_LDFLAGS"
+fi
+
+ { echo "$as_me:$LINENO: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5
+echo "${ECHO_T}$wx_cv_cc_broken_libstdcxx_visibility" >&6; }
+
+ if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
+ { echo "$as_me:$LINENO: checking whether we can work around it" >&5
+echo $ECHO_N "checking whether we can work around it... $ECHO_C" >&6; }
+ if test "${wx_cv_cc_visibility_workaround+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+ #pragma GCC visibility push(default)
+ #include <string>
+ #pragma GCC visibility pop
+
+int
+main ()
+{
+
+ std::string s("hello");
+ return s.length();
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 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); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ wx_cv_cc_visibility_workaround=no
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_cc_visibility_workaround=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext 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
+
+ { echo "$as_me:$LINENO: result: $wx_cv_cc_visibility_workaround" >&5
+echo "${ECHO_T}$wx_cv_cc_visibility_workaround" >&6; }
+
+ if test $wx_cv_cc_visibility_workaround = no; then
+ wx_cv_cc_visibility=no
+ fi
+ fi
+ fi
+
if test $wx_cv_cc_visibility = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_VISIBILITY 1
_ACEOF
+ if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1
+_ACEOF
+
+ fi
else
CFLAGS_VISIBILITY=""
CXXFLAGS_VISIBILITY=""
;;
*-*-cygwin* | *-*-mingw32* )
- WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
;;
*-*-hpux* )
esac
fi
+ WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
+
if test $wxUSE_RPATH = "no"; then
SAMPLES_RPATH_FLAG=''
SAMPLES_RPATH_POSTLINK=''
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_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"
-
- LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
-
- # Extract the first word of "Rez", so it can be a program name with args.
-set dummy Rez; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_REZ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$REZ"; then
- ac_cv_prog_REZ="$REZ" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_REZ="Rez"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
-fi
-fi
-REZ=$ac_cv_prog_REZ
-if test -n "$REZ"; then
- { echo "$as_me:$LINENO: result: $REZ" >&5
-echo "${ECHO_T}$REZ" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
fi
- # Extract the first word of "DeRez", so it can be a program name with args.
-set dummy DeRez; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_DEREZ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$DEREZ"; then
- ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DEREZ="DeRez"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
-fi
-fi
-DEREZ=$ac_cv_prog_DEREZ
-if test -n "$DEREZ"; then
- { echo "$as_me:$LINENO: result: $DEREZ" >&5
-echo "${ECHO_T}$DEREZ" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- # Extract the first word of "SetFile", so it can be a program name with args.
-set dummy SetFile; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_SETFILE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$SETFILE"; then
- ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_SETFILE="SetFile"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
-fi
-fi
-SETFILE=$ac_cv_prog_SETFILE
-if test -n "$SETFILE"; then
- { echo "$as_me:$LINENO: result: $SETFILE" >&5
-echo "${ECHO_T}$SETFILE" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-
- MACSETFILE="\$(SETFILE)"
-
- if test "$wxUSE_MAC" = 1; then
- POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
- RESCOMP="$REZ"
- WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
- else
- POSTLINK_COMMAND="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
- RESCOMP="echo -n \| $REZ"
- WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
- fi
-
-else
- MACSETFILE="@true"
-
- if test "$wxUSE_PM" = 1; then
- RESCOMP="emxbind"
- WXCONFIG_RESFLAGS="-ep"
-
- POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
- else
- POSTLINK_COMMAND="@true"
- fi
-
-fi
-
-
-
{ echo "$as_me:$LINENO: checking for mode_t" >&5
echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
if test "${ac_cv_type_mode_t+set}" = set; then
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_func_broken_vsnprintf_decl=no
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- wx_cv_func_broken_vsnprintf_decl=yes
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_vsnprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_broken_vsnprintf_decl" >&6; }
-
- if test "$wx_cv_func_broken_vsnprintf_decl" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_VSNPRINTF_DECL 1
-_ACEOF
-
- fi
- fi
-fi
-
-if test "$ac_cv_func_snprintf" = "yes"; then
- { echo "$as_me:$LINENO: checking for snprintf declaration" >&5
-echo $ECHO_N "checking for snprintf declaration... $ECHO_C" >&6; }
-if test "${wx_cv_func_snprintf_decl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #include <stdio.h>
- #include <stdarg.h>
- #ifdef __MSL__
- #if __MSL__ >= 0x6000
- namespace std {}
- using namespace std;
- #endif
- #endif
-
-int
-main ()
-{
-
- char *buf;
- snprintf(buf, 10u, "%s", "wx");
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- wx_cv_func_snprintf_decl=yes
+ wx_cv_func_broken_vsnprintf_decl=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- wx_cv_func_snprintf_decl=no
+ wx_cv_func_broken_vsnprintf_decl=yes
fi
fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_vsnprintf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_broken_vsnprintf_decl" >&6; }
- if test "$wx_cv_func_snprintf_decl" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_SNPRINTF_DECL 1
+ if test "$wx_cv_func_broken_vsnprintf_decl" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_BROKEN_VSNPRINTF_DECL 1
_ACEOF
+ fi
+ fi
+fi
- { echo "$as_me:$LINENO: checking if snprintf declaration is broken" >&5
-echo $ECHO_N "checking if snprintf declaration is broken... $ECHO_C" >&6; }
-if test "${wx_cv_func_broken_snprintf_decl+set}" = set; then
+if test "$ac_cv_func_snprintf" = "yes"; then
+ { echo "$as_me:$LINENO: checking for snprintf declaration" >&5
+echo $ECHO_N "checking for snprintf declaration... $ECHO_C" >&6; }
+if test "${wx_cv_func_snprintf_decl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <stdio.h>
- #include <stdarg.h>
- #ifdef __MSL__
- #if __MSL__ >= 0x6000
- namespace std {}
- using namespace std;
- #endif
- #endif
+ #include <stdio.h>
+ #include <stdarg.h>
+ #ifdef __MSL__
+ #if __MSL__ >= 0x6000
+ namespace std {}
+ using namespace std;
+ #endif
+ #endif
int
main ()
{
- char *buf;
- const char *fmt = "%s";
- snprintf(buf, 10u, fmt, "wx");
+ char *buf;
+ snprintf(buf, 10u, "%s", "wx");
;
return 0;
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_func_broken_snprintf_decl=no
+ wx_cv_func_snprintf_decl=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- wx_cv_func_broken_snprintf_decl=yes
+ wx_cv_func_snprintf_decl=no
fi
fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_snprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_broken_snprintf_decl" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; }
- if test "$wx_cv_func_broken_snprintf_decl" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_SNPRINTF_DECL 1
+ if test "$wx_cv_func_snprintf_decl" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SNPRINTF_DECL 1
_ACEOF
- fi
fi
if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
if test "$wxUSE_UNICODE" = yes; then
-
-for ac_func in swprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
- if test "$ac_cv_func_swprintf" = "yes"; then
- { echo "$as_me:$LINENO: checking if swprintf declaration is broken" >&5
-echo $ECHO_N "checking if swprintf declaration is broken... $ECHO_C" >&6; }
-if test "${wx_cv_func_broken_swprintf_decl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #include <stdio.h>
- #include <stdarg.h>
- #include <wchar.h>
-
-int
-main ()
-{
-
- wchar_t *buf;
- const wchar_t *fmt = L"test";
- swprintf(buf, 10u, fmt);
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- wx_cv_func_broken_swprintf_decl=no
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- wx_cv_func_broken_swprintf_decl=yes
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_swprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_broken_swprintf_decl" >&6; }
-
- if test "$wx_cv_func_broken_swprintf_decl" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_SWPRINTF_DECL 1
-_ACEOF
-
- fi
- fi
-
wchar_headers="#include <stdio.h>
#include <wchar.h>"
case "${host}" in
esac
- for wx_func in wputc wputchar putws fputws wprintf vswprintf
+ for wx_func in putws fputws wprintf vswprintf
do
{ echo "$as_me:$LINENO: checking for $wx_func" >&5
echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
if eval test \$wx_cv_func_$wx_func = yes
then
cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
_ACEOF
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;
fi
-if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
-
- for wx_func in fnmatch
- do
- { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-
- /* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #include <fnmatch.h>
- $ac_includes_default
-
-int
-main ()
-{
-
- #ifndef $wx_func
- &$wx_func;
- #endif
-
-
- ;
- return 0;
-}
-
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval wx_cv_func_$wx_func=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval wx_cv_func_$wx_func=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
- if eval test \$wx_cv_func_$wx_func = yes
- then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
-_ACEOF
-
-
- else
- :
-
- fi
- done
-
-fi
-
if test "$wxUSE_FILE" = "yes"; then
for wx_func in fsync
if eval test \$wx_cv_func_$wx_func = yes
then
cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
_ACEOF
if eval test \$wx_cv_func_$wx_func = yes
then
cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
_ACEOF
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
{ echo "$as_me:$LINENO: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5
echo "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;}
wxUSE_STACKWALKER=no
fi
-for ac_func in timegm
+
+for ac_func in setenv putenv
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-
+ break
fi
done
+if test "$ac_cv_func_setenv" = "yes"; then
-
-
-for ac_func in setenv putenv
+for ac_func in unsetenv
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
- break
+
fi
done
+fi
HAVE_SOME_SLEEP_FUNC=0
if test "$USE_BEOS" = 1; then
if eval test \$wx_cv_func_$wx_func = yes
then
cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
_ACEOF
if eval test \$wx_cv_func_$wx_func = yes
then
cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
_ACEOF
if eval test \$wx_cv_func_$wx_func = yes
then
cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
_ACEOF
if eval test \$wx_cv_func_$wx_func = yes
then
cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
_ACEOF
if eval test \$wx_cv_func_$wx_func = yes
then
cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
_ACEOF
done
+if test "$wxUSE_TARSTREAM" = "yes"; then
+
+ for wx_func in sysconf
+ do
+ { echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
+if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+
+ /* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+ $ac_includes_default
+
+int
+main ()
+{
+
+ #ifndef $wx_func
+ &$wx_func;
+ #endif
+
+
+ ;
+ return 0;
+}
+
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 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); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval wx_cv_func_$wx_func=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval wx_cv_func_$wx_func=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+fi
+ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+ if eval test \$wx_cv_func_$wx_func = yes
+ then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
+_ACEOF
+
+
+ else
+ :
+
+ fi
+ done
+
+
+
+ for wx_func in getpwuid_r
+ do
+ { echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
+if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+
+ /* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+ #define _REENTRANT
+ #include <pwd.h>
+
+ $ac_includes_default
+
+int
+main ()
+{
+
+ #ifndef $wx_func
+ &$wx_func;
+ #endif
+
+ struct passwd pw, *ppw;
+ char buf[1024];
+ getpwuid_r(0, &pw, buf, sizeof(buf), &ppw)
+
+
+ ;
+ return 0;
+}
+
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 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); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval wx_cv_func_$wx_func=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval wx_cv_func_$wx_func=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+fi
+ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+ if eval test \$wx_cv_func_$wx_func = yes
+ then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
+_ACEOF
+
+
+ else
+ :
+
+ fi
+ done
+
+
+
+ for wx_func in getgrgid_r
+ do
+ { echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
+if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+
+ /* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+ #define _REENTRANT
+ #include <grp.h>
+
+ $ac_includes_default
+
+int
+main ()
+{
+
+ #ifndef $wx_func
+ &$wx_func;
+ #endif
+
+ struct group grp, *pgrp;
+ char buf[1024];
+ getgrgid_r(0, &grp, buf, sizeof(buf), &pgrp)
+
+
+ ;
+ return 0;
+}
+
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 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); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval wx_cv_func_$wx_func=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval wx_cv_func_$wx_func=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+fi
+ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+ if eval test \$wx_cv_func_$wx_func = yes
+ then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
+_ACEOF
+
+
+ else
+ :
+
+ fi
+ done
+
+fi
+
fi
fi
-{ echo "$as_me:$LINENO: checking for readdir_r" >&5
-echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6; }
-if test "${ac_cv_func_readdir_r+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define readdir_r to an innocuous variant, in case <limits.h> declares readdir_r.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define readdir_r innocuous_readdir_r
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char readdir_r (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef readdir_r
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char readdir_r ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_readdir_r || defined __stub___readdir_r
-choke me
-#endif
-
-int
-main ()
-{
-return readdir_r ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 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); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_readdir_r=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_readdir_r=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_readdir_r" >&5
-echo "${ECHO_T}$ac_cv_func_readdir_r" >&6; }
-if test $ac_cv_func_readdir_r = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_READDIR_R 1
-_ACEOF
-
-fi
-
fi
fi
-if test "$WXGTK20" = 1 ; then
+if test "$WXGTK2" = 1 ; then
cat >>confdefs.h <<_ACEOF
-#define __WXGTK20__ $WXGTK20
+#define __WXGTK20__ $WXGTK2
_ACEOF
WXGTK12=1
fi
-if test "$USE_UNIX" = "1" ; then
+if test "$USE_UNIX" = 1 ; then
if test "$wxUSE_MGL" != 1; then
{ echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6; }
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
# Check whether --with-sdl-prefix was given.
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
fi
-if test "$WXGTK20" = 1; then
+if test "$WXGTK2" = 1; then
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
fi
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
+
+ if test "$wxUSE_GTKPRINT" = "yes" ; then
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GTKPRINT" >&5
+echo $ECHO_N "checking for GTKPRINT... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GTKPRINT_CFLAGS"; then
+ pkg_cv_GTKPRINT_CFLAGS="$GTKPRINT_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GTKPRINT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GTKPRINT_LIBS"; then
+ pkg_cv_GTKPRINT_LIBS="$GTKPRINT_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GTKPRINT_LIBS=`$PKG_CONFIG --libs "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"`
+ else
+ GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTKPRINT_PKG_ERRORS" >&5
+
+
+ { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5
+echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;}
+ wxUSE_GTKPRINT="no"
+
+
+elif test $pkg_failed = untried; then
+
+ { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5
+echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;}
+ wxUSE_GTKPRINT="no"
+
+
+else
+ GTKPRINT_CFLAGS=$pkg_cv_GTKPRINT_CFLAGS
+ GTKPRINT_LIBS=$pkg_cv_GTKPRINT_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+ CFLAGS="$GTKPRINT_CFLAGS $CFLAGS"
+ CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS"
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_GTKPRINT 1
+_ACEOF
+
+
+fi
+ fi
+
if test "$wxUSE_LIBGNOMEPRINT" = "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
{ echo "$as_me:$LINENO: WARNING: Creating debug reports not currently supported on this system, disabled" >&5
echo "$as_me: WARNING: Creating debug reports not currently supported on this system, disabled" >&2;}
wxUSE_DEBUGREPORT=no
for ac_header in sys/epoll.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
+ eval "$as_ac_Header=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $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 <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwidgets.org ##
-## ----------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
fi
ac_res=`eval echo '${'$as_ac_Header'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
-
-fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
if test "$wxUSE_SOCKETS" = "yes"; then
- if test "$wxUSE_MGL" = "1"; then
+ if test "$wxUSE_MGL" = 1; then
{ echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5
echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
wxUSE_SOCKETS="no"
fi
else
- if test "$wxUSE_MGL" != "1"; then
+ if test "$wxUSE_MGL" != 1; then
for ac_header in linux/joystick.h
do
fi
fi
-if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_EXPERIMENTAL_PRINTF 1
-_ACEOF
-
-fi
-
if test "$wxUSE_CONSTRAINTS" = "yes"; then
cat >>confdefs.h <<\_ACEOF
_ACEOF
-cat >>confdefs.h <<\_ACEOF
-#define wxUSE_NORMALIZED_PS_FONTS 1
-_ACEOF
-
-
if test "$wxUSE_SVG" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_SVG 1
_ACEOF
USES_CONTROLS=1
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
fi
if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then
USES_CONTROLS=1
fi
+if test "$wxUSE_FILECTRL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FILECTRL 1
+_ACEOF
+
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_FILEPICKERCTRL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_FILEPICKERCTRL 1
#define wxUSE_DISPLAY 1
_ACEOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
fi
fi
_ACEOF
USES_CONTROLS=1
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox"
fi
if test "$wxUSE_LISTCTRL" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo"
fi
-
if test "$wxUSE_RADIOBOX" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_RADIOBOX 1
#define wxUSE_MINIFRAME 1
_ACEOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
fi
if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
fi
+if test "$wxUSE_MSW" = 1 -o "$wxUSE_PM" = 1; then
+ if test "$wxUSE_OWNER_DRAWN" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_OWNER_DRAWN 1
+_ACEOF
+
+ fi
+fi
+
+
if test "$wxUSE_MSW" = 1 ; then
-if test "$wxUSE_DC_CACHEING" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_DC_CACHEING" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_DC_CACHEING 1
_ACEOF
-fi
+ fi
-if test "$wxUSE_UXTHEME" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_DIB" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WXDIB 1
+_ACEOF
+
+ fi
+
+ if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+_ACEOF
+
+ fi
+
+ if test "$wxUSE_UXTHEME" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_UXTHEME 1
_ACEOF
+ fi
+
fi
-if test "$wxUSE_DIB" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WXDIB 1
+
+if test "$USE_WIN32" = 1 ; then
+ if test "$wxUSE_INICONF" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_INICONF 1
_ACEOF
-fi
+ fi
+
+ if test "$wxUSE_REGKEY" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_REGKEY 1
+_ACEOF
+ fi
fi
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
cat >>confdefs.h <<\_ACEOF
#define wxUSE_GRAPHICS_CONTEXT 1
_ACEOF
STD_BASE_LIBS="base"
STD_GUI_LIBS=""
BUILT_WX_LIBS="base"
-ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base"
+ALL_WX_LIBS="xrc stc gl media qa html adv core xml net base"
if test "$wxUSE_SOCKETS" = "yes" ; then
STD_BASE_LIBS="net $STD_BASE_LIBS"
BUILT_WX_LIBS="net $BUILT_WX_LIBS"
fi
-if test "$wxUSE_ODBC" != "no" ; then
- BUILT_WX_LIBS="odbc $BUILT_WX_LIBS"
-fi
if test "$wxUSE_XML" = "yes" ; then
STD_BASE_LIBS="xml $STD_BASE_LIBS"
BUILT_WX_LIBS="xml $BUILT_WX_LIBS"
STD_GUI_LIBS="qa $STD_GUI_LIBS"
BUILT_WX_LIBS="qa $BUILT_WX_LIBS"
fi
- if test "$wxUSE_ODBC" != "no" ; then
- BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS"
- fi
if test "$wxUSE_HTML" = "yes" ; then
STD_GUI_LIBS="html $STD_GUI_LIBS"
BUILT_WX_LIBS="html $BUILT_WX_LIBS"
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
- dynamic erase event exec font image minimal mobile \
- mobile/wxedit mobile/styles propsize render \
- rotate shaped svg taborder vscroll widgets"
+ erase event exec font image minimal mobile \
+ mobile/wxedit mobile/styles render \
+ shaped svg taborder vscroll widgets"
if test "$wxUSE_MONOLITHIC" != "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
if test "x$INTELCXX" = "xyes" ; then
CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419"
elif test "$GXX" = yes ; then
- CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy"
+ CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
fi
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
EXTRALIBS_XML="$EXPAT_LINK"
EXTRALIBS_HTML="$MSPACK_LINK"
-EXTRALIBS_ODBC="$ODBC_LINK"
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`
if test "$wxUSE_EXPAT" = "builtin" ; then
wxconfig_3rdparty="expat $wxconfig_3rdparty"
fi
-if test "$wxUSE_ODBC" = "builtin" ; then
- wxconfig_3rdparty="odbc $wxconfig_3rdparty"
-fi
if test "$wxUSE_LIBTIFF" = "builtin" ; then
wxconfig_3rdparty="tiff $wxconfig_3rdparty"
fi
-
if test $wxUSE_MONOLITHIC = "yes" ; then
MONOLITHIC=1
else
USE_PLUGINS=0
fi
-if test $wxUSE_ODBC != "no" ; then
- USE_ODBC=1
-else
- USE_ODBC=0
-fi
-
if test "$wxUSE_DEBUGREPORT" = "yes" ; then
USE_QA=1
else
-TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr A-Z a-z`
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";
+ fi
if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint";
fi
BAKEFILE_FORCE_PLATFORM=win32
fi
-if test "$wxUSE_MAC" = 1 ; then
- if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
- if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
- OSX_UNIV_OPTS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
- else
- OSX_UNIV_OPTS=${wxUSE_UNIVERSAL_BINARY:+"-isysroot '$wxUSE_UNIVERSAL_BINARY'"}
- fi
- OSX_UNIV_OPTS="$OSX_UNIV_OPTS -arch ppc -arch i386"
- CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
- CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
- LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
- bk_use_pch=no
- fi
- # TODO: where do we add "-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" for libtool (static builds only)?
- # The makefile currently uses AR and RANLIB, which libtool apparently supercedes.
-fi
-
if test "$wxUSE_UNICODE" = yes -a "$GCC" = yes -a "$bk_use_pch" != no
then
{ echo "$as_me:$LINENO: checking for gcc precompiled header bug" >&5
if $CXX -o conftest$PROGRAM_EXT conftest.cpp >/dev/null 2>&1
then
- if tr -dc '[a-z]' < conftest$PROGRAM_EXT |
+ if tr -dc a-z < conftest$PROGRAM_EXT |
grep awidetest >/dev/null
then
wx_cv_gcc_pch_bug=no
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1=""
fi
- COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#"
- if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
- COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1=""
- fi
-
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
fi
- COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#"
- if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then
- COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1=""
- fi
-
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1=""
fi
- COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#"
- if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
- COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1=""
- fi
-
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
fi
- COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#"
- if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then
- COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1=""
- fi
-
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1=""
fi
- COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1="#"
- if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
- COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1=""
- fi
-
COND_MONOLITHIC_0_USE_HTML_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then
COND_MONOLITHIC_0_USE_HTML_1=""
COND_MONOLITHIC_0_USE_MEDIA_1=""
fi
- COND_MONOLITHIC_0_USE_ODBC_1="#"
- if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then
- COND_MONOLITHIC_0_USE_ODBC_1=""
- fi
-
COND_MONOLITHIC_0_USE_QA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then
COND_MONOLITHIC_0_USE_QA_1=""
COND_PLATFORM_MAC_1=""
fi
- COND_PLATFORM_MSDOS_0="#"
- if test "x$PLATFORM_MSDOS" = "x0" ; then
- COND_PLATFORM_MSDOS_0=""
- fi
-
COND_PLATFORM_MSDOS_1="#"
if test "x$PLATFORM_MSDOS" = "x1" ; then
COND_PLATFORM_MSDOS_1=""
COND_SHARED_0_USE_STC_1=""
fi
- COND_SHARED_0_USE_XRC_1="#"
- if test "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then
- COND_SHARED_0_USE_XRC_1=""
- fi
-
COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
fi
- COND_SHARED_0_WXUSE_ODBC_BUILTIN="#"
- if test "x$SHARED" = "x0" -a "x$wxUSE_ODBC" = "xbuiltin" ; then
- COND_SHARED_0_WXUSE_ODBC_BUILTIN=""
- fi
-
COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
fi
- COND_SHARED_1_USE_XRC_1="#"
- if test "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then
- COND_SHARED_1_USE_XRC_1=""
- fi
-
COND_TOOLKIT_="#"
if test "x$TOOLKIT" = "x" ; then
COND_TOOLKIT_=""
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
fi
- COND_USE_ODBC_1="#"
- if test "x$USE_ODBC" = "x1" ; then
- COND_USE_ODBC_1=""
- fi
-
- COND_USE_OPENGL_1="#"
- if test "x$USE_OPENGL" = "x1" ; then
- COND_USE_OPENGL_1=""
- fi
-
COND_USE_PCH_1="#"
if test "x$USE_PCH" = "x1" ; then
COND_USE_PCH_1=""
COND_WXUSE_LIBTIFF_BUILTIN=""
fi
- COND_WXUSE_ODBC_BUILTIN="#"
- if test "x$wxUSE_ODBC" = "xbuiltin" ; then
- COND_WXUSE_ODBC_BUILTIN=""
- fi
-
COND_WXUSE_REGEX_BUILTIN="#"
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_WXUSE_REGEX_BUILTIN=""
fi
+case ${INSTALL} in
+ /* ) # Absolute
+ ;;
+ ?:* ) # Drive letter, considered as absolute.
+ ;;
+ *)
+ INSTALL=`pwd`/${INSTALL} ;;
+esac
+
+if test "$wxUSE_GUI" = "yes"; then
+
+if test "$wxUSE_MSW" = 1 ; then
+ if test "x$WINDRES" = "x"; then
+ { { echo "$as_me:$LINENO: error: Required windres program not found" >&5
+echo "$as_me: error: Required windres program not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ RESCOMP="$WINDRES"
+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"
+
+ LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
+
+ # Extract the first word of "DeRez", so it can be a program name with args.
+set dummy DeRez; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DEREZ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$DEREZ"; then
+ ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DEREZ="DeRez"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
+fi
+fi
+DEREZ=$ac_cv_prog_DEREZ
+if test -n "$DEREZ"; then
+ { echo "$as_me:$LINENO: result: $DEREZ" >&5
+echo "${ECHO_T}$DEREZ" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+
+ MACSETFILE="\$(SETFILE)"
+
+ if test "$wxUSE_MAC" = 1; then
+ POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
+ RESCOMP="$REZ"
+ WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
+ else
+ POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
+ RESCOMP="cat /dev/null \| $REZ"
+ WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
+ fi
+
+else
+ MACSETFILE="@true"
+
+ if test "$wxUSE_PM" = 1; then
+ RESCOMP="emxbind"
+ WXCONFIG_RESFLAGS="-ep"
+
+ POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
+ else
+ POSTLINK_COMMAND="@true"
+ fi
+fi
+
+fi
+
+
if test $GCC_PCH = 1
then
if test "$wx_cv_gcc_pch_bug" = yes; then
fi
if test "$wxUSE_SHARED" = "yes"; then
-
- sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'`
- EXE_LINKER=`eval echo "$sanitised_bakefile_mess"`
-
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
cp -p ${srcdir}/src/os2/dllar.sh .
;;
esac
-else
-
- EXE_LINKER="$CXX -o"
-
fi
if test "$wxUSE_OMF" = "yes"; then
case "${host}" in
case "${host}" in
*-*-solaris2* )
- if "$GCC" = yes; then
+ if test "$GCC" = yes; then
CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'`
LIBS=`echo $LIBS | sed 's/-mt//'`
EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'`
-
{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
if test "$wxWITH_SUBDIRS" != "no"; then
if test "$wxUSE_GUI" = "yes"; then
SUBDIRS="samples demos utils"
-else SUBDIRS="samples utils"
+else
+ SUBDIRS="samples utils"
fi
-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
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
done
else
- 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 if test ${subdir} = "samples"; then
+ else
+ if test ${subdir} = "samples"; then
makefiles="samples/Makefile.in samples/console/Makefile.in"
elif test ${subdir} = "utils"; then
makefiles=""
$makefiles"
fi
done
- else makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+ else
+ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
fi
fi
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
-RANLIB!$RANLIB$ac_delim
AR!$AR$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-STRIP!$STRIP$ac_delim
-WINDRES!$WINDRES$ac_delim
-DLLTOOL!$DLLTOOL$ac_delim
-IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim
-LN_S!$LN_S$ac_delim
subdirs!$subdirs$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
GTK_CFLAGS!$GTK_CFLAGS$ac_delim
PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim
CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim
CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim
-REZ!$REZ$ac_delim
-DEREZ!$DEREZ$ac_delim
-SETFILE!$SETFILE$ac_delim
LIBICONV!$LIBICONV$ac_delim
+SDL_CONFIG!$SDL_CONFIG$ac_delim
+SDL_CFLAGS!$SDL_CFLAGS$ac_delim
+SDL_LIBS!$SDL_LIBS$ac_delim
+GTKPRINT_CFLAGS!$GTKPRINT_CFLAGS$ac_delim
+GTKPRINT_LIBS!$GTKPRINT_LIBS$ac_delim
+LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim
+LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim
+GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
+GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
+HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
+HILDON_LIBS!$HILDON_LIBS$ac_delim
+CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-SDL_CONFIG!$SDL_CONFIG$ac_delim
-SDL_CFLAGS!$SDL_CFLAGS$ac_delim
-SDL_LIBS!$SDL_LIBS$ac_delim
-LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim
-LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim
-GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
-GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
-HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
-HILDON_LIBS!$HILDON_LIBS$ac_delim
-CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
CAIRO_LIBS!$CAIRO_LIBS$ac_delim
GST_CFLAGS!$GST_CFLAGS$ac_delim
GST_LIBS!$GST_LIBS$ac_delim
wxUSE_ZLIB!$wxUSE_ZLIB$ac_delim
wxUSE_REGEX!$wxUSE_REGEX$ac_delim
wxUSE_EXPAT!$wxUSE_EXPAT$ac_delim
-wxUSE_ODBC!$wxUSE_ODBC$ac_delim
wxUSE_LIBJPEG!$wxUSE_LIBJPEG$ac_delim
wxUSE_LIBPNG!$wxUSE_LIBPNG$ac_delim
wxUSE_LIBTIFF!$wxUSE_LIBTIFF$ac_delim
EXTRALIBS!$EXTRALIBS$ac_delim
EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim
EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim
-EXTRALIBS_ODBC!$EXTRALIBS_ODBC$ac_delim
EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim
EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim
EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim
WITH_PLUGIN_SDL!$WITH_PLUGIN_SDL$ac_delim
+EXTRALIBS_GTKPRINT!$EXTRALIBS_GTKPRINT$ac_delim
EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim
EXTRALIBS_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim
EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim
HOST_SUFFIX!$HOST_SUFFIX$ac_delim
CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim
CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim
+RANLIB!$RANLIB$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+LN_S!$LN_S$ac_delim
SET_MAKE!$SET_MAKE$ac_delim
MAKE_SET!$MAKE_SET$ac_delim
AROPTIONS!$AROPTIONS$ac_delim
+STRIP!$STRIP$ac_delim
NM!$NM$ac_delim
INSTALL_DIR!$INSTALL_DIR$ac_delim
LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim
+IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim
PLATFORM_UNIX!$PLATFORM_UNIX$ac_delim
PLATFORM_WIN32!$PLATFORM_WIN32$ac_delim
PLATFORM_MSDOS!$PLATFORM_MSDOS$ac_delim
SONAME_FLAG!$SONAME_FLAG$ac_delim
DEPS_TRACKING!$DEPS_TRACKING$ac_delim
BK_DEPS!$BK_DEPS$ac_delim
+WINDRES!$WINDRES$ac_delim
+REZ!$REZ$ac_delim
+SETFILE!$SETFILE$ac_delim
GCC_PCH!$GCC_PCH$ac_delim
ICC_PCH!$ICC_PCH$ac_delim
BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
+COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
COND_MONOLITHIC_0_USE_AUI_1!$COND_MONOLITHIC_0_USE_AUI_1$ac_delim
COND_MONOLITHIC_0_USE_GUI_1!$COND_MONOLITHIC_0_USE_GUI_1$ac_delim
COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_USE_ODBC_1!$COND_MONOLITHIC_0_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim
COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim
-COND_PLATFORM_MSDOS_0!$COND_PLATFORM_MSDOS_0$ac_delim
COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
-COND_SHARED_0_USE_XRC_1!$COND_SHARED_0_USE_XRC_1$ac_delim
COND_SHARED_0_WXUSE_EXPAT_BUILTIN!$COND_SHARED_0_WXUSE_EXPAT_BUILTIN$ac_delim
-COND_SHARED_0_WXUSE_ODBC_BUILTIN!$COND_SHARED_0_WXUSE_ODBC_BUILTIN$ac_delim
COND_SHARED_0_WXUSE_REGEX_BUILTIN!$COND_SHARED_0_WXUSE_REGEX_BUILTIN$ac_delim
COND_SHARED_0_WXUSE_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$ac_delim
COND_SHARED_1!$COND_SHARED_1$ac_delim
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim
COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
+COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
+COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
+COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
-COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
-COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
-COND_USE_ODBC_1!$COND_USE_ODBC_1$ac_delim
-COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
COND_WXUSE_LIBJPEG_BUILTIN!$COND_WXUSE_LIBJPEG_BUILTIN$ac_delim
COND_WXUSE_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_BUILTIN$ac_delim
COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim
-COND_WXUSE_ODBC_BUILTIN!$COND_WXUSE_ODBC_BUILTIN$ac_delim
COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim
COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim
+DEREZ!$DEREZ$ac_delim
SHARED!$SHARED$ac_delim
WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
-EXE_LINKER!$EXE_LINKER$ac_delim
GUIDIST!$GUIDIST$ac_delim
DISTDIR!$DISTDIR$ac_delim
+SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
+LDFLAGS_GL!$LDFLAGS_GL$ac_delim
+OPENGL_LIBS!$OPENGL_LIBS$ac_delim
+DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
+WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
+RESCOMP!$RESCOMP$ac_delim
+RESFLAGS!$RESFLAGS$ac_delim
+RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
+WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim
+WX_RESOURCES_MACOSX_DATA!$WX_RESOURCES_MACOSX_DATA$ac_delim
+LIBWXMACRES!$LIBWXMACRES$ac_delim
+POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
+MACSETFILE!$MACSETFILE$ac_delim
+GCC!$GCC$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
-LDFLAGS_GL!$LDFLAGS_GL$ac_delim
-OPENGL_LIBS!$OPENGL_LIBS$ac_delim
-DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
-WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
-RESCOMP!$RESCOMP$ac_delim
-RESFLAGS!$RESFLAGS$ac_delim
-RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
-WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim
-WX_RESOURCES_MACOSX_DATA!$WX_RESOURCES_MACOSX_DATA$ac_delim
-LIBWXMACRES!$LIBWXMACRES$ac_delim
-POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
-MACSETFILE!$MACSETFILE$ac_delim
-GCC!$GCC$ac_delim
+DLLTOOL!$DLLTOOL$ac_delim
CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}"
echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}"
-echo -n " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}"
+echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C"
if test "$wxUSE_UNICODE" = "yes"; then
if test "$wxUSE_UNICODE_UTF8" = "yes"; then
echo " (using UTF-8)"
echo " wxWidgets 2.8 ${WXWIN_COMPATIBILITY_2_8:-yes}"
echo " Which libraries should wxWidgets use?"
+echo " STL ${wxUSE_STL}"
echo " jpeg ${wxUSE_LIBJPEG-none}"
echo " png ${wxUSE_LIBPNG-none}"
echo " regex ${wxUSE_REGEX}"
echo " xpm ${wxUSE_LIBXPM-none}"
fi
echo " zlib ${wxUSE_ZLIB}"
-echo " odbc ${wxUSE_ODBC}"
echo " expat ${wxUSE_EXPAT}"
echo " libmspack ${wxUSE_LIBMSPACK}"
echo " sdl ${wxUSE_LIBSDL}"
projects / wxWidgets.git / blobdiff