-
-# Configure paths for GTK+
-# Owen Taylor 97-11-3
--with-pm use OS/2 Presentation Manager"
ac_help="$ac_help
--with-mgl use SciTech MGL"
+ac_help="$ac_help
+ --with-microwin use MicroWindows"
ac_help="$ac_help
--enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)"
ac_help="$ac_help
ac_help="$ac_help
--with-opengl use OpenGL (or Mesa)"
ac_help="$ac_help
- --with-dmalloc use dmalloc library (www.letters.com/dmalloc)"
+ --with-dmalloc use dmalloc library (http://dmalloc.com/)"
ac_help="$ac_help
--with-regex enable support for wxRegEx class"
ac_help="$ac_help
--enable-intl use internationalization system"
ac_help="$ac_help
--enable-config use wxConfig (and derived) classes"
+ac_help="$ac_help
+ --enable-protocols use wxProtocol and derived classes"
+ac_help="$ac_help
+ --enable-ftp use wxFTP (requires wxProtocol"
+ac_help="$ac_help
+ --enable-http use wxHTTP (requires wxProtocol"
+ac_help="$ac_help
+ --enable-fileproto use wxFileProto class (requires wxProtocol"
ac_help="$ac_help
--enable-sockets use socket/network classes"
ac_help="$ac_help
--enable-fraction use wxFraction class"
ac_help="$ac_help
--enable-dynlib use wxLibrary class for DLL loading"
+ac_help="$ac_help
+ --enable-dynamicloader use (new) wxDynamicLibrary class"
ac_help="$ac_help
--enable-longlong use wxLongLong class"
ac_help="$ac_help
--enable-fontmap use font encodings conversion classes"
ac_help="$ac_help
--enable-unicode compile wxString with Unicode support"
+ac_help="$ac_help
+ --enable-mslu use MS Layer for Unicode on Windows 9x (win32 only)"
ac_help="$ac_help
--enable-wxprintfv use wxWindows implementation of vprintf()"
ac_help="$ac_help
ac_help="$ac_help
--enable-sysoptions use wxSystemOptions"
ac_help="$ac_help
- --enable-threads use threads"
+ --enable-url use wxURL class"
+ac_help="$ac_help
+ --enable-protocol use wxProtocol class"
+ac_help="$ac_help
+ --enable-protocol-http HTTP support in wxProtocol"
+ac_help="$ac_help
+ --enable-protocol-ftp FTP support in wxProtocol"
ac_help="$ac_help
- --enable-serial use class serialization"
+ --enable-protocol-file FILE support in wxProtocol"
+ac_help="$ac_help
+ --enable-threads use threads"
ac_help="$ac_help
--enable-docview use document view architecture"
ac_help="$ac_help
--enable-tbarsmpl use wxToolBarSimple class"
ac_help="$ac_help
--enable-treectrl use wxTreeCtrl class"
+ac_help="$ac_help
+ --enable-tipwindow use wxTipWindow class"
ac_help="$ac_help
--enable-popupwin use wxPopUpWindow class"
ac_help="$ac_help
--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
ac_help="$ac_help
--disable-gtktest Do not try to compile and run a test GTK program"
+ac_help="$ac_help
+ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)"
+ac_help="$ac_help
+ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
+ac_help="$ac_help
+ --disable-gtktest Do not try to compile and run a test GTK program"
+ac_help="$ac_help
+ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)"
+ac_help="$ac_help
+ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
+ac_help="$ac_help
+ --disable-gtktest Do not try to compile and run a test GTK program"
ac_help="$ac_help
--with-x use the X Window System"
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:943: checking host system type" >&5
+echo "configure:976: checking host system type" >&5
host_alias=$host
case "$host_alias" in
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:964: checking target system type" >&5
+echo "configure:997: checking target system type" >&5
target_alias=$target
case "$target_alias" in
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:982: checking build system type" >&5
+echo "configure:1015: checking build system type" >&5
build_alias=$build
case "$build_alias" in
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=3
-WX_RELEASE_NUMBER=2
+WX_RELEASE_NUMBER=3
WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
-WX_CURRENT=1
+WX_CURRENT=2
WX_REVISION=0
WX_AGE=0
USE_UNIX=1
USE_WIN32=0
+USE_DOS=0
USE_BEOS=0
USE_MAC=0
NEEDS_D_REENTRANT_FOR_R_FUNCS=0
-ALL_TOOLKITS="GTK MAC MGL MOTIF MSW PM WINE"
+CPP_MT_FLAG=-D_REENTRANT
+
+ALL_TOOLKITS="GTK MAC MGL MICROWIN MOTIF MSW PM WINE"
DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_MAC=0
DEFAULT_wxUSE_MGL=0
+DEFAULT_wxUSE_MICROWIN=0
DEFAULT_wxUSE_MOTIF=0
DEFAULT_wxUSE_MSW=0
DEFAULT_wxUSE_PM=0
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MAC=0
DEFAULT_DEFAULT_wxUSE_MGL=0
+DEFAULT_DEFAULT_wxUSE_MICROWIN=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=0
DEFAULT_DEFAULT_wxUSE_PM=0
*-*-freebsd*)
USE_BSD=1
USE_FREEBSD=1
+ CPP_MT_FLAG=-D_THREAD_SAFE
cat >> confdefs.h <<\EOF
#define __FREEBSD__ 1
EOF
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
+ *-pc-msdosdjgpp )
+ USE_UNIX=0
+ USE_DOS=1
+ cat >> confdefs.h <<\EOF
+#define __DOS__ 1
+EOF
+
+ PROGRAM_EXT=".exe"
+ DEFAULT_DEFAULT_wxUSE_MGL=1
+ DEFAULT_DEFAULT_wxUSE_SHARED=0
+ ;;
+
*-pc-os2_emx | *-pc-os2-emx )
cat >> confdefs.h <<\EOF
#define __EMX__ 1
powerpc-*-darwin* )
USE_BSD=1
USE_DARWIN=1
+ CPP_MT_FLAG=
SO_SUFFIX=dylib
cat >> confdefs.h <<\EOF
#define __BSD__ 1
if test "$USE_LINUX" = 1; then
echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6
-echo "configure:1327: checking for glibc 2.1 or later" >&5
+echo "configure:1379: checking for glibc 2.1 or later" >&5
if eval "test \"`echo '$''{'wx_lib_glibc21'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext <<EOF
-#line 1332 "configure"
+
+ cat > conftest.$ac_ext <<EOF
+#line 1385 "configure"
#include "confdefs.h"
#include <features.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:1343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_lib_glibc21=yes
DEFAULT_wxUSE_STREAMS=no
DEFAULT_wxUSE_SOCKETS=no
DEFAULT_wxUSE_DIALUP_MANAGER=no
- DEFAULT_wxUSE_SERIAL=no
DEFAULT_wxUSE_JOYSTICK=no
DEFAULT_wxUSE_DYNLIB_CLASS=no
+ DEFAULT_wxUSE_DYNAMIC_LOADER=no
DEFAULT_wxUSE_LONGLONG=no
DEFAULT_wxUSE_GEOMETRY=no
DEFAULT_wxUSE_TREELAYOUT=no
DEFAULT_wxUSE_METAFILE=no
DEFAULT_wxUSE_MIMETYPE=no
- DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
-
+ DEFAULT_wxUSE_SYSTEM_OPTIONS=no
+ DEFAULT_wxUSE_PROTOCOL=no
+ DEFAULT_wxUSE_PROTOCOL_HTTP=no
+ DEFAULT_wxUSE_PROTOCOL_FTP=no
+ DEFAULT_wxUSE_PROTOCOL_FILE=no
+ DEFAULT_wxUSE_URL=no
+
DEFAULT_wxUSE_COMMONDLGS=no
DEFAULT_wxUSE_CHOICEDLG=no
DEFAULT_wxUSE_COLOURDLG=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_POPUPWIN=no
+ DEFAULT_wxUSE_TIPWINDOW=no
DEFAULT_wxUSE_UNICODE=no
+ DEFAULT_wxUSE_UNICODE_MSLU=no
DEFAULT_wxUSE_WCSRTOMBS=no
DEFAULT_wxUSE_PALETTE=no
DEFAULT_wxUSE_STREAMS=yes
DEFAULT_wxUSE_SOCKETS=yes
DEFAULT_wxUSE_DIALUP_MANAGER=yes
- DEFAULT_wxUSE_SERIAL=yes
DEFAULT_wxUSE_JOYSTICK=yes
DEFAULT_wxUSE_DYNLIB_CLASS=yes
+ DEFAULT_wxUSE_DYNAMIC_LOADER=no
DEFAULT_wxUSE_LONGLONG=yes
DEFAULT_wxUSE_GEOMETRY=yes
DEFAULT_wxUSE_METAFILE=yes
DEFAULT_wxUSE_MIMETYPE=yes
DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
+ DEFAULT_wxUSE_PROTOCOL=yes
+ DEFAULT_wxUSE_PROTOCOL_HTTP=yes
+ DEFAULT_wxUSE_PROTOCOL_FTP=yes
+ DEFAULT_wxUSE_PROTOCOL_FILE=yes
+ DEFAULT_wxUSE_URL=yes
DEFAULT_wxUSE_COMMONDLGS=yes
DEFAULT_wxUSE_CHOICEDLG=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TREECTRL=yes
DEFAULT_wxUSE_POPUPWIN=yes
+ DEFAULT_wxUSE_TIPWINDOW=yes
DEFAULT_wxUSE_UNICODE=no
+ DEFAULT_wxUSE_UNICODE_MSLU=yes
DEFAULT_wxUSE_WCSRTOMBS=no
DEFAULT_wxUSE_PALETTE=yes
echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
-echo "configure:1724: checking for --enable-gui" >&5
+echo "configure:1791: checking for --enable-gui" >&5
no_cache=0
# Check whether --enable-gui or --disable-gui was given.
if test "${enable_gui+set}" = set; then
echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6
-echo "configure:1766: checking for --enable-universal" >&5
+echo "configure:1833: checking for --enable-universal" >&5
no_cache=0
# Check whether --enable-universal or --disable-universal was given.
if test "${enable_universal+set}" = set; then
wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1
fi
+# Check whether --with-microwin or --without-microwin was given.
+if test "${with_microwin+set}" = set; then
+ withval="$with_microwin"
+ wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1
+fi
+
# Check whether --enable-gtk2 or --disable-gtk2 was given.
if test "${enable_gtk2+set}" = set; then
echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
-echo "configure:1857: checking for --with-libpng" >&5
+echo "configure:1930: checking for --with-libpng" >&5
no_cache=0
# Check whether --with-libpng or --without-libpng was given.
if test "${with_libpng+set}" = set; then
echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
-echo "configure:1908: checking for --with-libjpeg" >&5
+echo "configure:1981: checking for --with-libjpeg" >&5
no_cache=0
# Check whether --with-libjpeg or --without-libjpeg was given.
if test "${with_libjpeg+set}" = set; then
echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
-echo "configure:1959: checking for --with-libtiff" >&5
+echo "configure:2032: checking for --with-libtiff" >&5
no_cache=0
# Check whether --with-libtiff or --without-libtiff was given.
if test "${with_libtiff+set}" = set; then
echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6
-echo "configure:2010: checking for --with-freetype" >&5
+echo "configure:2083: checking for --with-freetype" >&5
no_cache=0
# Check whether --with-freetype or --without-freetype was given.
if test "${with_freetype+set}" = set; then
echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
-echo "configure:2061: checking for --with-opengl" >&5
+echo "configure:2134: checking for --with-opengl" >&5
no_cache=0
# Check whether --with-opengl or --without-opengl was given.
if test "${with_opengl+set}" = set; then
echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
-echo "configure:2103: checking for --with-dmalloc" >&5
+echo "configure:2176: checking for --with-dmalloc" >&5
no_cache=0
# Check whether --with-dmalloc or --without-dmalloc was given.
if test "${with_dmalloc+set}" = set; then
echo $ac_n "checking for --with-regex""... $ac_c" 1>&6
-echo "configure:2142: checking for --with-regex" >&5
+echo "configure:2215: checking for --with-regex" >&5
no_cache=0
# Check whether --with-regex or --without-regex was given.
if test "${with_regex+set}" = set; then
echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
-echo "configure:2193: checking for --with-zlib" >&5
+echo "configure:2266: checking for --with-zlib" >&5
no_cache=0
# Check whether --with-zlib or --without-zlib was given.
if test "${with_zlib+set}" = set; then
echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
-echo "configure:2244: checking for --with-odbc" >&5
+echo "configure:2317: checking for --with-odbc" >&5
no_cache=0
# Check whether --with-odbc or --without-odbc was given.
if test "${with_odbc+set}" = set; then
echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6
-echo "configure:2285: checking for --enable-shared" >&5
+echo "configure:2358: checking for --enable-shared" >&5
no_cache=0
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
echo $ac_n "checking for --enable-soname""... $ac_c" 1>&6
-echo "configure:2324: checking for --enable-soname" >&5
+echo "configure:2397: checking for --enable-soname" >&5
no_cache=0
# Check whether --enable-soname or --disable-soname was given.
if test "${enable_soname+set}" = set; then
echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
-echo "configure:2363: checking for --enable-optimise" >&5
+echo "configure:2436: checking for --enable-optimise" >&5
no_cache=0
# Check whether --enable-optimise or --disable-optimise was given.
if test "${enable_optimise+set}" = set; then
echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
-echo "configure:2402: checking for --enable-debug" >&5
+echo "configure:2475: checking for --enable-debug" >&5
no_cache=0
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
echo $ac_n "checking for --enable-precomp""... $ac_c" 1>&6
-echo "configure:2442: checking for --enable-precomp" >&5
+echo "configure:2515: checking for --enable-precomp" >&5
no_cache=0
# Check whether --enable-precomp or --disable-precomp was given.
if test "${enable_precomp+set}" = set; then
echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6
-echo "configure:2490: checking for --enable-debug_flag" >&5
+echo "configure:2563: checking for --enable-debug_flag" >&5
no_cache=0
# Check whether --enable-debug_flag or --disable-debug_flag was given.
if test "${enable_debug_flag+set}" = set; then
echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6
-echo "configure:2529: checking for --enable-debug_info" >&5
+echo "configure:2602: checking for --enable-debug_info" >&5
no_cache=0
# Check whether --enable-debug_info or --disable-debug_info was given.
if test "${enable_debug_info+set}" = set; then
echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6
-echo "configure:2568: checking for --enable-debug_gdb" >&5
+echo "configure:2641: checking for --enable-debug_gdb" >&5
no_cache=0
# Check whether --enable-debug_gdb or --disable-debug_gdb was given.
if test "${enable_debug_gdb+set}" = set; then
echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6
-echo "configure:2607: checking for --enable-debug_cntxt" >&5
+echo "configure:2680: checking for --enable-debug_cntxt" >&5
no_cache=0
# Check whether --enable-debug_cntxt or --disable-debug_cntxt was given.
if test "${enable_debug_cntxt+set}" = set; then
echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6
-echo "configure:2646: checking for --enable-mem_tracing" >&5
+echo "configure:2719: checking for --enable-mem_tracing" >&5
no_cache=0
# Check whether --enable-mem_tracing or --disable-mem_tracing was given.
if test "${enable_mem_tracing+set}" = set; then
echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
-echo "configure:2685: checking for --enable-profile" >&5
+echo "configure:2758: checking for --enable-profile" >&5
no_cache=0
# Check whether --enable-profile or --disable-profile was given.
if test "${enable_profile+set}" = set; then
echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6
-echo "configure:2724: checking for --enable-no_rtti" >&5
+echo "configure:2797: checking for --enable-no_rtti" >&5
no_cache=0
# Check whether --enable-no_rtti or --disable-no_rtti was given.
if test "${enable_no_rtti+set}" = set; then
echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6
-echo "configure:2763: checking for --enable-no_exceptions" >&5
+echo "configure:2836: checking for --enable-no_exceptions" >&5
no_cache=0
# Check whether --enable-no_exceptions or --disable-no_exceptions was given.
if test "${enable_no_exceptions+set}" = set; then
echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
-echo "configure:2802: checking for --enable-permissive" >&5
+echo "configure:2875: checking for --enable-permissive" >&5
no_cache=0
# Check whether --enable-permissive or --disable-permissive was given.
if test "${enable_permissive+set}" = set; then
echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6
-echo "configure:2841: checking for --enable-no_deps" >&5
+echo "configure:2914: checking for --enable-no_deps" >&5
no_cache=0
# Check whether --enable-no_deps or --disable-no_deps was given.
if test "${enable_no_deps+set}" = set; then
echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6
-echo "configure:2881: checking for --enable-compat20" >&5
+echo "configure:2954: checking for --enable-compat20" >&5
no_cache=0
# Check whether --enable-compat20 or --disable-compat20 was given.
if test "${enable_compat20+set}" = set; then
echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6
-echo "configure:2920: checking for --enable-compat22" >&5
+echo "configure:2993: checking for --enable-compat22" >&5
no_cache=0
# Check whether --enable-compat22 or --disable-compat22 was given.
if test "${enable_compat22+set}" = set; then
echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6
-echo "configure:2961: checking for --enable-intl" >&5
+echo "configure:3034: checking for --enable-intl" >&5
no_cache=0
# Check whether --enable-intl or --disable-intl was given.
if test "${enable_intl+set}" = set; then
echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
-echo "configure:3000: checking for --enable-config" >&5
+echo "configure:3073: checking for --enable-config" >&5
no_cache=0
# Check whether --enable-config or --disable-config was given.
if test "${enable_config+set}" = set; then
+ echo $ac_n "checking for --enable-protocols""... $ac_c" 1>&6
+echo "configure:3113: checking for --enable-protocols" >&5
+ no_cache=0
+ # Check whether --enable-protocols or --disable-protocols was given.
+if test "${enable_protocols+set}" = set; then
+ enableval="$enable_protocols"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_protocols='wxUSE_PROTOCOL=yes'
+ else
+ ac_cv_use_protocols='wxUSE_PROTOCOL=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_protocols='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL
+
+fi
+
+
+ eval "$ac_cv_use_protocols"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_protocols >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_PROTOCOL" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-ftp""... $ac_c" 1>&6
+echo "configure:3152: checking for --enable-ftp" >&5
+ no_cache=0
+ # Check whether --enable-ftp or --disable-ftp was given.
+if test "${enable_ftp+set}" = set; then
+ enableval="$enable_ftp"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes'
+ else
+ ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP
+
+fi
+
+
+ eval "$ac_cv_use_ftp"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_ftp >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_PROTOCOL_FTP" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-http""... $ac_c" 1>&6
+echo "configure:3191: checking for --enable-http" >&5
+ no_cache=0
+ # Check whether --enable-http or --disable-http was given.
+if test "${enable_http+set}" = set; then
+ enableval="$enable_http"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_http='wxUSE_PROTOCOL_HTTP=yes'
+ else
+ ac_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP
+
+fi
+
+
+ eval "$ac_cv_use_http"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_http >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_PROTOCOL_HTTP" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-fileproto""... $ac_c" 1>&6
+echo "configure:3230: checking for --enable-fileproto" >&5
+ no_cache=0
+ # Check whether --enable-fileproto or --disable-fileproto was given.
+if test "${enable_fileproto+set}" = set; then
+ enableval="$enable_fileproto"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes'
+ else
+ ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE
+
+fi
+
+
+ eval "$ac_cv_use_fileproto"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_fileproto >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_PROTOCOL_FILE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
-echo "configure:3040: checking for --enable-sockets" >&5
+echo "configure:3269: checking for --enable-sockets" >&5
no_cache=0
# Check whether --enable-sockets or --disable-sockets was given.
if test "${enable_sockets+set}" = set; then
echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
-echo "configure:3080: checking for --enable-ipc" >&5
+echo "configure:3309: checking for --enable-ipc" >&5
no_cache=0
# Check whether --enable-ipc or --disable-ipc was given.
if test "${enable_ipc+set}" = set; then
echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6
-echo "configure:3120: checking for --enable-cmdline" >&5
+echo "configure:3349: checking for --enable-cmdline" >&5
no_cache=0
# Check whether --enable-cmdline or --disable-cmdline was given.
if test "${enable_cmdline+set}" = set; then
echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
-echo "configure:3159: checking for --enable-datetime" >&5
+echo "configure:3388: checking for --enable-datetime" >&5
no_cache=0
# Check whether --enable-datetime or --disable-datetime was given.
if test "${enable_datetime+set}" = set; then
echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6
-echo "configure:3198: checking for --enable-timedate" >&5
+echo "configure:3427: checking for --enable-timedate" >&5
no_cache=0
# Check whether --enable-timedate or --disable-timedate was given.
if test "${enable_timedate+set}" = set; then
echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
-echo "configure:3237: checking for --enable-stopwatch" >&5
+echo "configure:3466: checking for --enable-stopwatch" >&5
no_cache=0
# Check whether --enable-stopwatch or --disable-stopwatch was given.
if test "${enable_stopwatch+set}" = set; then
echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
-echo "configure:3276: checking for --enable-dialupman" >&5
+echo "configure:3505: checking for --enable-dialupman" >&5
no_cache=0
# Check whether --enable-dialupman or --disable-dialupman was given.
if test "${enable_dialupman+set}" = set; then
echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6
-echo "configure:3315: checking for --enable-apple_ieee" >&5
+echo "configure:3544: checking for --enable-apple_ieee" >&5
no_cache=0
# Check whether --enable-apple_ieee or --disable-apple_ieee was given.
if test "${enable_apple_ieee+set}" = set; then
echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6
-echo "configure:3354: checking for --enable-timer" >&5
+echo "configure:3583: checking for --enable-timer" >&5
no_cache=0
# Check whether --enable-timer or --disable-timer was given.
if test "${enable_timer+set}" = set; then
echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6
-echo "configure:3393: checking for --enable-wave" >&5
+echo "configure:3622: checking for --enable-wave" >&5
no_cache=0
# Check whether --enable-wave or --disable-wave was given.
if test "${enable_wave+set}" = set; then
echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6
-echo "configure:3432: checking for --enable-fraction" >&5
+echo "configure:3661: checking for --enable-fraction" >&5
no_cache=0
# Check whether --enable-fraction or --disable-fraction was given.
if test "${enable_fraction+set}" = set; then
echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6
-echo "configure:3471: checking for --enable-dynlib" >&5
+echo "configure:3700: checking for --enable-dynlib" >&5
no_cache=0
# Check whether --enable-dynlib or --disable-dynlib was given.
if test "${enable_dynlib+set}" = set; then
fi
+ echo $ac_n "checking for --enable-dynamicloader""... $ac_c" 1>&6
+echo "configure:3739: checking for --enable-dynamicloader" >&5
+ no_cache=0
+ # Check whether --enable-dynamicloader or --disable-dynamicloader was given.
+if test "${enable_dynamicloader+set}" = set; then
+ enableval="$enable_dynamicloader"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
+ else
+ ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_DYNAMIC_LOADER" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER='$DEFAULT_wxUSE_DYNAMIC_LOADER
+
+fi
+
+
+ eval "$ac_cv_use_dynamicloader"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_DYNAMIC_LOADER" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
-echo "configure:3510: checking for --enable-longlong" >&5
+echo "configure:3778: checking for --enable-longlong" >&5
no_cache=0
# Check whether --enable-longlong or --disable-longlong was given.
if test "${enable_longlong+set}" = set; then
echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
-echo "configure:3549: checking for --enable-geometry" >&5
+echo "configure:3817: checking for --enable-geometry" >&5
no_cache=0
# Check whether --enable-geometry or --disable-geometry was given.
if test "${enable_geometry+set}" = set; then
echo $ac_n "checking for --enable-log""... $ac_c" 1>&6
-echo "configure:3588: checking for --enable-log" >&5
+echo "configure:3856: checking for --enable-log" >&5
no_cache=0
# Check whether --enable-log or --disable-log was given.
if test "${enable_log+set}" = set; then
echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
-echo "configure:3627: checking for --enable-streams" >&5
+echo "configure:3895: checking for --enable-streams" >&5
no_cache=0
# Check whether --enable-streams or --disable-streams was given.
if test "${enable_streams+set}" = set; then
echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
-echo "configure:3666: checking for --enable-file" >&5
+echo "configure:3934: checking for --enable-file" >&5
no_cache=0
# Check whether --enable-file or --disable-file was given.
if test "${enable_file+set}" = set; then
echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
-echo "configure:3705: checking for --enable-ffile" >&5
+echo "configure:3973: checking for --enable-ffile" >&5
no_cache=0
# Check whether --enable-ffile or --disable-ffile was given.
if test "${enable_ffile+set}" = set; then
echo $ac_n "checking for --enable-textbuf""... $ac_c" 1>&6
-echo "configure:3744: checking for --enable-textbuf" >&5
+echo "configure:4012: checking for --enable-textbuf" >&5
no_cache=0
# Check whether --enable-textbuf or --disable-textbuf was given.
if test "${enable_textbuf+set}" = set; then
echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6
-echo "configure:3783: checking for --enable-textfile" >&5
+echo "configure:4051: checking for --enable-textfile" >&5
no_cache=0
# Check whether --enable-textfile or --disable-textfile was given.
if test "${enable_textfile+set}" = set; then
echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
-echo "configure:3822: checking for --enable-fontmap" >&5
+echo "configure:4090: checking for --enable-fontmap" >&5
no_cache=0
# Check whether --enable-fontmap or --disable-fontmap was given.
if test "${enable_fontmap+set}" = set; then
echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6
-echo "configure:3861: checking for --enable-unicode" >&5
+echo "configure:4129: checking for --enable-unicode" >&5
no_cache=0
# Check whether --enable-unicode or --disable-unicode was given.
if test "${enable_unicode+set}" = set; then
fi
+ echo $ac_n "checking for --enable-mslu""... $ac_c" 1>&6
+echo "configure:4168: checking for --enable-mslu" >&5
+ no_cache=0
+ # Check whether --enable-mslu or --disable-mslu was given.
+if test "${enable_mslu+set}" = set; then
+ enableval="$enable_mslu"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
+ else
+ ac_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_UNICODE_MSLU" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_mslu='wxUSE_UNICODE_MSLU='$DEFAULT_wxUSE_UNICODE_MSLU
+
+fi
+
+
+ eval "$ac_cv_use_mslu"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_mslu >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_UNICODE_MSLU" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
-echo "configure:3900: checking for --enable-wxprintfv" >&5
+echo "configure:4207: checking for --enable-wxprintfv" >&5
no_cache=0
# Check whether --enable-wxprintfv or --disable-wxprintfv was given.
if test "${enable_wxprintfv+set}" = set; then
echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
-echo "configure:3939: checking for --enable-std_iostreams" >&5
+echo "configure:4246: checking for --enable-std_iostreams" >&5
no_cache=0
# Check whether --enable-std_iostreams or --disable-std_iostreams was given.
if test "${enable_std_iostreams+set}" = set; then
echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
-echo "configure:3978: checking for --enable-filesystem" >&5
+echo "configure:4285: checking for --enable-filesystem" >&5
no_cache=0
# Check whether --enable-filesystem or --disable-filesystem was given.
if test "${enable_filesystem+set}" = set; then
echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
-echo "configure:4017: checking for --enable-fs_inet" >&5
+echo "configure:4324: checking for --enable-fs_inet" >&5
no_cache=0
# Check whether --enable-fs_inet or --disable-fs_inet was given.
if test "${enable_fs_inet+set}" = set; then
echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
-echo "configure:4056: checking for --enable-fs_zip" >&5
+echo "configure:4363: checking for --enable-fs_zip" >&5
no_cache=0
# Check whether --enable-fs_zip or --disable-fs_zip was given.
if test "${enable_fs_zip+set}" = set; then
echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
-echo "configure:4095: checking for --enable-zipstream" >&5
+echo "configure:4402: checking for --enable-zipstream" >&5
no_cache=0
# Check whether --enable-zipstream or --disable-zipstream was given.
if test "${enable_zipstream+set}" = set; then
echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6
-echo "configure:4135: checking for --enable-catch_segvs" >&5
+echo "configure:4442: checking for --enable-catch_segvs" >&5
no_cache=0
# Check whether --enable-catch_segvs or --disable-catch_segvs was given.
if test "${enable_catch_segvs+set}" = set; then
echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
-echo "configure:4174: checking for --enable-snglinst" >&5
+echo "configure:4481: checking for --enable-snglinst" >&5
no_cache=0
# Check whether --enable-snglinst or --disable-snglinst was given.
if test "${enable_snglinst+set}" = set; then
echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6
-echo "configure:4214: checking for --enable-mimetype" >&5
+echo "configure:4521: checking for --enable-mimetype" >&5
no_cache=0
# Check whether --enable-mimetype or --disable-mimetype was given.
if test "${enable_mimetype+set}" = set; then
echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6
-echo "configure:4253: checking for --enable-system_options" >&5
+echo "configure:4560: checking for --enable-system_options" >&5
no_cache=0
# Check whether --enable-system_options or --disable-system_options was given.
if test "${enable_system_options+set}" = set; then
-
- echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6
-echo "configure:4294: checking for --enable-threads" >&5
+ echo $ac_n "checking for --enable-url""... $ac_c" 1>&6
+echo "configure:4600: checking for --enable-url" >&5
no_cache=0
- # Check whether --enable-threads or --disable-threads was given.
-if test "${enable_threads+set}" = set; then
- enableval="$enable_threads"
+ # Check whether --enable-url or --disable-url was given.
+if test "${enable_url+set}" = set; then
+ enableval="$enable_url"
if test "$enableval" = yes; then
- ac_cv_use_threads='wxUSE_THREADS=yes'
+ ac_cv_use_url='wxUSE_URL=yes'
else
- ac_cv_use_threads='wxUSE_THREADS=no'
+ ac_cv_use_url='wxUSE_URL=no'
fi
else
- LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_URL" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
+ ac_cv_use_url='wxUSE_URL='$DEFAULT_wxUSE_URL
fi
- eval "$ac_cv_use_threads"
+ eval "$ac_cv_use_url"
if test "$no_cache" != 1; then
- echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_url >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_THREADS" = yes; then
+ if test "$wxUSE_URL" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6
-echo "configure:4333: checking for --enable-serial" >&5
+ echo $ac_n "checking for --enable-protocol""... $ac_c" 1>&6
+echo "configure:4639: checking for --enable-protocol" >&5
no_cache=0
- # Check whether --enable-serial or --disable-serial was given.
-if test "${enable_serial+set}" = set; then
- enableval="$enable_serial"
+ # Check whether --enable-protocol or --disable-protocol was given.
+if test "${enable_protocol+set}" = set; then
+ enableval="$enable_protocol"
if test "$enableval" = yes; then
- ac_cv_use_serial='wxUSE_SERIAL=yes'
+ ac_cv_use_protocol='wxUSE_PROTOCOL=yes'
else
- ac_cv_use_serial='wxUSE_SERIAL=no'
+ ac_cv_use_protocol='wxUSE_PROTOCOL=no'
fi
else
- LINE=`grep "wxUSE_SERIAL" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_serial='wxUSE_SERIAL='$DEFAULT_wxUSE_SERIAL
+ ac_cv_use_protocol='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL
fi
- eval "$ac_cv_use_serial"
+ eval "$ac_cv_use_protocol"
if test "$no_cache" != 1; then
- echo $ac_cv_use_serial >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_protocol >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SERIAL" = yes; then
+ if test "$wxUSE_PROTOCOL" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
-if test "$wxUSE_GUI" = "yes"; then
-
-
-
- echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
-echo "configure:4376: checking for --enable-docview" >&5
+ echo $ac_n "checking for --enable-protocol_http""... $ac_c" 1>&6
+echo "configure:4678: checking for --enable-protocol_http" >&5
no_cache=0
- # Check whether --enable-docview or --disable-docview was given.
-if test "${enable_docview+set}" = set; then
- enableval="$enable_docview"
+ # Check whether --enable-protocol_http or --disable-protocol_http was given.
+if test "${enable_protocol_http+set}" = set; then
+ enableval="$enable_protocol_http"
if test "$enableval" = yes; then
- ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
+ ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
else
- ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
+ ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
fi
else
- LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
+ ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP
fi
- eval "$ac_cv_use_docview"
+ eval "$ac_cv_use_protocol_http"
if test "$no_cache" != 1; then
- echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
+ if test "$wxUSE_PROTOCOL_HTTP" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
-echo "configure:4415: checking for --enable-help" >&5
+ echo $ac_n "checking for --enable-protocol_ftp""... $ac_c" 1>&6
+echo "configure:4717: checking for --enable-protocol_ftp" >&5
no_cache=0
- # Check whether --enable-help or --disable-help was given.
-if test "${enable_help+set}" = set; then
- enableval="$enable_help"
+ # Check whether --enable-protocol_ftp or --disable-protocol_ftp was given.
+if test "${enable_protocol_ftp+set}" = set; then
+ enableval="$enable_protocol_ftp"
if test "$enableval" = yes; then
- ac_cv_use_help='wxUSE_HELP=yes'
+ ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
else
- ac_cv_use_help='wxUSE_HELP=no'
+ ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
fi
else
- LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
+ ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP
fi
- eval "$ac_cv_use_help"
+ eval "$ac_cv_use_protocol_ftp"
if test "$no_cache" != 1; then
- echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_HELP" = yes; then
+ if test "$wxUSE_PROTOCOL_FTP" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
-echo "configure:4454: checking for --enable-mshtmlhelp" >&5
+ echo $ac_n "checking for --enable-protocol_file""... $ac_c" 1>&6
+echo "configure:4756: checking for --enable-protocol_file" >&5
no_cache=0
- # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
-if test "${enable_mshtmlhelp+set}" = set; then
- enableval="$enable_mshtmlhelp"
+ # Check whether --enable-protocol_file or --disable-protocol_file was given.
+if test "${enable_protocol_file+set}" = set; then
+ enableval="$enable_protocol_file"
if test "$enableval" = yes; then
- ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
+ ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes'
else
- ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
+ ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
fi
else
- LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP
+ ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE
fi
- eval "$ac_cv_use_mshtmlhelp"
+ eval "$ac_cv_use_protocol_file"
if test "$no_cache" != 1; then
- echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_MS_HTML_HELP" = yes; then
+ if test "$wxUSE_PROTOCOL_FILE" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
-echo "configure:4493: checking for --enable-html" >&5
- no_cache=0
+
+
+
+ echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6
+echo "configure:4798: checking for --enable-threads" >&5
+ no_cache=0
+ # Check whether --enable-threads or --disable-threads was given.
+if test "${enable_threads+set}" = set; then
+ enableval="$enable_threads"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_threads='wxUSE_THREADS=yes'
+ else
+ ac_cv_use_threads='wxUSE_THREADS=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
+
+fi
+
+
+ eval "$ac_cv_use_threads"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_THREADS" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+if test "$wxUSE_GUI" = "yes"; then
+
+
+
+ echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
+echo "configure:4841: checking for --enable-docview" >&5
+ no_cache=0
+ # Check whether --enable-docview or --disable-docview was given.
+if test "${enable_docview+set}" = set; then
+ enableval="$enable_docview"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
+ else
+ ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
+
+fi
+
+
+ eval "$ac_cv_use_docview"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
+echo "configure:4880: checking for --enable-help" >&5
+ no_cache=0
+ # Check whether --enable-help or --disable-help was given.
+if test "${enable_help+set}" = set; then
+ enableval="$enable_help"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_help='wxUSE_HELP=yes'
+ else
+ ac_cv_use_help='wxUSE_HELP=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
+
+fi
+
+
+ eval "$ac_cv_use_help"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_HELP" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
+echo "configure:4919: checking for --enable-mshtmlhelp" >&5
+ no_cache=0
+ # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
+if test "${enable_mshtmlhelp+set}" = set; then
+ enableval="$enable_mshtmlhelp"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
+ else
+ ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP
+
+fi
+
+
+ eval "$ac_cv_use_mshtmlhelp"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_MS_HTML_HELP" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
+echo "configure:4958: checking for --enable-html" >&5
+ no_cache=0
# Check whether --enable-html or --disable-html was given.
if test "${enable_html+set}" = set; then
enableval="$enable_html"
echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6
-echo "configure:4532: checking for --enable-htmlhelp" >&5
+echo "configure:4997: checking for --enable-htmlhelp" >&5
no_cache=0
# Check whether --enable-htmlhelp or --disable-htmlhelp was given.
if test "${enable_htmlhelp+set}" = set; then
echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6
-echo "configure:4571: checking for --enable-constraints" >&5
+echo "configure:5036: checking for --enable-constraints" >&5
no_cache=0
# Check whether --enable-constraints or --disable-constraints was given.
if test "${enable_constraints+set}" = set; then
echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
-echo "configure:4610: checking for --enable-printarch" >&5
+echo "configure:5075: checking for --enable-printarch" >&5
no_cache=0
# Check whether --enable-printarch or --disable-printarch was given.
if test "${enable_printarch+set}" = set; then
echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
-echo "configure:4649: checking for --enable-mdi" >&5
+echo "configure:5114: checking for --enable-mdi" >&5
no_cache=0
# Check whether --enable-mdi or --disable-mdi was given.
if test "${enable_mdi+set}" = set; then
echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
-echo "configure:4688: checking for --enable-loggui" >&5
+echo "configure:5153: checking for --enable-loggui" >&5
no_cache=0
# Check whether --enable-loggui or --disable-loggui was given.
if test "${enable_loggui+set}" = set; then
echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6
-echo "configure:4727: checking for --enable-logwin" >&5
+echo "configure:5192: checking for --enable-logwin" >&5
no_cache=0
# Check whether --enable-logwin or --disable-logwin was given.
if test "${enable_logwin+set}" = set; then
echo $ac_n "checking for --enable-logdialog""... $ac_c" 1>&6
-echo "configure:4766: checking for --enable-logdialog" >&5
+echo "configure:5231: checking for --enable-logdialog" >&5
no_cache=0
# Check whether --enable-logdialog or --disable-logdialog was given.
if test "${enable_logdialog+set}" = set; then
echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6
-echo "configure:4806: checking for --enable-postscript" >&5
+echo "configure:5271: checking for --enable-postscript" >&5
no_cache=0
# Check whether --enable-postscript or --disable-postscript was given.
if test "${enable_postscript+set}" = set; then
echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6
-echo "configure:4848: checking for --enable-prologio" >&5
+echo "configure:5313: checking for --enable-prologio" >&5
no_cache=0
# Check whether --enable-prologio or --disable-prologio was given.
if test "${enable_prologio+set}" = set; then
echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
-echo "configure:4887: checking for --enable-resources" >&5
+echo "configure:5352: checking for --enable-resources" >&5
no_cache=0
# Check whether --enable-resources or --disable-resources was given.
if test "${enable_resources+set}" = set; then
echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6
-echo "configure:4927: checking for --enable-xresources" >&5
+echo "configure:5392: checking for --enable-xresources" >&5
no_cache=0
# Check whether --enable-xresources or --disable-xresources was given.
if test "${enable_xresources+set}" = set; then
echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6
-echo "configure:4968: checking for --enable-clipboard" >&5
+echo "configure:5433: checking for --enable-clipboard" >&5
no_cache=0
# Check whether --enable-clipboard or --disable-clipboard was given.
if test "${enable_clipboard+set}" = set; then
echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
-echo "configure:5007: checking for --enable-dnd" >&5
+echo "configure:5472: checking for --enable-dnd" >&5
no_cache=0
# Check whether --enable-dnd or --disable-dnd was given.
if test "${enable_dnd+set}" = set; then
echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
-echo "configure:5046: checking for --enable-metafile" >&5
+echo "configure:5511: checking for --enable-metafile" >&5
no_cache=0
# Check whether --enable-metafile or --disable-metafile was given.
if test "${enable_metafile+set}" = set; then
echo $ac_n "checking for --enable-treelayout""... $ac_c" 1>&6
-echo "configure:5086: checking for --enable-treelayout" >&5
+echo "configure:5551: checking for --enable-treelayout" >&5
no_cache=0
# Check whether --enable-treelayout or --disable-treelayout was given.
if test "${enable_treelayout+set}" = set; then
echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
-echo "configure:5127: checking for --enable-controls" >&5
+echo "configure:5592: checking for --enable-controls" >&5
no_cache=0
# Check whether --enable-controls or --disable-controls was given.
if test "${enable_controls+set}" = set; then
DEFAULT_wxUSE_TOOLTIPS=yes
DEFAULT_wxUSE_TREECTRL=yes
DEFAULT_wxUSE_POPUPWIN=yes
+ DEFAULT_wxUSE_TIPWINDOW=yes
elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_ACCEL=no
DEFAULT_wxUSE_BMPBUTTON=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_POPUPWIN=no
+ DEFAULT_wxUSE_TIPWINDOW=no
fi
echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
-echo "configure:5245: checking for --enable-accel" >&5
+echo "configure:5712: checking for --enable-accel" >&5
no_cache=0
# Check whether --enable-accel or --disable-accel was given.
if test "${enable_accel+set}" = set; then
echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
-echo "configure:5284: checking for --enable-button" >&5
+echo "configure:5751: checking for --enable-button" >&5
no_cache=0
# Check whether --enable-button or --disable-button was given.
if test "${enable_button+set}" = set; then
echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6
-echo "configure:5323: checking for --enable-bmpbutton" >&5
+echo "configure:5790: checking for --enable-bmpbutton" >&5
no_cache=0
# Check whether --enable-bmpbutton or --disable-bmpbutton was given.
if test "${enable_bmpbutton+set}" = set; then
echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
-echo "configure:5362: checking for --enable-calendar" >&5
+echo "configure:5829: checking for --enable-calendar" >&5
no_cache=0
# Check whether --enable-calendar or --disable-calendar was given.
if test "${enable_calendar+set}" = set; then
echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6
-echo "configure:5401: checking for --enable-caret" >&5
+echo "configure:5868: checking for --enable-caret" >&5
no_cache=0
# Check whether --enable-caret or --disable-caret was given.
if test "${enable_caret+set}" = set; then
echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6
-echo "configure:5440: checking for --enable-checkbox" >&5
+echo "configure:5907: checking for --enable-checkbox" >&5
no_cache=0
# Check whether --enable-checkbox or --disable-checkbox was given.
if test "${enable_checkbox+set}" = set; then
echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
-echo "configure:5479: checking for --enable-checklst" >&5
+echo "configure:5946: checking for --enable-checklst" >&5
no_cache=0
# Check whether --enable-checklst or --disable-checklst was given.
if test "${enable_checklst+set}" = set; then
echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
-echo "configure:5518: checking for --enable-choice" >&5
+echo "configure:5985: checking for --enable-choice" >&5
no_cache=0
# Check whether --enable-choice or --disable-choice was given.
if test "${enable_choice+set}" = set; then
echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
-echo "configure:5557: checking for --enable-combobox" >&5
+echo "configure:6024: checking for --enable-combobox" >&5
no_cache=0
# Check whether --enable-combobox or --disable-combobox was given.
if test "${enable_combobox+set}" = set; then
echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
-echo "configure:5596: checking for --enable-gauge" >&5
+echo "configure:6063: checking for --enable-gauge" >&5
no_cache=0
# Check whether --enable-gauge or --disable-gauge was given.
if test "${enable_gauge+set}" = set; then
echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
-echo "configure:5635: checking for --enable-grid" >&5
+echo "configure:6102: checking for --enable-grid" >&5
no_cache=0
# Check whether --enable-grid or --disable-grid was given.
if test "${enable_grid+set}" = set; then
echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
-echo "configure:5674: checking for --enable-newgrid" >&5
+echo "configure:6141: checking for --enable-newgrid" >&5
no_cache=0
# Check whether --enable-newgrid or --disable-newgrid was given.
if test "${enable_newgrid+set}" = set; then
echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
-echo "configure:5713: checking for --enable-imaglist" >&5
+echo "configure:6180: checking for --enable-imaglist" >&5
no_cache=0
# Check whether --enable-imaglist or --disable-imaglist was given.
if test "${enable_imaglist+set}" = set; then
echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
-echo "configure:5752: checking for --enable-listbox" >&5
+echo "configure:6219: checking for --enable-listbox" >&5
no_cache=0
# Check whether --enable-listbox or --disable-listbox was given.
if test "${enable_listbox+set}" = set; then
echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
-echo "configure:5791: checking for --enable-listctrl" >&5
+echo "configure:6258: checking for --enable-listctrl" >&5
no_cache=0
# Check whether --enable-listctrl or --disable-listctrl was given.
if test "${enable_listctrl+set}" = set; then
echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
-echo "configure:5830: checking for --enable-notebook" >&5
+echo "configure:6297: checking for --enable-notebook" >&5
no_cache=0
# Check whether --enable-notebook or --disable-notebook was given.
if test "${enable_notebook+set}" = set; then
echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6
-echo "configure:5869: checking for --enable-propsheet" >&5
+echo "configure:6336: checking for --enable-propsheet" >&5
no_cache=0
# Check whether --enable-propsheet or --disable-propsheet was given.
if test "${enable_propsheet+set}" = set; then
echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
-echo "configure:5908: checking for --enable-radiobox" >&5
+echo "configure:6375: checking for --enable-radiobox" >&5
no_cache=0
# Check whether --enable-radiobox or --disable-radiobox was given.
if test "${enable_radiobox+set}" = set; then
echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
-echo "configure:5947: checking for --enable-radiobtn" >&5
+echo "configure:6414: checking for --enable-radiobtn" >&5
no_cache=0
# Check whether --enable-radiobtn or --disable-radiobtn was given.
if test "${enable_radiobtn+set}" = set; then
echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
-echo "configure:5986: checking for --enable-sash" >&5
+echo "configure:6453: checking for --enable-sash" >&5
no_cache=0
# Check whether --enable-sash or --disable-sash was given.
if test "${enable_sash+set}" = set; then
echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
-echo "configure:6025: checking for --enable-scrollbar" >&5
+echo "configure:6492: checking for --enable-scrollbar" >&5
no_cache=0
# Check whether --enable-scrollbar or --disable-scrollbar was given.
if test "${enable_scrollbar+set}" = set; then
echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
-echo "configure:6064: checking for --enable-slider" >&5
+echo "configure:6531: checking for --enable-slider" >&5
no_cache=0
# Check whether --enable-slider or --disable-slider was given.
if test "${enable_slider+set}" = set; then
echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
-echo "configure:6103: checking for --enable-spinbtn" >&5
+echo "configure:6570: checking for --enable-spinbtn" >&5
no_cache=0
# Check whether --enable-spinbtn or --disable-spinbtn was given.
if test "${enable_spinbtn+set}" = set; then
echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
-echo "configure:6142: checking for --enable-spinctrl" >&5
+echo "configure:6609: checking for --enable-spinctrl" >&5
no_cache=0
# Check whether --enable-spinctrl or --disable-spinctrl was given.
if test "${enable_spinctrl+set}" = set; then
echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
-echo "configure:6181: checking for --enable-splitter" >&5
+echo "configure:6648: checking for --enable-splitter" >&5
no_cache=0
# Check whether --enable-splitter or --disable-splitter was given.
if test "${enable_splitter+set}" = set; then
echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
-echo "configure:6220: checking for --enable-statbmp" >&5
+echo "configure:6687: checking for --enable-statbmp" >&5
no_cache=0
# Check whether --enable-statbmp or --disable-statbmp was given.
if test "${enable_statbmp+set}" = set; then
echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
-echo "configure:6259: checking for --enable-statbox" >&5
+echo "configure:6726: checking for --enable-statbox" >&5
no_cache=0
# Check whether --enable-statbox or --disable-statbox was given.
if test "${enable_statbox+set}" = set; then
echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6
-echo "configure:6298: checking for --enable-statline" >&5
+echo "configure:6765: checking for --enable-statline" >&5
no_cache=0
# Check whether --enable-statline or --disable-statline was given.
if test "${enable_statline+set}" = set; then
echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6
-echo "configure:6337: checking for --enable-stattext" >&5
+echo "configure:6804: checking for --enable-stattext" >&5
no_cache=0
# Check whether --enable-stattext or --disable-stattext was given.
if test "${enable_stattext+set}" = set; then
echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6
-echo "configure:6376: checking for --enable-statusbar" >&5
+echo "configure:6843: checking for --enable-statusbar" >&5
no_cache=0
# Check whether --enable-statusbar or --disable-statusbar was given.
if test "${enable_statusbar+set}" = set; then
echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6
-echo "configure:6415: checking for --enable-tabdialog" >&5
+echo "configure:6882: checking for --enable-tabdialog" >&5
no_cache=0
# Check whether --enable-tabdialog or --disable-tabdialog was given.
if test "${enable_tabdialog+set}" = set; then
echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6
-echo "configure:6454: checking for --enable-textctrl" >&5
+echo "configure:6921: checking for --enable-textctrl" >&5
no_cache=0
# Check whether --enable-textctrl or --disable-textctrl was given.
if test "${enable_textctrl+set}" = set; then
echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6
-echo "configure:6493: checking for --enable-togglebtn" >&5
+echo "configure:6960: checking for --enable-togglebtn" >&5
no_cache=0
# Check whether --enable-togglebtn or --disable-togglebtn was given.
if test "${enable_togglebtn+set}" = set; then
echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6
-echo "configure:6532: checking for --enable-toolbar" >&5
+echo "configure:6999: checking for --enable-toolbar" >&5
no_cache=0
# Check whether --enable-toolbar or --disable-toolbar was given.
if test "${enable_toolbar+set}" = set; then
echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6
-echo "configure:6571: checking for --enable-tbarnative" >&5
+echo "configure:7038: checking for --enable-tbarnative" >&5
no_cache=0
# Check whether --enable-tbarnative or --disable-tbarnative was given.
if test "${enable_tbarnative+set}" = set; then
echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6
-echo "configure:6610: checking for --enable-tbarsmpl" >&5
+echo "configure:7077: checking for --enable-tbarsmpl" >&5
no_cache=0
# Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
if test "${enable_tbarsmpl+set}" = set; then
echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6
-echo "configure:6649: checking for --enable-treectrl" >&5
+echo "configure:7116: checking for --enable-treectrl" >&5
no_cache=0
# Check whether --enable-treectrl or --disable-treectrl was given.
if test "${enable_treectrl+set}" = set; then
fi
+ echo $ac_n "checking for --enable-tipwindow""... $ac_c" 1>&6
+echo "configure:7155: checking for --enable-tipwindow" >&5
+ no_cache=0
+ # Check whether --enable-tipwindow or --disable-tipwindow was given.
+if test "${enable_tipwindow+set}" = set; then
+ enableval="$enable_tipwindow"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
+ else
+ ac_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_TIPWINDOW" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_tipwindow='wxUSE_TIPWINDOW='$DEFAULT_wxUSE_TIPWINDOW
+
+fi
+
+
+ eval "$ac_cv_use_tipwindow"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_TIPWINDOW" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6
-echo "configure:6688: checking for --enable-popupwin" >&5
+echo "configure:7194: checking for --enable-popupwin" >&5
no_cache=0
# Check whether --enable-popupwin or --disable-popupwin was given.
if test "${enable_popupwin+set}" = set; then
echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6
-echo "configure:6729: checking for --enable-commondlg" >&5
+echo "configure:7235: checking for --enable-commondlg" >&5
no_cache=0
# Check whether --enable-commondlg or --disable-commondlg was given.
if test "${enable_commondlg+set}" = set; then
echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6
-echo "configure:6768: checking for --enable-choicedlg" >&5
+echo "configure:7274: checking for --enable-choicedlg" >&5
no_cache=0
# Check whether --enable-choicedlg or --disable-choicedlg was given.
if test "${enable_choicedlg+set}" = set; then
echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6
-echo "configure:6807: checking for --enable-coldlg" >&5
+echo "configure:7313: checking for --enable-coldlg" >&5
no_cache=0
# Check whether --enable-coldlg or --disable-coldlg was given.
if test "${enable_coldlg+set}" = set; then
echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
-echo "configure:6846: checking for --enable-filedlg" >&5
+echo "configure:7352: checking for --enable-filedlg" >&5
no_cache=0
# Check whether --enable-filedlg or --disable-filedlg was given.
if test "${enable_filedlg+set}" = set; then
echo $ac_n "checking for --enable-finddlg""... $ac_c" 1>&6
-echo "configure:6885: checking for --enable-finddlg" >&5
+echo "configure:7391: checking for --enable-finddlg" >&5
no_cache=0
# Check whether --enable-finddlg or --disable-finddlg was given.
if test "${enable_finddlg+set}" = set; then
echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6
-echo "configure:6924: checking for --enable-fontdlg" >&5
+echo "configure:7430: checking for --enable-fontdlg" >&5
no_cache=0
# Check whether --enable-fontdlg or --disable-fontdlg was given.
if test "${enable_fontdlg+set}" = set; then
echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6
-echo "configure:6963: checking for --enable-dirdlg" >&5
+echo "configure:7469: checking for --enable-dirdlg" >&5
no_cache=0
# Check whether --enable-dirdlg or --disable-dirdlg was given.
if test "${enable_dirdlg+set}" = set; then
echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
-echo "configure:7002: checking for --enable-msgdlg" >&5
+echo "configure:7508: checking for --enable-msgdlg" >&5
no_cache=0
# Check whether --enable-msgdlg or --disable-msgdlg was given.
if test "${enable_msgdlg+set}" = set; then
echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
-echo "configure:7041: checking for --enable-numberdlg" >&5
+echo "configure:7547: checking for --enable-numberdlg" >&5
no_cache=0
# Check whether --enable-numberdlg or --disable-numberdlg was given.
if test "${enable_numberdlg+set}" = set; then
echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6
-echo "configure:7080: checking for --enable-splash" >&5
+echo "configure:7586: checking for --enable-splash" >&5
no_cache=0
# Check whether --enable-splash or --disable-splash was given.
if test "${enable_splash+set}" = set; then
echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6
-echo "configure:7119: checking for --enable-textdlg" >&5
+echo "configure:7625: checking for --enable-textdlg" >&5
no_cache=0
# Check whether --enable-textdlg or --disable-textdlg was given.
if test "${enable_textdlg+set}" = set; then
echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
-echo "configure:7158: checking for --enable-tipdlg" >&5
+echo "configure:7664: checking for --enable-tipdlg" >&5
no_cache=0
# Check whether --enable-tipdlg or --disable-tipdlg was given.
if test "${enable_tipdlg+set}" = set; then
echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
-echo "configure:7197: checking for --enable-progressdlg" >&5
+echo "configure:7703: checking for --enable-progressdlg" >&5
no_cache=0
# Check whether --enable-progressdlg or --disable-progressdlg was given.
if test "${enable_progressdlg+set}" = set; then
echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6
-echo "configure:7236: checking for --enable-wizarddlg" >&5
+echo "configure:7742: checking for --enable-wizarddlg" >&5
no_cache=0
# Check whether --enable-wizarddlg or --disable-wizarddlg was given.
if test "${enable_wizarddlg+set}" = set; then
echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6
-echo "configure:7277: checking for --enable-menus" >&5
+echo "configure:7783: checking for --enable-menus" >&5
no_cache=0
# Check whether --enable-menus or --disable-menus was given.
if test "${enable_menus+set}" = set; then
echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6
-echo "configure:7316: checking for --enable-miniframe" >&5
+echo "configure:7822: checking for --enable-miniframe" >&5
no_cache=0
# Check whether --enable-miniframe or --disable-miniframe was given.
if test "${enable_miniframe+set}" = set; then
echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6
-echo "configure:7355: checking for --enable-tooltips" >&5
+echo "configure:7861: checking for --enable-tooltips" >&5
no_cache=0
# Check whether --enable-tooltips or --disable-tooltips was given.
if test "${enable_tooltips+set}" = set; then
echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
-echo "configure:7394: checking for --enable-splines" >&5
+echo "configure:7900: checking for --enable-splines" >&5
no_cache=0
# Check whether --enable-splines or --disable-splines was given.
if test "${enable_splines+set}" = set; then
echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
-echo "configure:7433: checking for --enable-validators" >&5
+echo "configure:7939: checking for --enable-validators" >&5
no_cache=0
# Check whether --enable-validators or --disable-validators was given.
if test "${enable_validators+set}" = set; then
echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
-echo "configure:7472: checking for --enable-busyinfo" >&5
+echo "configure:7978: checking for --enable-busyinfo" >&5
no_cache=0
# Check whether --enable-busyinfo or --disable-busyinfo was given.
if test "${enable_busyinfo+set}" = set; then
echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
-echo "configure:7511: checking for --enable-joystick" >&5
+echo "configure:8017: checking for --enable-joystick" >&5
no_cache=0
# Check whether --enable-joystick or --disable-joystick was given.
if test "${enable_joystick+set}" = set; then
echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
-echo "configure:7550: checking for --enable-metafile" >&5
+echo "configure:8056: checking for --enable-metafile" >&5
no_cache=0
# Check whether --enable-metafile or --disable-metafile was given.
if test "${enable_metafile+set}" = set; then
echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6
-echo "configure:7589: checking for --enable-dragimage" >&5
+echo "configure:8095: checking for --enable-dragimage" >&5
no_cache=0
# Check whether --enable-dragimage or --disable-dragimage was given.
if test "${enable_dragimage+set}" = set; then
echo $ac_n "checking for --enable-palette""... $ac_c" 1>&6
-echo "configure:7630: checking for --enable-palette" >&5
+echo "configure:8136: checking for --enable-palette" >&5
no_cache=0
# Check whether --enable-palette or --disable-palette was given.
if test "${enable_palette+set}" = set; then
echo $ac_n "checking for --enable-image""... $ac_c" 1>&6
-echo "configure:7669: checking for --enable-image" >&5
+echo "configure:8175: checking for --enable-image" >&5
no_cache=0
# Check whether --enable-image or --disable-image was given.
if test "${enable_image+set}" = set; then
echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
-echo "configure:7708: checking for --enable-gif" >&5
+echo "configure:8214: checking for --enable-gif" >&5
no_cache=0
# Check whether --enable-gif or --disable-gif was given.
if test "${enable_gif+set}" = set; then
echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
-echo "configure:7747: checking for --enable-pcx" >&5
+echo "configure:8253: checking for --enable-pcx" >&5
no_cache=0
# Check whether --enable-pcx or --disable-pcx was given.
if test "${enable_pcx+set}" = set; then
echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
-echo "configure:7786: checking for --enable-pnm" >&5
+echo "configure:8292: checking for --enable-pnm" >&5
no_cache=0
# Check whether --enable-pnm or --disable-pnm was given.
if test "${enable_pnm+set}" = set; then
echo $ac_n "checking for --enable-xpm""... $ac_c" 1>&6
-echo "configure:7825: checking for --enable-xpm" >&5
+echo "configure:8331: checking for --enable-xpm" >&5
no_cache=0
# Check whether --enable-xpm or --disable-xpm was given.
if test "${enable_xpm+set}" = set; then
echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:7872: checking for toolkit" >&5
+echo "configure:8378: checking for toolkit" >&5
if test "$wxUSE_GUI" = "yes"; then
fi
NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} \
- + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0}`
+ + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0}`
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
if test "$build" != "$host" ; then
- if test "$USE_WIN32" = 1 ; then
+ if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 ; then
CC=$host_alias-gcc
CXX=$host_alias-c++
AR=$host_alias-ar
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8010: checking for $ac_word" >&5
+echo "configure:8516: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8040: checking for $ac_word" >&5
+echo "configure:8546: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8091: checking for $ac_word" >&5
+echo "configure:8597: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:8123: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:8629: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
cat > conftest.$ac_ext << EOF
-#line 8134 "configure"
+#line 8640 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:8139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:8165: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8671: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:8170: checking whether we are using GNU C" >&5
+echo "configure:8676: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:8179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:8685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:8198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:8704: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:8233: checking how to run the C preprocessor" >&5
+echo "configure:8739: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 8248 "configure"
+#line 8754 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 8265 "configure"
+#line 8771 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 8282 "configure"
+#line 8788 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:8314: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:8820: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 8320 "configure"
+#line 8826 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 8338 "configure"
+#line 8844 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8374: checking for $ac_word" >&5
+echo "configure:8880: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:8406: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:8912: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
cat > conftest.$ac_ext << EOF
-#line 8417 "configure"
+#line 8923 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:8422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:8448: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8954: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:8453: checking whether we are using GNU C++" >&5
+echo "configure:8959: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:8481: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:8987: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8526: checking for $ac_word" >&5
+echo "configure:9032: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8557: checking for $ac_word" >&5
+echo "configure:9063: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:8597: checking for a BSD compatible install" >&5
+echo "configure:9103: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8662: checking for $ac_word" >&5
+echo "configure:9168: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6
-echo "configure:8691: checking make for VPATH support" >&5
+echo "configure:9197: checking make for VPATH support" >&5
cat - << EOF > confMake
check : file
cp \$? \$@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8728: checking for $ac_word" >&5
+echo "configure:9234: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8762: checking for $ac_word" >&5
+echo "configure:9268: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:8796: checking for yywrap in -l$ac_lib" >&5
+echo "configure:9302: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8804 "configure"
+#line 9310 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
yywrap()
; return 0; }
EOF
-if { (eval echo configure:8815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:8839: checking whether ln -s works" >&5
+echo "configure:9345: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for regex.h""... $ac_c" 1>&6
-echo "configure:8991: checking for regex.h" >&5
+echo "configure:9497: checking for regex.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8996 "configure"
+#line 9502 "configure"
#include "confdefs.h"
#include <regex.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
for ac_func in regcomp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9020: checking for $ac_func" >&5
+echo "configure:9526: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9025 "configure"
+#line 9531 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:9048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:9106: checking for zlib.h" >&5
+echo "configure:9612: checking for zlib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9111 "configure"
+#line 9617 "configure"
#include "confdefs.h"
#include <zlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:9133: checking for deflate in -lz" >&5
+echo "configure:9639: checking for deflate in -lz" >&5
ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9141 "configure"
+#line 9647 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
deflate()
; return 0; }
EOF
-if { (eval echo configure:9152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:9211: checking for png.h" >&5
+echo "configure:9717: checking for png.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9216 "configure"
+#line 9722 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
-echo "configure:9238: checking for png_check_sig in -lpng" >&5
+echo "configure:9744: checking for png_check_sig in -lpng" >&5
ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lpng -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9246 "configure"
+#line 9752 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
png_check_sig()
; return 0; }
EOF
-if { (eval echo configure:9257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:9313: checking for jpeglib.h" >&5
+echo "configure:9819: checking for jpeglib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9318 "configure"
+#line 9824 "configure"
#include "confdefs.h"
#undef HAVE_STDLIB_H
; return 0; }
EOF
-if { (eval echo configure:9330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_jpeglib_h=yes
else
if test "$ac_cv_header_jpeglib_h" = "yes"; then
echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:9348: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:9854: checking for jpeg_read_header in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9356 "configure"
+#line 9862 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jpeg_read_header()
; return 0; }
EOF
-if { (eval echo configure:9367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:9418: checking for tiffio.h" >&5
+echo "configure:9924: checking for tiffio.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9423 "configure"
+#line 9929 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6
-echo "configure:9445: checking for TIFFError in -ltiff" >&5
+echo "configure:9951: checking for TIFFError in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ltiff -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9453 "configure"
+#line 9959 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
TIFFError()
; return 0; }
EOF
-if { (eval echo configure:9464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$wxUSE_FREETYPE" = "sys" -o "$wxUSE_FREETYPE" = "yes" ; then
ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
-echo "configure:9519: checking for freetype.h" >&5
+echo "configure:10025: checking for freetype.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9524 "configure"
+#line 10030 "configure"
#include "confdefs.h"
#include <freetype.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6
-echo "configure:9546: checking for FT_Render_Glyph in -lfreetype" >&5
+echo "configure:10052: checking for FT_Render_Glyph in -lfreetype" >&5
ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lfreetype -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9554 "configure"
+#line 10060 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
FT_Render_Glyph()
; return 0; }
EOF
-if { (eval echo configure:9565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9620: checking for $ac_hdr" >&5
+echo "configure:10126: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9625 "configure"
+#line 10131 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for windows.h""... $ac_c" 1>&6
-echo "configure:9658: checking for windows.h" >&5
+echo "configure:10164: checking for windows.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9663 "configure"
+#line 10169 "configure"
#include "confdefs.h"
#include <windows.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6
-echo "configure:9694: checking if w32api has good enough MSIE support" >&5
+echo "configure:10200: checking if w32api has good enough MSIE support" >&5
if eval "test \"`echo '$''{'wx_cv_w32api_win32_ie'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9700 "configure"
+#line 10206 "configure"
#include "confdefs.h"
#include <w32api.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:9716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_w32api_win32_ie=yes
esac
if test "$wxUSE_ODBC" = "yes" ; then
- LIBS=" -lodbc32 -lole32 -loleaut32$LIBS"
+ LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
fi
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
if test "$wxUSE_GTK" = 1; then
echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
-echo "configure:9775: checking for GTK+ version" >&5
+echo "configure:10281: checking for GTK+ version" >&5
gtk_version_cached=1
if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
gtk_version_cached=0
echo "$ac_t""" 1>&6
+ GTK_MODULES=
+ if test "$wxUSE_THREADS" = "yes"; then
+ GTK_MODULES=gthread
+ fi
+
wx_cv_lib_gtk=
if test "x$wxUSE_GTK2" = "xyes"; then
# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
fi
- for module in .
+ for module in . $GTK_MODULES
do
case "$module" in
gthread)
# Extract the first word of "gtk-config-2.0", so it can be a program name with args.
set dummy gtk-config-2.0; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9837: checking for $ac_word" >&5
+echo "configure:10348: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
min_gtk_version=1.3.1
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:9872: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:10383: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG_2_0" = "no" ; then
no_gtk=yes
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 9895 "configure"
+#line 10406 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:9973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10007 "configure"
+#line 10518 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
; return 0; }
EOF
-if { (eval echo configure:10017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK or finding the wrong"
fi
GTK_CFLAGS=""
GTK_LIBS=""
- gthread
+ :
fi
fi
if test -z "$wx_cv_lib_gtk"; then
-
+ # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+if test "${with_gtk_prefix+set}" = set; then
+ withval="$with_gtk_prefix"
+ gtk_config_prefix="$withval"
+else
+ gtk_config_prefix=""
+fi
+
+# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
+if test "${with_gtk_exec_prefix+set}" = set; then
+ withval="$with_gtk_exec_prefix"
+ gtk_config_exec_prefix="$withval"
+else
+ gtk_config_exec_prefix=""
+fi
+
+# Check whether --enable-gtktest or --disable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then
+ enableval="$enable_gtktest"
+ :
+else
+ enable_gtktest=yes
+fi
+
+
+ for module in . $GTK_MODULES
+ do
+ case "$module" in
+ gthread)
+ gtk_config_args="$gtk_config_args gthread"
+ ;;
+ esac
+ done
+
if test x$gtk_config_exec_prefix != x ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
if test x${GTK_CONFIG+set} != xset ; then
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:10075: checking for $ac_word" >&5
+echo "configure:10619: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
min_gtk_version=1.2.7
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:10110: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:10654: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
- if test "$GTK_CONFIG" != "no" ; then
- GTK_CFLAGS=`$GTK_CONFIG --cflags`
- GTK_LIBS=`$GTK_CONFIG --libs gthread`
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
- if test "$cross_compiling" = yes; then
+ if test "$GTK_CONFIG" = "no" ; then
+ no_gtk=yes
+ else
+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+ if test "x$enable_gtktest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$GTK_LIBS $LIBS"
+ rm -f conf.gtktest
+ if test "$cross_compiling" = yes; then
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 10123 "configure"
+#line 10677 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
-#include <gtk/gtkfeatures.h>
#include <stdio.h>
#include <stdlib.h>
-int
+int
main ()
{
int major, minor, micro;
+ char *tmp_version;
- if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_gtk_version");
- exit(1);
- }
+ system ("touch conf.gtktest");
- if ((GTK_MAJOR_VERSION != gtk_major_version) ||
- (GTK_MINOR_VERSION != gtk_minor_version) ||
- (GTK_MICRO_VERSION != gtk_micro_version)) {
- printf("Headers vs. library version mismatch!\n");
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_gtk_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
+ printf("%s, bad version string\n", "$min_gtk_version");
exit(1);
}
- if (gtk_minor_version == 1) return FALSE;
-
- return !((gtk_major_version > major) ||
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+ if ((gtk_major_version != $gtk_config_major_version) ||
+ (gtk_minor_version != $gtk_config_minor_version) ||
+ (gtk_micro_version != $gtk_config_micro_version))
+ {
+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf ("*** was found! If gtk-config was correct, then it is best\n");
+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+ printf("*** required on your system.\n");
+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+ printf("*** before re-running configure\n");
+ }
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+ (gtk_minor_version != GTK_MINOR_VERSION) ||
+ (gtk_micro_version != GTK_MICRO_VERSION))
+ {
+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+ printf("*** library (version %d.%d.%d)\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+ else
+ {
+ if ((gtk_major_version > major) ||
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+ {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+ major, minor, micro);
+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+ printf("***\n");
+ printf("*** If you have already installed a sufficiently new version, this error\n");
+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+ printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** so that the correct libraries are found at run-time))\n");
+ }
+ }
+ return 1;
}
EOF
-if { (eval echo configure:10156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
rm -fr conftest*
fi
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- else
- no_gtk=yes
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
fi
if test "x$no_gtk" = x ; then
echo "$ac_t""yes" 1>&6
- wx_cv_lib_gtk=1.2.7
+ wx_cv_lib_gtk=1.2.7
else
echo "$ac_t""no" 1>&6
+ if test "$GTK_CONFIG" = "no" ; then
+ echo "*** The gtk-config script installed by GTK could not be found"
+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+ echo "*** your path, or set the GTK_CONFIG environment variable to the"
+ echo "*** full path to gtk-config."
+ else
+ if test -f conf.gtktest ; then
+ :
+ else
+ echo "*** Could not run GTK test program, checking why..."
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+ cat > conftest.$ac_ext <<EOF
+#line 10789 "configure"
+#include "confdefs.h"
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+int main() {
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
+; return 0; }
+EOF
+if { (eval echo configure:10799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GTK or finding the wrong"
+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+ echo "***"
+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+ echo "*** came with the system with the command"
+ echo "***"
+ echo "*** rpm --erase --nodeps gtk gtk-devel"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+ echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
+fi
+rm -f conftest*
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
GTK_CFLAGS=""
GTK_LIBS=""
:
fi
+ rm -f conf.gtktest
fi
if test -z "$wx_cv_lib_gtk"; then
-
+ # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+if test "${with_gtk_prefix+set}" = set; then
+ withval="$with_gtk_prefix"
+ gtk_config_prefix="$withval"
+else
+ gtk_config_prefix=""
+fi
+
+# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
+if test "${with_gtk_exec_prefix+set}" = set; then
+ withval="$with_gtk_exec_prefix"
+ gtk_config_exec_prefix="$withval"
+else
+ gtk_config_exec_prefix=""
+fi
+
+# Check whether --enable-gtktest or --disable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then
+ enableval="$enable_gtktest"
+ :
+else
+ enable_gtktest=yes
+fi
+
+
+ for module in . $GTK_MODULES
+ do
+ case "$module" in
+ gthread)
+ gtk_config_args="$gtk_config_args gthread"
+ ;;
+ esac
+ done
+
if test x$gtk_config_exec_prefix != x ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
if test x${GTK_CONFIG+set} != xset ; then
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:10205: checking for $ac_word" >&5
+echo "configure:10890: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
min_gtk_version=1.2.3
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:10240: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:10925: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
- if test "$GTK_CONFIG" != "no" ; then
- GTK_CFLAGS=`$GTK_CONFIG --cflags`
- GTK_LIBS=`$GTK_CONFIG --libs gthread`
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
- if test "$cross_compiling" = yes; then
+ if test "$GTK_CONFIG" = "no" ; then
+ no_gtk=yes
+ else
+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+ if test "x$enable_gtktest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$GTK_LIBS $LIBS"
+ rm -f conf.gtktest
+ if test "$cross_compiling" = yes; then
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 10253 "configure"
+#line 10948 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
-#include <gtk/gtkfeatures.h>
#include <stdio.h>
#include <stdlib.h>
-int
+int
main ()
{
int major, minor, micro;
+ char *tmp_version;
- if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) {
+ system ("touch conf.gtktest");
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_gtk_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
printf("%s, bad version string\n", "$min_gtk_version");
exit(1);
}
- if ((GTK_MAJOR_VERSION != gtk_major_version) ||
- (GTK_MINOR_VERSION != gtk_minor_version) ||
- (GTK_MICRO_VERSION != gtk_micro_version)) {
- printf("Headers vs. library version mismatch!\n");
- exit(1);
- }
+ if ((gtk_major_version != $gtk_config_major_version) ||
+ (gtk_minor_version != $gtk_config_minor_version) ||
+ (gtk_micro_version != $gtk_config_micro_version))
+ {
+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf ("*** was found! If gtk-config was correct, then it is best\n");
+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+ printf("*** required on your system.\n");
+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+ printf("*** before re-running configure\n");
+ }
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+ (gtk_minor_version != GTK_MINOR_VERSION) ||
+ (gtk_micro_version != GTK_MICRO_VERSION))
+ {
+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+ printf("*** library (version %d.%d.%d)\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+ else
+ {
+ if ((gtk_major_version > major) ||
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+ {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+ major, minor, micro);
+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+ printf("***\n");
+ printf("*** If you have already installed a sufficiently new version, this error\n");
+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+ printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** so that the correct libraries are found at run-time))\n");
+ }
+ }
+ return 1;
+}
+
+EOF
+if { (eval echo configure:11026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ :
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ no_gtk=yes
+fi
+rm -fr conftest*
+fi
- if (gtk_minor_version == 1) return FALSE;
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ if test "x$no_gtk" = x ; then
+ echo "$ac_t""yes" 1>&6
+ wx_cv_lib_gtk=1.2.3
+ else
+ echo "$ac_t""no" 1>&6
+ if test "$GTK_CONFIG" = "no" ; then
+ echo "*** The gtk-config script installed by GTK could not be found"
+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+ echo "*** your path, or set the GTK_CONFIG environment variable to the"
+ echo "*** full path to gtk-config."
+ else
+ if test -f conf.gtktest ; then
+ :
+ else
+ echo "*** Could not run GTK test program, checking why..."
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+ cat > conftest.$ac_ext <<EOF
+#line 11060 "configure"
+#include "confdefs.h"
- return !((gtk_major_version > major) ||
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
-}
+#include <gtk/gtk.h>
+#include <stdio.h>
+int main() {
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
+; return 0; }
EOF
-if { (eval echo configure:10286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- :
+if { (eval echo configure:11070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GTK or finding the wrong"
+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+ echo "***"
+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+ echo "*** came with the system with the command"
+ echo "***"
+ echo "*** rpm --erase --nodeps gtk gtk-devel"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
- rm -fr conftest*
- no_gtk=yes
-fi
-rm -fr conftest*
+ rm -rf conftest*
+ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+ echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
fi
-
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- else
- no_gtk=yes
- fi
- if test "x$no_gtk" = x ; then
- echo "$ac_t""yes" 1>&6
- wx_cv_lib_gtk=1.2.3
- else
- echo "$ac_t""no" 1>&6
+rm -f conftest*
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
GTK_CFLAGS=""
GTK_LIBS=""
:
fi
+ rm -f conf.gtktest
fi
GUIDIST=GTK_DIST
echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:10357: checking for gdk_im_open in -lgdk" >&5
+echo "configure:11150: checking for gdk_im_open in -lgdk" >&5
ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lgdk $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10365 "configure"
+#line 11158 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
gdk_im_open()
; return 0; }
EOF
-if { (eval echo configure:10376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
if test "$wxUSE_MGL" = 1; then
-
echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
-echo "configure:10404: checking for SciTech MGL library" >&5
+echo "configure:11196: checking for SciTech MGL library" >&5
if test "x$MGL_ROOT" = x ; then
echo "$ac_t""not found" 1>&6
{ echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; }
echo "$ac_t""$MGL_ROOT" 1>&6
fi
- mgl_os=linux/gcc/glibc
+ case "${host}" in
+ *-*-linux* )
+ mgl_os=linux/gcc/glibc
+ ;;
+ *-pc-msdosdjgpp )
+ mgl_os=dos32/dj2
+ ;;
+ *)
+ { echo "configure: error: This system type ${host} is not yet supported by wxMGL." 1>&2; exit 1; }
+ esac
+
mgl_lib_type=""
if test "$wxUSE_DEBUG_FLAG" = yes ; then
GUIDIST=MGL_DIST
fi
+ if test "$wxUSE_MICROWIN" = 1; then
+ echo $ac_n "checking for MicroWindows""... $ac_c" 1>&6
+echo "configure:11242: checking for MicroWindows" >&5
+ if test "x$MICROWINDOWS" = x ; then
+ echo "$ac_t""not found" 1>&6
+ { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." 1>&2; exit 1; }
+ else
+ echo "$ac_t""$MICROWINDOWS" 1>&6
+ fi
+
+ if test -f $MICROWINDOWS/lib/libmwin.a; then
+ echo "$ac_t""MicroWindows' libraries found." 1>&6
+ else
+ { echo "configure: error: Cannot find MicroWindows libraries, make sure they are compiled." 1>&2; exit 1; }
+ fi
+
+ TOOLKIT_INCLUDE="-I$MICROWINDOWS/include"
+ GUI_TK_LIBRARY="-L$MICROWINDOWS/lib -lmwin -lmwengine -mwfonts -mwdrivers -mwinlib"
+
+ AFMINSTALL=afminstall
+ TOOLKIT=MICROWIN
+ GUIDIST=MICROWIN_DIST
+
+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__ -D__WXMSW__ -D__WIN95__ -D__WIN32__ -DMWIN -DMICROWIN_NOCONTROLS -DMICROWIN_TODO=1"
+ fi
+
if test "$wxUSE_WINE" = 1; then
ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for windows.h""... $ac_c" 1>&6
-echo "configure:10441: checking for windows.h" >&5
+echo "configure:11269: checking for windows.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10446 "configure"
+#line 11274 "configure"
#include "confdefs.h"
#include <windows.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
xpm_link=
echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:10478: checking for Xpm library" >&5
+echo "configure:11306: checking for Xpm library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
mesa_link=
echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:10506: checking for Mesa library" >&5
+echo "configure:11334: checking for Mesa library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:10539: checking for X" >&5
+echo "configure:11367: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 10601 "configure"
+#line 11429 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10675 "configure"
+#line 11503 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:10682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:10788: checking whether -R must be followed by a space" >&5
+echo "configure:11616: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 10791 "configure"
+#line 11619 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:10798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 10814 "configure"
+#line 11642 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:10821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:10853: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:11681: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10861 "configure"
+#line 11689 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:10872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:10894: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:11722: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10902 "configure"
+#line 11730 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:10913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:10942: checking for gethostbyname" >&5
+echo "configure:11770: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10947 "configure"
+#line 11775 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
; return 0; }
EOF
-if { (eval echo configure:10970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:10991: checking for gethostbyname in -lnsl" >&5
+echo "configure:11819: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10999 "configure"
+#line 11827 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:11010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:11040: checking for connect" >&5
+echo "configure:11868: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11045 "configure"
+#line 11873 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
; return 0; }
EOF
-if { (eval echo configure:11068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:11089: checking for connect in -lsocket" >&5
+echo "configure:11917: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11097 "configure"
+#line 11925 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
connect()
; return 0; }
EOF
-if { (eval echo configure:11108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:11132: checking for remove" >&5
+echo "configure:11960: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11137 "configure"
+#line 11965 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
; return 0; }
EOF
-if { (eval echo configure:11160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:11181: checking for remove in -lposix" >&5
+echo "configure:12009: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11189 "configure"
+#line 12017 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
remove()
; return 0; }
EOF
-if { (eval echo configure:11200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:11224: checking for shmat" >&5
+echo "configure:12052: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11229 "configure"
+#line 12057 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
; return 0; }
EOF
-if { (eval echo configure:11252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:11273: checking for shmat in -lipc" >&5
+echo "configure:12101: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11281 "configure"
+#line 12109 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
shmat()
; return 0; }
EOF
-if { (eval echo configure:11292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:11325: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:12153: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11333 "configure"
+#line 12161 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:11344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
COMPILED_X_PROGRAM=0
echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:11379: checking for Motif/Lesstif headers" >&5
+echo "configure:12207: checking for Motif/Lesstif headers" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
echo "$ac_t""found $ac_find_includes" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11394 "configure"
+#line 12222 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:11406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""found in default search path" 1>&6
if test "$COMPILED_X_PROGRAM" = 0; then
echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:11427: checking for Motif/Lesstif library" >&5
+echo "configure:12255: checking for Motif/Lesstif library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
echo "$ac_t""found at $ac_find_libraries" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11466 "configure"
+#line 12294 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:11478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""found in default search path" 1>&6
xpm_link=
echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:11500: checking for Xpm library" >&5
+echo "configure:12328: checking for Xpm library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
echo "$ac_t""found at $ac_find_libraries" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11532 "configure"
+#line 12360 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
; return 0; }
EOF
-if { (eval echo configure:11544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
xpm_link=" -lXpm"
ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
- if test "$TOOLKIT" != "MSW"; then
+ if test "$TOOLKIT" != "MSW" -a "$USE_DOS" != 1; then
ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
fi
ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
-echo "configure:11674: checking for GL/gl.h" >&5
+echo "configure:12502: checking for GL/gl.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11679 "configure"
+#line 12507 "configure"
#include "confdefs.h"
#include <GL/gl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for -lGL""... $ac_c" 1>&6
-echo "configure:11702: checking for -lGL" >&5
+echo "configure:12530: checking for -lGL" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6
-echo "configure:11731: checking for -lMesaGL" >&5
+echo "configure:12559: checking for -lMesaGL" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
*-*-linux* )
if test "$GCC" != "yes"; then
echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6
-echo "configure:11909: checking for Intel compiler" >&5
+echo "configure:12737: checking for Intel compiler" >&5
if eval "test \"`echo '$''{'wx_cv_prog_icc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11915 "configure"
+#line 12743 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:11926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_prog_icc=yes
else
;;
*-*-darwin* )
- CFLAGS="$CFLAGS -fno-common"
- CXXFLAGS="$CXXFLAGS -fno-common"
- SHARED_LD="$CXX -dynamiclib -o"
+ CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
+ CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
+ SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
PIC_FLAG="-dynamic -fPIC"
;;
# Extract the first word of "Rez", so it can be a program name with args.
set dummy Rez; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12051: checking for $ac_word" >&5
+echo "configure:12879: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- # Extract the first word of "Derez", so it can be a program name with args.
-set dummy Derez; ac_word=$2
+ # Extract the first word of "DeRez", so it can be a program name with args.
+set dummy DeRez; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12081: checking for $ac_word" >&5
+echo "configure:12909: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- ac_cv_prog_DEREZ="Derez"
+ ac_cv_prog_DEREZ="DeRez"
break
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez"
+ test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
fi
fi
DEREZ="$ac_cv_prog_DEREZ"
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12119: checking for $ac_hdr" >&5
+echo "configure:12947: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12124 "configure"
+#line 12952 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12161: checking for $ac_hdr" >&5
+echo "configure:12989: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 12994 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_hdr in malloc.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:13029: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12166 "configure"
+#line 13034 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12201: checking for $ac_hdr" >&5
+echo "configure:13069: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12206 "configure"
+#line 13074 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12241: checking for $ac_hdr" >&5
+echo "configure:13109: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12246 "configure"
+#line 13114 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12281: checking for $ac_hdr" >&5
+echo "configure:13149: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12286 "configure"
+#line 13154 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12321: checking for $ac_hdr" >&5
+echo "configure:13189: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12326 "configure"
+#line 13194 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12361: checking for $ac_hdr" >&5
+echo "configure:13229: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12366 "configure"
+#line 13234 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12401: checking for $ac_hdr" >&5
+echo "configure:13269: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12406 "configure"
+#line 13274 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12441: checking for $ac_hdr" >&5
+echo "configure:13309: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12446 "configure"
+#line 13314 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12484: checking for $ac_hdr" >&5
+echo "configure:13352: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12489 "configure"
+#line 13357 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:12525: checking for ANSI C header files" >&5
+echo "configure:13393: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12530 "configure"
+#line 13398 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 12555 "configure"
+#line 13423 "configure"
#include "confdefs.h"
#include <string.h>
EOF
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 12573 "configure"
+#line 13441 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 12594 "configure"
+#line 13462 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:12605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:12629: checking for mode_t" >&5
+echo "configure:13497: checking for mode_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12634 "configure"
+#line 13502 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:12662: checking for off_t" >&5
+echo "configure:13530: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12667 "configure"
+#line 13535 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:12695: checking for pid_t" >&5
+echo "configure:13563: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12700 "configure"
+#line 13568 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:12728: checking for size_t" >&5
+echo "configure:13596: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12733 "configure"
+#line 13601 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:12761: checking for uid_t in sys/types.h" >&5
+echo "configure:13629: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12766 "configure"
+#line 13634 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
-echo "configure:12796: checking for wchar_t" >&5
+echo "configure:13664: checking for wchar_t" >&5
if eval "test \"`echo '$''{'wx_cv_type_wchar_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12802 "configure"
+#line 13670 "configure"
#include "confdefs.h"
#ifdef HAVE_WCHAR_H
; return 0; }
EOF
-if { (eval echo configure:12823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_wchar_t=yes
else
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6
-echo "configure:12855: checking if size_t is unsigned int" >&5
+echo "configure:13723: checking if size_t is unsigned int" >&5
if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12860 "configure"
+#line 13728 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:12873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_size_t_is_uint=no
else
else
echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
-echo "configure:12896: checking if size_t is unsigned long" >&5
+echo "configure:13764: checking if size_t is unsigned long" >&5
if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12901 "configure"
+#line 13769 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:12914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_size_t_is_ulong=no
else
echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
-echo "configure:12948: checking for pw_gecos in struct passwd" >&5
+echo "configure:13816: checking for pw_gecos in struct passwd" >&5
if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12954 "configure"
+#line 13822 "configure"
#include "confdefs.h"
#include <pwd.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:12965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_struct_pw_gecos=yes
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:12995: checking for working const" >&5
+echo "configure:13863: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13000 "configure"
+#line 13868 "configure"
#include "confdefs.h"
int main() {
/* Ultrix mips cc rejects this. */
-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;
/* SunOS 4.1.1 cc rejects this. */
char const *const *ccp;
char **p;
; return 0; }
EOF
-if { (eval echo configure:13049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:13070: checking for inline" >&5
+echo "configure:13938: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 13077 "configure"
+#line 13945 "configure"
#include "confdefs.h"
int main() {
-} int $ac_kw foo() {
+} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:13084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:13111: checking size of char" >&5
+echo "configure:13979: checking size of char" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_sizeof_char=1
else
cat > conftest.$ac_ext <<EOF
-#line 13119 "configure"
+#line 13987 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:13130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char=`cat conftestval`
else
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:13150: checking size of short" >&5
+echo "configure:14018: checking size of short" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 13158 "configure"
+#line 14026 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:13169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:13189: checking size of int *" >&5
+echo "configure:14057: checking size of int *" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_sizeof_int_p=4
else
cat > conftest.$ac_ext <<EOF
-#line 13197 "configure"
+#line 14065 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:13208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int_p=`cat conftestval`
else
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:13228: checking size of int" >&5
+echo "configure:14096: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 13236 "configure"
+#line 14104 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:13247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:13267: checking size of long" >&5
+echo "configure:14135: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 13275 "configure"
+#line 14143 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:13286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:13306: checking size of long long" >&5
+echo "configure:14174: checking size of long long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_sizeof_long_long=0
else
cat > conftest.$ac_ext <<EOF
-#line 13314 "configure"
+#line 14182 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:13325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
-echo "configure:13346: checking size of wchar_t" >&5
+echo "configure:14214: checking size of wchar_t" >&5
if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
else
cat > conftest.$ac_ext <<EOF
-#line 13356 "configure"
+#line 14224 "configure"
#include "confdefs.h"
#ifdef HAVE_WCHAR_H
}
EOF
-if { (eval echo configure:13378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
wx_cv_sizeof_wchar_t=`cat conftestval`
else
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:13401: checking whether byte ordering is bigendian" >&5
+echo "configure:14269: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 13408 "configure"
+#line 14276 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:13419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 13423 "configure"
+#line 14291 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:13434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
ac_cv_c_bigendian=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 13454 "configure"
+#line 14322 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:13467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:13495: checking how to run the C++ preprocessor" >&5
+echo "configure:14363: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 13508 "configure"
+#line 14376 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13557: checking for $ac_hdr" >&5
+echo "configure:14425: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13562 "configure"
+#line 14430 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:13615: checking if C++ compiler supports bool" >&5
+echo "configure:14483: checking if C++ compiler supports bool" >&5
if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13630 "configure"
+#line 14498 "configure"
#include "confdefs.h"
; return 0; }
EOF
-if { (eval echo configure:13642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_cpp_bool=yes
echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
-echo "configure:13680: checking for wcslen in -lc" >&5
+echo "configure:14548: checking for wcslen in -lc" >&5
ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13688 "configure"
+#line 14556 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
wcslen()
; return 0; }
EOF
-if { (eval echo configure:13699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:13725: checking for wcslen in -lw" >&5
+echo "configure:14593: checking for wcslen in -lw" >&5
ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lw $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13733 "configure"
+#line 14601 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
wcslen()
; return 0; }
EOF
-if { (eval echo configure:13744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
-echo "configure:13770: checking for wcslen in -lmsvcrt" >&5
+echo "configure:14638: checking for wcslen in -lmsvcrt" >&5
ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lmsvcrt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13778 "configure"
+#line 14646 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
wcslen()
; return 0; }
EOF
-if { (eval echo configure:13789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in wcsrtombs
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13825: checking for $ac_func" >&5
+echo "configure:14693: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13830 "configure"
+#line 14698 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:13879: checking for vprintf" >&5
+echo "configure:14747: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13884 "configure"
+#line 14752 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
; return 0; }
EOF
-if { (eval echo configure:13907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:13931: checking for _doprnt" >&5
+echo "configure:14799: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13936 "configure"
+#line 14804 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
; return 0; }
EOF
-if { (eval echo configure:13959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
-echo "configure:13989: checking for vsnprintf" >&5
+echo "configure:14857: checking for vsnprintf" >&5
if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13995 "configure"
+#line 14863 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:14020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
wx_cv_func_vsnprintf=yes
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 14031 "configure"
+#line 14899 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:14056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
wx_cv_func_vsnprintf=yes
EOF
else
- echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
+ echo "configure: warning: unsafe function vsprintf will be used instead of vsnprintf" 1>&2
fi
echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
-echo "configure:14088: checking for vsscanf" >&5
+echo "configure:14956: checking for vsscanf" >&5
if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14094 "configure"
+#line 14962 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:14117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_vsscanf=yes
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6
-echo "configure:14155: checking if iconv() takes char**" >&5
+echo "configure:15023: checking if iconv() takes char**" >&5
if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14161 "configure"
+#line 15029 "configure"
#include "confdefs.h"
#include <iconv.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:14173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_iconv_takes_char=yes
else
for ac_func in sigaction
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14206: checking for $ac_func" >&5
+echo "configure:15074: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14211 "configure"
+#line 15079 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6
-echo "configure:14275: checking for sa_handler type" >&5
+echo "configure:15143: checking for sa_handler type" >&5
if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14281 "configure"
+#line 15149 "configure"
#include "confdefs.h"
#include <signal.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:14293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_sa_handler=int
for ac_func in vfork
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14330: checking for $ac_func" >&5
+echo "configure:15198: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14335 "configure"
+#line 15203 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
done
+for ac_func in mkstemp mktemp
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:15254: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 15259 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* 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
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:15282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ break
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+
echo $ac_n "checking for statfs""... $ac_c" 1>&6
-echo "configure:14384: checking for statfs" >&5
+echo "configure:15308: checking for statfs" >&5
if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14389 "configure"
+#line 15313 "configure"
#include "confdefs.h"
#if defined(__BSD__)
; return 0; }
EOF
-if { (eval echo configure:14410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_statfs=yes
else
echo $ac_n "checking for statvfs""... $ac_c" 1>&6
-echo "configure:14437: checking for statvfs" >&5
+echo "configure:15361: checking for statvfs" >&5
if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14442 "configure"
+#line 15366 "configure"
#include "confdefs.h"
#include <sys/statvfs.h>
; return 0; }
EOF
-if { (eval echo configure:14458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_statvfs=yes
for ac_func in fcntl flock
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14492: checking for $ac_func" >&5
+echo "configure:15416: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14497 "configure"
+#line 15421 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
for ac_func in timegm
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14554: checking for $ac_func" >&5
+echo "configure:15478: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14559 "configure"
+#line 15483 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
for ac_func in putenv setenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14610: checking for $ac_func" >&5
+echo "configure:15534: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14615 "configure"
+#line 15539 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
for ac_func in nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14685: checking for $ac_func" >&5
+echo "configure:15609: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14690 "configure"
+#line 15614 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:14738: checking for nanosleep in -lposix4" >&5
+echo "configure:15662: checking for nanosleep in -lposix4" >&5
ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14746 "configure"
+#line 15670 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
nanosleep()
; return 0; }
EOF
-if { (eval echo configure:14757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in usleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14785: checking for $ac_func" >&5
+echo "configure:15709: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14790 "configure"
+#line 15714 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
for ac_func in uname gethostname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14856: checking for $ac_func" >&5
+echo "configure:15780: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14861 "configure"
+#line 15785 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
for ac_func in strtok_r
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14921: checking for $ac_func" >&5
+echo "configure:15845: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14926 "configure"
+#line 15850 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
for ac_func in inet_addr
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14989: checking for $ac_func" >&5
+echo "configure:15913: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14994 "configure"
+#line 15918 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:15017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
-echo "configure:15042: checking for inet_addr in -lnsl" >&5
+echo "configure:15966: checking for inet_addr in -lnsl" >&5
ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15050 "configure"
+#line 15974 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inet_addr()
; return 0; }
EOF
-if { (eval echo configure:15061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
-echo "configure:15080: checking for inet_addr in -lresolv" >&5
+echo "configure:16004: checking for inet_addr in -lresolv" >&5
ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15088 "configure"
+#line 16012 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inet_addr()
; return 0; }
EOF
-if { (eval echo configure:15099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in inet_aton
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15132: checking for $ac_func" >&5
+echo "configure:16056: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15137 "configure"
+#line 16061 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:15160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
-echo "configure:15185: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:16109: checking for inet_aton in -l$INET_LINK" >&5
ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$INET_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15193 "configure"
+#line 16117 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inet_aton()
; return 0; }
EOF
-if { (eval echo configure:15204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$wxUSE_THREADS" = "yes" ; then
if test "$wxUSE_WINE" = 1 ; then
- echo "configure: warning: Threads are not supported under WINE" 1>&2
+ echo "configure: warning: Threads are not supported under WINE... disabled" 1>&2
wxUSE_THREADS="no"
elif test "$USE_BEOS" = 1; then
- echo "configure: warning: BeOS threads are not yet supported" 1>&2
+ echo "configure: warning: BeOS threads are not yet supported... disabled" 1>&2
wxUSE_THREADS="no"
fi
fi
fi
echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
-echo "configure:15319: checking for pthread_create in -l$THREADS_LIB" >&5
+echo "configure:16243: checking for pthread_create in -l$THREADS_LIB" >&5
ac_lib_var=`echo $THREADS_LIB'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15327 "configure"
+#line 16251 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:15338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:15361: checking for pthread_create in -lc_r" >&5
+echo "configure:16285: checking for pthread_create in -lc_r" >&5
ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lc_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15369 "configure"
+#line 16293 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:15380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
-echo "configure:15404: checking for sys/prctl.h" >&5
+echo "configure:16328: checking for sys/prctl.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15409 "configure"
+#line 16333 "configure"
#include "confdefs.h"
#include <sys/prctl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test -z "$THREADS_OBJ" ; then
wxUSE_THREADS=no
- echo "configure: warning: No thread support on this system" 1>&2
+ echo "configure: warning: No thread support on this system... disabled" 1>&2
fi
fi
for ac_func in thr_setconcurrency
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15454: checking for $ac_func" >&5
+echo "configure:16378: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15459 "configure"
+#line 16383 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:15482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15512: checking for $ac_hdr" >&5
+echo "configure:16436: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15517 "configure"
+#line 16441 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:15550: checking for sched_yield in -l$THREADS_LINK" >&5
+echo "configure:16474: checking for sched_yield in -l$THREADS_LINK" >&5
ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15558 "configure"
+#line 16482 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_yield()
; return 0; }
EOF
-if { (eval echo configure:15569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
-echo "configure:15591: checking for sched_yield in -lposix4" >&5
+echo "configure:16515: checking for sched_yield in -lposix4" >&5
ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15599 "configure"
+#line 16523 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_yield()
; return 0; }
EOF
-if { (eval echo configure:15610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
HAVE_PRIOR_FUNCS=0
echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:15641: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+echo "configure:16565: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15649 "configure"
+#line 16573 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_attr_getschedpolicy()
; return 0; }
EOF
-if { (eval echo configure:15660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:15676: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
+echo "configure:16600: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15684 "configure"
+#line 16608 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_attr_setschedparam()
; return 0; }
EOF
-if { (eval echo configure:15695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:15711: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
+echo "configure:16635: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15719 "configure"
+#line 16643 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_get_priority_max()
; return 0; }
EOF
-if { (eval echo configure:15730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
-echo "configure:15749: checking for sched_get_priority_max in -lposix4" >&5
+echo "configure:16673: checking for sched_get_priority_max in -lposix4" >&5
ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15757 "configure"
+#line 16681 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_get_priority_max()
; return 0; }
EOF
-if { (eval echo configure:15768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:15815: checking for pthread_cancel in -l$THREADS_LINK" >&5
+echo "configure:16739: checking for pthread_cancel in -l$THREADS_LINK" >&5
ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15823 "configure"
+#line 16747 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_cancel()
; return 0; }
EOF
-if { (eval echo configure:15834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:15860: checking for pthread_cleanup_push/pop" >&5
+echo "configure:16784: checking for pthread_cleanup_push/pop" >&5
if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15866 "configure"
+#line 16790 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:15876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_pthread_cleanup_push=yes
fi
echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
-echo "configure:15908: checking for pthread_mutexattr_t" >&5
+echo "configure:16832: checking for pthread_mutexattr_t" >&5
if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15914 "configure"
+#line 16838 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:15924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_pthread_mutexattr_t=yes
else
echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
-echo "configure:15951: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+echo "configure:16875: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15957 "configure"
+#line 16881 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:15966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_pthread_rec_mutex_init=yes
EOF
- if test "$USE_DARWIN" != 1; then
- TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -D_REENTRANT"
- fi
+ TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS $CPP_MT_FLAG"
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
else
if test "$ac_cv_func_strtok_r" = "yes"; then
echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
-echo "configure:16020: checking if -D_REENTRANT is needed" >&5
+echo "configure:16942: checking if -D_REENTRANT is needed" >&5
if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
echo "$ac_t""yes" 1>&6
if test "$wxUSE_TEXTFILE" = "yes"; then
if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
- echo "configure: warning: wxTextFile requires wxFile and wxTextBuffer and won't be compiled without them" 1>&2
+ echo "configure: warning: wxTextFile requires wxFile and wxTextBuffer... disabled" 1>&2
else
cat >> confdefs.h <<\EOF
#define wxUSE_TEXTFILE 1
if test "$wxUSE_CONFIG" = "yes" ; then
if test "$wxUSE_TEXTFILE" != "yes"; then
- echo "configure: warning: wxConfig requires wxTextFile and it won't be compiled without it" 1>&2
+ echo "configure: warning: wxConfig requires wxTextFile... disabled" 1>&2
else
cat >> confdefs.h <<\EOF
#define wxUSE_CONFIG 1
if test "$wxUSE_INTL" = "yes" ; then
if test "$wxUSE_FILE" != "yes"; then
- echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2
+ echo "configure: warning: I18n code requires wxFile... disabled" 1>&2
else
cat >> confdefs.h <<\EOF
#define wxUSE_INTL 1
for ac_func in strptime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16400: checking for $ac_func" >&5
+echo "configure:17322: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16405 "configure"
+#line 17327 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:16428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
-echo "configure:16454: checking for timezone variable in <time.h>" >&5
+echo "configure:17376: checking for timezone variable in <time.h>" >&5
if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16460 "configure"
+#line 17382 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:16472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_var_timezone=timezone
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16483 "configure"
+#line 17405 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:16495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_var_timezone=_timezone
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16506 "configure"
+#line 17428 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:16518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_var_timezone=__timezone
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- { echo "configure: error: no timezone variable" 1>&2; exit 1; }
+
+ if test "$USE_DOS" = 0 ; then
+ { echo "configure: error: no timezone variable" 1>&2; exit 1; }
+ fi
+
fi
rm -f conftest*
echo "$ac_t""$wx_cv_var_timezone" 1>&6
+ if test "x$wx_cv_var_timezone" != x ; then
cat >> confdefs.h <<EOF
#define WX_TIMEZONE $wx_cv_var_timezone
EOF
+ fi
for ac_func in localtime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16553: checking for $ac_func" >&5
+echo "configure:17481: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16558 "configure"
+#line 17486 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:16581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
if test "$ac_cv_func_localtime" = "yes"; then
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:16608: checking for tm_gmtoff in struct tm" >&5
+echo "configure:17536: checking for tm_gmtoff in struct tm" >&5
if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16614 "configure"
+#line 17542 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:16626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_struct_tm_has_gmtoff=yes
for ac_func in gettimeofday ftime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16655: checking for $ac_func" >&5
+echo "configure:17583: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16660 "configure"
+#line 17588 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:16683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
if test "$ac_cv_func_gettimeofday" = "yes"; then
echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
-echo "configure:16710: checking whether gettimeofday takes two arguments" >&5
+echo "configure:17638: checking whether gettimeofday takes two arguments" >&5
if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16725 "configure"
+#line 17653 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:16738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_gettimeofday_has_2_args=yes
else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16746 "configure"
+#line 17674 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:16759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_gettimeofday_has_2_args=no
else
if test "$wxUSE_SOCKETS" = "yes"; then
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:16808: checking for socket" >&5
+echo "configure:17736: checking for socket" >&5
if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16813 "configure"
+#line 17741 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
; return 0; }
EOF
-if { (eval echo configure:16836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:16854: checking for socket in -lsocket" >&5
+echo "configure:17782: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16862 "configure"
+#line 17790 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
socket()
; return 0; }
EOF
-if { (eval echo configure:16873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$wxUSE_SOCKETS" = "yes" ; then
echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:16906: checking what is the type of the third argument of getsockname" >&5
+echo "configure:17834: checking what is the type of the third argument of getsockname" >&5
if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16921 "configure"
+#line 17849 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:16934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=socklen_t
else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16942 "configure"
+#line 17870 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:16955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=size_t
else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16963 "configure"
+#line 17891 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:16976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=int
else
if test "$wxUSE_GUI" = "yes"; then
+ if test "$TOOLKIT" = "MAC"; then
+ echo "configure: warning: Joystick not yet supported under Mac OS X... disabled" 1>&2
+ wxUSE_JOYSTICK=no
+ fi
+ if test "$TOOLKIT" = "MOTIF"; then
+ echo "configure: warning: Joystick not yet supported under Motif... disabled" 1>&2
+ wxUSE_JOYSTICK=no
+ fi
+
if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = "yes"; then
for ac_hdr in linux/joystick.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:17035: checking for $ac_hdr" >&5
+echo "configure:17972: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17040 "configure"
+#line 17977 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test "$ac_cv_header_linux_joystick_h" != "yes"; then
wxUSE_JOYSTICK=no
- echo "configure: warning: Joystick not supported by this system" 1>&2
+ echo "configure: warning: Joystick not supported by this system... disabled" 1>&2
fi
fi
fi
HAVE_DL_FUNCS=0
HAVE_SHL_FUNCS=0
- if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
+ if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
if test "$USE_DARWIN" = 1; then
HAVE_DL_FUNCS=1
else
for ac_func in dlopen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17099: checking for $ac_func" >&5
+echo "configure:18036: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17104 "configure"
+#line 18041 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:17127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:17155: checking for dlopen in -ldl" >&5
+echo "configure:18092: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 17163 "configure"
+#line 18100 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dlopen()
; return 0; }
EOF
-if { (eval echo configure:17174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in shl_load
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17203: checking for $ac_func" >&5
+echo "configure:18140: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17208 "configure"
+#line 18145 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:17231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
-echo "configure:17259: checking for dld in -lshl_load" >&5
+echo "configure:18196: checking for dld in -lshl_load" >&5
ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lshl_load $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 17267 "configure"
+#line 18204 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dld()
; return 0; }
EOF
-if { (eval echo configure:17278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in dlerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17317: checking for $ac_func" >&5
+echo "configure:18254: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17322 "configure"
+#line 18259 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:17345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
-echo "configure:17370: checking for dlerror in -ldl" >&5
+echo "configure:18307: checking for dlerror in -ldl" >&5
ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 17378 "configure"
+#line 18315 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dlerror()
; return 0; }
EOF
-if { (eval echo configure:17389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$HAVE_SHL_FUNCS" = 0; then
if test "$USE_UNIX" = 1; then
echo "configure: warning: Missing dynamic loading support, several features will be disabled" 1>&2
+ wxUSE_DYNAMIC_LOADER=no
wxUSE_DYNLIB_CLASS=no
else
echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2
fi
fi
-if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_DYNAMIC_LOADER 1
+EOF
+
+elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
cat >> confdefs.h <<\EOF
#define wxUSE_DYNLIB_CLASS 1
EOF
-else
- wxUSE_ODBC=no
- wxUSE_SERIAL=no
fi
#define wxUSE_UNICODE 1
EOF
+
+ if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
+ echo $ac_n "checking for main in -lunicows""... $ac_c" 1>&6
+echo "configure:18397: checking for main in -lunicows" >&5
+ac_lib_var=`echo unicows'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lunicows $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 18405 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:18412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
-if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_EXPERIMENTAL_PRINTF 1
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+
+ cat >> confdefs.h <<\EOF
+#define wxUSE_UNICODE_MSLU 1
EOF
+
+else
+ echo "$ac_t""no" 1>&6
+
+ echo "configure: warning: Compiler doesn't support MSLU (libunicows.a), disabled.
+ Applications will only run on Windows NT/2000/XP!" 1>&2
+ wxUSE_UNICODE_MSLU=no
+
fi
+ fi
+fi
-if test "$wxUSE_SERIAL" = "yes" ; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_SERIAL 1
+if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_EXPERIMENTAL_PRINTF 1
EOF
fi
+
IODBC_C_SRC=""
if test "$wxUSE_ODBC" = "yes" ; then
cat >> confdefs.h <<\EOF
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
if test "$wxUSE_UNIVERSAL" = "yes"; then
- echo "configure: warning: MDI is not supported for wxUNIVERSAL yet... disabled" 1>&2
+ echo "configure: warning: MDI not yet supported for wxUNIVERSAL... disabled" 1>&2
wxUSE_MDI_ARCHITECTURE=no
fi
if test "$wxUSE_MS_HTML_HELP" = "yes"; then
ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6
-echo "configure:17546: checking for htmlhelp.h" >&5
+echo "configure:18528: checking for htmlhelp.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17551 "configure"
+#line 18533 "configure"
#include "confdefs.h"
#include <htmlhelp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:18538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:17644: checking for $ac_hdr" >&5
+echo "configure:18626: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17649 "configure"
+#line 18631 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:18636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if test "$wxUSE_IPC" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then
- echo "configure: warning: wxWindows IPC classes require sockets" 1>&2
+ echo "configure: warning: wxWindows IPC classes require sockets... disabled" 1>&2
fi
cat >> confdefs.h <<\EOF
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
if test "$wxUSE_GTK" = 1; then
if test "$WXGTK12" != 1; then
- echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2
+ echo "configure: warning: Drag and drop is only supported under GTK+ 1.2... disabled" 1>&2
wxUSE_DRAG_AND_DROP=no
fi
fi
if test "$wxUSE_MOTIF" = 1; then
- echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2
- wxUSE_DRAG_AND_DROP=no
- fi
-
- if test "$wxUSE_MAC" = 1; then
- echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 1>&2
+ echo "configure: warning: Drag and drop not yet supported under Motif... disabled" 1>&2
wxUSE_DRAG_AND_DROP=no
fi
fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
- if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then
- echo "configure: warning: Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled" 1>&2
+ if test "$wxUSE_MAC" = 1; then
+ echo "configure: warning: Toggle button not yet supported under Mac OS X... disabled" 1>&2
+ wxUSE_TOGGLEBTN=no
+ fi
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ echo "configure: warning: Toggle button not yet supported under wxUNIVERSAL... disabled" 1>&2
wxUSE_TOGGLEBTN=no
fi
if test "$wxUSE_TOOLTIPS" = "yes"; then
if test "$wxUSE_MOTIF" = 1; then
- echo "configure: warning: wxTooltip not supported yet under Motif ... disabled" 1>&2
+ echo "configure: warning: wxTooltip not supported yet under Motif... disabled" 1>&2
else
if test "$wxUSE_WINE" = 1; then
- echo "configure: warning: wxTooltip not supported under WINE ... disabled" 1>&2
+ echo "configure: warning: wxTooltip not supported under WINE... disabled" 1>&2
else
if test "$wxUSE_UNIVERSAL" = "yes"; then
- echo "configure: warning: wxTooltip not supported yet in wxUNIVERSAL ... disabled" 1>&2
+ echo "configure: warning: wxTooltip not supported yet in wxUNIVERSAL... disabled" 1>&2
else
cat >> confdefs.h <<\EOF
#define wxUSE_TOOLTIPS 1
if test "$wxUSE_POPUPWIN" = "yes"; then
if test "$wxUSE_MAC" = 1; then
- echo "configure: warning: Popup window is not yet supported under Mac OS" 1>&2
+ echo "configure: warning: Popup window not yet supported under Mac OS X... disabled" 1>&2
else
- cat >> confdefs.h <<\EOF
+ if test "$wxUSE_MOTIF" = 1; then
+ echo "configure: warning: wxPopupWindow not yet supported under Motif... disabled" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
#define wxUSE_POPUPWIN 1
EOF
- USES_CONTROLS=1
+
+ USES_CONTROLS=1
+ fi
fi
fi
+if test "$wxUSE_TIPWINDOW" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TIPWINDOW 1
+EOF
+
+fi
+
if test "$USES_CONTROLS" = 1; then
cat >> confdefs.h <<\EOF
#define wxUSE_CONTROLS 1
fi
+if test "$wxUSE_PROTOCOL" = "yes"; then
+ if test "$wxUSE_SOCKETS" != "yes"; then
+ echo "configure: warning: Protocol classes require sockets... disabled" 1>&2
+ wxUSE_PROTOCOL=no
+ fi
+
+ if test "$wxUSE_PROTOCOL" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_PROTOCOL 1
+EOF
+
+
+ if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_PROTOCOL_HTTP 1
+EOF
+
+ fi
+ if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_PROTOCOL_FTP 1
+EOF
+
+ fi
+ if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_PROTOCOL_FILE 1
+EOF
+
+ fi
+ fi
+fi
+
+if test "$wxUSE_URL" = "yes"; then
+ if test "$wxUSE_PROTOCOL" != "yes"; then
+ echo "configure: warning: wxURL class requires wxProtocol... disabled" 1>&2
+ wxUSE_URL=no
+ fi
+ if test "$wxUSE_URL" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_URL 1
+EOF
+
+ fi
+fi
+
if test "$wxUSE_MINIFRAME" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_MINIFRAME 1
fi
+if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
+ LIBS=" -lunicows $LIBS"
+fi
+
if test "$wxUSE_CHOICEDLG" = "yes"; then
cat >> confdefs.h <<\EOF
fi
fi
-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG$PROFILE $OPTIMISE $INCLUDES"
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
-
-
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:18541: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:19582: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
projects / wxWidgets.git / blobdiff