# From configure.in Id: configure.in
+# aclocal.m4 generated automatically by aclocal 1.6 -*- Autoconf -*-
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+
+
+
+# Configure paths for GTK+
+# Owen Taylor 1997-2001
+
+
+
+# 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
+ --with-x11 use X11"
+ac_help="$ac_help
+ --enable-nanox use NanoX"
ac_help="$ac_help
--enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)"
ac_help="$ac_help
--with-libjpeg use libjpeg (JPEG file format)"
ac_help="$ac_help
--with-libtiff use libtiff (TIFF file format)"
-ac_help="$ac_help
- --with-freetype use freetype (font rasterizer)"
ac_help="$ac_help
--with-opengl use OpenGL (or Mesa)"
ac_help="$ac_help
ac_help="$ac_help
--enable-compat20 enable wxWindows 2.0 compatibility"
ac_help="$ac_help
- --enable-compat22 enable wxWindows 2.2 compatibility"
+ --disable-compat22 disable wxWindows 2.2 compatibility"
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-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
--enable-mimetype use wxMimeTypesManager"
ac_help="$ac_help
--enable-sysoptions use wxSystemOptions"
+ac_help="$ac_help
+ --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-protocol-file FILE support in wxProtocol"
ac_help="$ac_help
--enable-threads use threads"
ac_help="$ac_help
--enable-gif use gif images (GIF file format)"
ac_help="$ac_help
--enable-pcx use pcx images (PCX file format)"
+ac_help="$ac_help
+ --enable-iff use iff images (IFF file format)"
ac_help="$ac_help
--enable-pnm use pnm images (PNM file format)"
ac_help="$ac_help
--enable-xpm use xpm images (XPM file format)"
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)"
+ --enable-icocur use Windows ICO and CUR formats"
ac_help="$ac_help
- --disable-gtktest Do not try to compile and run a test GTK program"
+ --disable-gtktest do not try to compile and run a test GTK+ program"
ac_help="$ac_help
--with-gtk-prefix=PFX 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"
+ac_help="$ac_help
+ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib"
# Initialize some variables set by options.
# The variables have the same names as the options, with
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:954: checking host system type" >&5
+echo "configure:1004: 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:975: checking target system type" >&5
+echo "configure:1025: 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:993: checking build system type" >&5
+echo "configure:1043: 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
NEEDS_D_REENTRANT_FOR_R_FUNCS=0
-CPP_MT_FLAG=-D_REENTRANT
-
-ALL_TOOLKITS="GTK MAC MGL MOTIF MSW PM WINE"
+ALL_TOOLKITS="GTK MAC MGL MICROWIN MOTIF MSW PM WINE X11"
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_wxUSE_WINE=0
+DEFAULT_wxUSE_X11=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
DEFAULT_DEFAULT_wxUSE_WINE=0
+DEFAULT_DEFAULT_wxUSE_X11=0
PROGRAM_EXT=
SO_SUFFIX=so
*-*-freebsd*)
USE_BSD=1
USE_FREEBSD=1
- CPP_MT_FLAG=-D_THREAD_SAFE
cat >> confdefs.h <<\EOF
#define __FREEBSD__ 1
EOF
PROGRAM_EXT=".exe"
DEFAULT_DEFAULT_wxUSE_MGL=1
- DEFAULT_DEFAULT_wxUSE_SHARED=0
;;
*-pc-os2_emx | *-pc-os2-emx )
PROGRAM_EXT=".exe"
DEFAULT_DEFAULT_wxUSE_PM=1
+ LIBS="$LIBS -lstdcpp"
;;
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:1355: checking for glibc 2.1 or later" >&5
+echo "configure:1405: 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 1360 "configure"
+
+ cat > conftest.$ac_ext <<EOF
+#line 1411 "configure"
#include "confdefs.h"
#include <features.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:1371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_lib_glibc21=yes
if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_UNIVERSAL=no
+ DEFAULT_wxUSE_NANOX=no
+
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_OPTIMISE=no
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
- DEFAULT_wxUSE_NO_RTTI=yes
- DEFAULT_wxUSE_NO_EXCEPTIONS=yes
+ DEFAULT_wxUSE_NO_RTTI=no
+ DEFAULT_wxUSE_NO_EXCEPTIONS=no
DEFAULT_wxUSE_PERMISSIVE=no
DEFAULT_wxUSE_DEBUG_FLAG=yes
DEFAULT_wxUSE_DEBUG_INFO=yes
DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no
- DEFAULT_wxUSE_PRECOMP=yes
+ DEFAULT_wxUSE_PRECOMP=no
DEFAULT_wxUSE_APPLE_IEEE=no
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_LIBJPEG=no
DEFAULT_wxUSE_LIBTIFF=no
DEFAULT_wxUSE_ODBC=no
- DEFAULT_wxUSE_FREETYPE=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=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_TIPWINDOW=no
DEFAULT_wxUSE_UNICODE=no
+ DEFAULT_wxUSE_UNICODE_MSLU=no
DEFAULT_wxUSE_WCSRTOMBS=no
DEFAULT_wxUSE_PALETTE=no
DEFAULT_wxUSE_GIF=no
DEFAULT_wxUSE_PCX=no
DEFAULT_wxUSE_PNM=no
+ DEFAULT_wxUSE_IFF=no
DEFAULT_wxUSE_XPM=no
+ DEFAULT_wxUSE_ICO_CUR=no
else
DEFAULT_wxUSE_UNIVERSAL=no
+ DEFAULT_wxUSE_NANOX=no
+
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_OPTIMISE=yes
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
- DEFAULT_wxUSE_NO_RTTI=yes
- DEFAULT_wxUSE_NO_EXCEPTIONS=yes
+ DEFAULT_wxUSE_NO_RTTI=no
+ DEFAULT_wxUSE_NO_EXCEPTIONS=no
DEFAULT_wxUSE_PERMISSIVE=no
DEFAULT_wxUSE_DEBUG_FLAG=no
DEFAULT_wxUSE_DEBUG_INFO=no
DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no
- DEFAULT_wxUSE_PRECOMP=yes
+ DEFAULT_wxUSE_PRECOMP=no
DEFAULT_wxUSE_APPLE_IEEE=yes
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_LIBJPEG=yes
DEFAULT_wxUSE_LIBTIFF=yes
DEFAULT_wxUSE_ODBC=no
- DEFAULT_wxUSE_FREETYPE=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
DEFAULT_wxUSE_SOCKETS=yes
DEFAULT_wxUSE_DIALUP_MANAGER=yes
DEFAULT_wxUSE_JOYSTICK=yes
- DEFAULT_wxUSE_DYNLIB_CLASS=no
+ DEFAULT_wxUSE_DYNLIB_CLASS=yes
DEFAULT_wxUSE_DYNAMIC_LOADER=yes
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_TIPWINDOW=yes
DEFAULT_wxUSE_UNICODE=no
+ DEFAULT_wxUSE_UNICODE_MSLU=yes
DEFAULT_wxUSE_WCSRTOMBS=no
DEFAULT_wxUSE_PALETTE=yes
DEFAULT_wxUSE_IMAGE=yes
DEFAULT_wxUSE_GIF=yes
DEFAULT_wxUSE_PCX=yes
+ DEFAULT_wxUSE_IFF=no
DEFAULT_wxUSE_PNM=yes
DEFAULT_wxUSE_XPM=yes
+ DEFAULT_wxUSE_ICO_CUR=yes
fi
echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
-echo "configure:1754: checking for --enable-gui" >&5
+echo "configure:1823: 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:1796: checking for --enable-universal" >&5
+echo "configure:1865: 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 --with-x11 or --without-x11 was given.
+if test "${with_x11+set}" = set; then
+ withval="$with_x11"
+ wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1
+fi
+
+
+ echo $ac_n "checking for --enable-nanox""... $ac_c" 1>&6
+echo "configure:1958: checking for --enable-nanox" >&5
+ no_cache=0
+ # Check whether --enable-nanox or --disable-nanox was given.
+if test "${enable_nanox+set}" = set; then
+ enableval="$enable_nanox"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_nanox='wxUSE_NANOX=yes'
+ else
+ ac_cv_use_nanox='wxUSE_NANOX=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_NANOX" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_nanox='wxUSE_NANOX='$DEFAULT_wxUSE_NANOX
+
+fi
+
+
+ eval "$ac_cv_use_nanox"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_nanox >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_NANOX" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
# Check whether --enable-gtk2 or --disable-gtk2 was given.
if test "${enable_gtk2+set}" = set; then
enableval="$enable_gtk2"
- wxUSE_GTK2=1
+ wxUSE_GTK2="yes"
else
- wxUSE_GTK2=0
+ wxUSE_GTK2="no"
fi
echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
-echo "configure:1887: checking for --with-libpng" >&5
+echo "configure:2007: 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:1938: checking for --with-libjpeg" >&5
+echo "configure:2058: 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:1989: checking for --with-libtiff" >&5
+echo "configure:2109: checking for --with-libtiff" >&5
no_cache=0
# Check whether --with-libtiff or --without-libtiff was given.
if test "${with_libtiff+set}" = set; then
fi
- echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6
-echo "configure:2040: checking for --with-freetype" >&5
- no_cache=0
- # Check whether --with-freetype or --without-freetype was given.
-if test "${with_freetype+set}" = set; then
- withval="$with_freetype"
-
- if test "$withval" = yes; then
- ac_cv_use_freetype='wxUSE_FREETYPE=yes'
- elif test "$withval" = no; then
- ac_cv_use_freetype='wxUSE_FREETYPE=no'
- elif test "$withval" = sys; then
- ac_cv_use_freetype='wxUSE_FREETYPE=sys'
- elif test "$withval" = builtin; then
- ac_cv_use_freetype='wxUSE_FREETYPE=builtin'
- else
- { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; }
- fi
-
-else
-
- LINE=`grep "wxUSE_FREETYPE" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_freetype='wxUSE_FREETYPE='$DEFAULT_wxUSE_FREETYPE
-
-fi
-
-
- eval "$ac_cv_use_freetype"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_freetype >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_FREETYPE" = yes; then
- echo "$ac_t""yes" 1>&6
- elif test "$wxUSE_FREETYPE" = no; then
- echo "$ac_t""no" 1>&6
- elif test "$wxUSE_FREETYPE" = sys; then
- echo "$ac_t""system version" 1>&6
- elif test "$wxUSE_FREETYPE" = builtin; then
- echo "$ac_t""builtin version" 1>&6
- else
- { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; }
- fi
-
-
echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
-echo "configure:2091: checking for --with-opengl" >&5
+echo "configure:2160: 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:2133: checking for --with-dmalloc" >&5
+echo "configure:2202: 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:2172: checking for --with-regex" >&5
+echo "configure:2241: 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:2223: checking for --with-zlib" >&5
+echo "configure:2292: 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:2274: checking for --with-odbc" >&5
+echo "configure:2343: 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:2315: checking for --enable-shared" >&5
+echo "configure:2384: 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:2354: checking for --enable-soname" >&5
+echo "configure:2423: 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:2393: checking for --enable-optimise" >&5
+echo "configure:2462: 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:2432: checking for --enable-debug" >&5
+echo "configure:2501: 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:2472: checking for --enable-precomp" >&5
+echo "configure:2541: 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:2520: checking for --enable-debug_flag" >&5
+echo "configure:2589: 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:2559: checking for --enable-debug_info" >&5
+echo "configure:2628: 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:2598: checking for --enable-debug_gdb" >&5
+echo "configure:2667: 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:2637: checking for --enable-debug_cntxt" >&5
+echo "configure:2706: 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:2676: checking for --enable-mem_tracing" >&5
+echo "configure:2745: 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:2715: checking for --enable-profile" >&5
+echo "configure:2784: 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:2754: checking for --enable-no_rtti" >&5
+echo "configure:2823: 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:2793: checking for --enable-no_exceptions" >&5
+echo "configure:2862: 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:2832: checking for --enable-permissive" >&5
+echo "configure:2901: 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:2871: checking for --enable-no_deps" >&5
+echo "configure:2940: 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:2911: checking for --enable-compat20" >&5
+echo "configure:2980: 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:2950: checking for --enable-compat22" >&5
+echo "configure:3019: 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:2991: checking for --enable-intl" >&5
+echo "configure:3060: 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:3030: checking for --enable-config" >&5
+echo "configure:3099: 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:3139: 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:3178: 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:3217: 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:3256: 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:3070: checking for --enable-sockets" >&5
+echo "configure:3295: 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:3110: checking for --enable-ipc" >&5
+echo "configure:3335: 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:3150: checking for --enable-cmdline" >&5
+echo "configure:3375: 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:3189: checking for --enable-datetime" >&5
+echo "configure:3414: 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:3228: checking for --enable-timedate" >&5
+echo "configure:3453: 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:3267: checking for --enable-stopwatch" >&5
+echo "configure:3492: 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:3306: checking for --enable-dialupman" >&5
+echo "configure:3531: 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:3345: checking for --enable-apple_ieee" >&5
+echo "configure:3570: 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:3384: checking for --enable-timer" >&5
+echo "configure:3609: 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:3423: checking for --enable-wave" >&5
+echo "configure:3648: 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:3462: checking for --enable-fraction" >&5
+echo "configure:3687: 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:3501: checking for --enable-dynlib" >&5
+echo "configure:3726: checking for --enable-dynlib" >&5
no_cache=0
# Check whether --enable-dynlib or --disable-dynlib was given.
if test "${enable_dynlib+set}" = set; then
echo $ac_n "checking for --enable-dynamicloader""... $ac_c" 1>&6
-echo "configure:3540: checking for --enable-dynamicloader" >&5
+echo "configure:3765: checking for --enable-dynamicloader" >&5
no_cache=0
# Check whether --enable-dynamicloader or --disable-dynamicloader was given.
if test "${enable_dynamicloader+set}" = set; then
echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
-echo "configure:3579: checking for --enable-longlong" >&5
+echo "configure:3804: 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:3618: checking for --enable-geometry" >&5
+echo "configure:3843: 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:3657: checking for --enable-log" >&5
+echo "configure:3882: 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:3696: checking for --enable-streams" >&5
+echo "configure:3921: 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:3735: checking for --enable-file" >&5
+echo "configure:3960: 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:3774: checking for --enable-ffile" >&5
+echo "configure:3999: 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:3813: checking for --enable-textbuf" >&5
+echo "configure:4038: 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:3852: checking for --enable-textfile" >&5
+echo "configure:4077: 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:3891: checking for --enable-fontmap" >&5
+echo "configure:4116: 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:3930: checking for --enable-unicode" >&5
+echo "configure:4155: 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:4194: 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:3969: checking for --enable-wxprintfv" >&5
+echo "configure:4233: 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:4008: checking for --enable-std_iostreams" >&5
+echo "configure:4272: 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:4047: checking for --enable-filesystem" >&5
+echo "configure:4311: 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:4086: checking for --enable-fs_inet" >&5
+echo "configure:4350: 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:4125: checking for --enable-fs_zip" >&5
+echo "configure:4389: 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:4164: checking for --enable-zipstream" >&5
+echo "configure:4428: 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:4204: checking for --enable-catch_segvs" >&5
+echo "configure:4468: 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:4243: checking for --enable-snglinst" >&5
+echo "configure:4507: 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:4283: checking for --enable-mimetype" >&5
+echo "configure:4547: 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:4322: checking for --enable-system_options" >&5
+echo "configure:4586: 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:4363: checking for --enable-threads" >&5
+ echo $ac_n "checking for --enable-url""... $ac_c" 1>&6
+echo "configure:4626: 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
-if test "$wxUSE_GUI" = "yes"; then
-
-
-
- echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
-echo "configure:4406: checking for --enable-docview" >&5
+ echo $ac_n "checking for --enable-protocol""... $ac_c" 1>&6
+echo "configure:4665: checking for --enable-protocol" >&5
no_cache=0
- # Check whether --enable-docview or --disable-docview was given.
+ # 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_protocol='wxUSE_PROTOCOL=yes'
+ else
+ ac_cv_use_protocol='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_protocol='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL
+
+fi
+
+
+ eval "$ac_cv_use_protocol"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_protocol >> ${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-protocol_http""... $ac_c" 1>&6
+echo "configure:4704: checking for --enable-protocol_http" >&5
+ no_cache=0
+ # 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_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
+ else
+ ac_cv_use_protocol_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_protocol_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP
+
+fi
+
+
+ eval "$ac_cv_use_protocol_http"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_protocol_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-protocol_ftp""... $ac_c" 1>&6
+echo "configure:4743: checking for --enable-protocol_ftp" >&5
+ no_cache=0
+ # 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_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
+ else
+ ac_cv_use_protocol_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_protocol_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP
+
+fi
+
+
+ eval "$ac_cv_use_protocol_ftp"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_protocol_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-protocol_file""... $ac_c" 1>&6
+echo "configure:4782: checking for --enable-protocol_file" >&5
+ no_cache=0
+ # 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_protocol_file='wxUSE_PROTOCOL_FILE=yes'
+ else
+ ac_cv_use_protocol_file='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_protocol_file='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE
+
+fi
+
+
+ eval "$ac_cv_use_protocol_file"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_protocol_file >> ${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-threads""... $ac_c" 1>&6
+echo "configure:4824: 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:4867: 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"
echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
-echo "configure:4445: checking for --enable-help" >&5
+echo "configure:4906: checking for --enable-help" >&5
no_cache=0
# Check whether --enable-help or --disable-help was given.
if test "${enable_help+set}" = set; then
echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
-echo "configure:4484: checking for --enable-mshtmlhelp" >&5
+echo "configure:4945: checking for --enable-mshtmlhelp" >&5
no_cache=0
# Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
if test "${enable_mshtmlhelp+set}" = set; then
echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
-echo "configure:4523: checking for --enable-html" >&5
+echo "configure:4984: checking for --enable-html" >&5
no_cache=0
# Check whether --enable-html or --disable-html was given.
if test "${enable_html+set}" = set; then
echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6
-echo "configure:4562: checking for --enable-htmlhelp" >&5
+echo "configure:5023: 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:4601: checking for --enable-constraints" >&5
+echo "configure:5062: 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:4640: checking for --enable-printarch" >&5
+echo "configure:5101: 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:4679: checking for --enable-mdi" >&5
+echo "configure:5140: 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:4718: checking for --enable-loggui" >&5
+echo "configure:5179: 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:4757: checking for --enable-logwin" >&5
+echo "configure:5218: 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:4796: checking for --enable-logdialog" >&5
+echo "configure:5257: 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:4836: checking for --enable-postscript" >&5
+echo "configure:5297: 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:4878: checking for --enable-prologio" >&5
+echo "configure:5339: 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:4917: checking for --enable-resources" >&5
+echo "configure:5378: 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:4957: checking for --enable-xresources" >&5
+echo "configure:5418: 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:4998: checking for --enable-clipboard" >&5
+echo "configure:5459: 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:5037: checking for --enable-dnd" >&5
+echo "configure:5498: 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:5076: checking for --enable-metafile" >&5
+echo "configure:5537: 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:5116: checking for --enable-treelayout" >&5
+echo "configure:5577: 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:5157: checking for --enable-controls" >&5
+echo "configure:5618: checking for --enable-controls" >&5
no_cache=0
# Check whether --enable-controls or --disable-controls was given.
if test "${enable_controls+set}" = set; then
echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
-echo "configure:5277: checking for --enable-accel" >&5
+echo "configure:5738: 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:5316: checking for --enable-button" >&5
+echo "configure:5777: 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:5355: checking for --enable-bmpbutton" >&5
+echo "configure:5816: 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:5394: checking for --enable-calendar" >&5
+echo "configure:5855: 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:5433: checking for --enable-caret" >&5
+echo "configure:5894: 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:5472: checking for --enable-checkbox" >&5
+echo "configure:5933: 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:5511: checking for --enable-checklst" >&5
+echo "configure:5972: 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:5550: checking for --enable-choice" >&5
+echo "configure:6011: 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:5589: checking for --enable-combobox" >&5
+echo "configure:6050: 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:5628: checking for --enable-gauge" >&5
+echo "configure:6089: 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:5667: checking for --enable-grid" >&5
+echo "configure:6128: 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:5706: checking for --enable-newgrid" >&5
+echo "configure:6167: 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:5745: checking for --enable-imaglist" >&5
+echo "configure:6206: 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:5784: checking for --enable-listbox" >&5
+echo "configure:6245: 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:5823: checking for --enable-listctrl" >&5
+echo "configure:6284: 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:5862: checking for --enable-notebook" >&5
+echo "configure:6323: 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:5901: checking for --enable-propsheet" >&5
+echo "configure:6362: 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:5940: checking for --enable-radiobox" >&5
+echo "configure:6401: 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:5979: checking for --enable-radiobtn" >&5
+echo "configure:6440: 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:6018: checking for --enable-sash" >&5
+echo "configure:6479: 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:6057: checking for --enable-scrollbar" >&5
+echo "configure:6518: 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:6096: checking for --enable-slider" >&5
+echo "configure:6557: 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:6135: checking for --enable-spinbtn" >&5
+echo "configure:6596: 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:6174: checking for --enable-spinctrl" >&5
+echo "configure:6635: 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:6213: checking for --enable-splitter" >&5
+echo "configure:6674: 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:6252: checking for --enable-statbmp" >&5
+echo "configure:6713: 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:6291: checking for --enable-statbox" >&5
+echo "configure:6752: 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:6330: checking for --enable-statline" >&5
+echo "configure:6791: 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:6369: checking for --enable-stattext" >&5
+echo "configure:6830: 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:6408: checking for --enable-statusbar" >&5
+echo "configure:6869: 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:6447: checking for --enable-tabdialog" >&5
+echo "configure:6908: 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:6486: checking for --enable-textctrl" >&5
+echo "configure:6947: 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:6525: checking for --enable-togglebtn" >&5
+echo "configure:6986: 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:6564: checking for --enable-toolbar" >&5
+echo "configure:7025: 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:6603: checking for --enable-tbarnative" >&5
+echo "configure:7064: 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:6642: checking for --enable-tbarsmpl" >&5
+echo "configure:7103: 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:6681: checking for --enable-treectrl" >&5
+echo "configure:7142: checking for --enable-treectrl" >&5
no_cache=0
# Check whether --enable-treectrl or --disable-treectrl was given.
if test "${enable_treectrl+set}" = set; then
echo $ac_n "checking for --enable-tipwindow""... $ac_c" 1>&6
-echo "configure:6720: checking for --enable-tipwindow" >&5
+echo "configure:7181: checking for --enable-tipwindow" >&5
no_cache=0
# Check whether --enable-tipwindow or --disable-tipwindow was given.
if test "${enable_tipwindow+set}" = set; then
echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6
-echo "configure:6759: checking for --enable-popupwin" >&5
+echo "configure:7220: 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:6800: checking for --enable-commondlg" >&5
+echo "configure:7261: 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:6839: checking for --enable-choicedlg" >&5
+echo "configure:7300: 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:6878: checking for --enable-coldlg" >&5
+echo "configure:7339: 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:6917: checking for --enable-filedlg" >&5
+echo "configure:7378: 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:6956: checking for --enable-finddlg" >&5
+echo "configure:7417: 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:6995: checking for --enable-fontdlg" >&5
+echo "configure:7456: 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:7034: checking for --enable-dirdlg" >&5
+echo "configure:7495: 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:7073: checking for --enable-msgdlg" >&5
+echo "configure:7534: 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:7112: checking for --enable-numberdlg" >&5
+echo "configure:7573: 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:7151: checking for --enable-splash" >&5
+echo "configure:7612: 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:7190: checking for --enable-textdlg" >&5
+echo "configure:7651: 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:7229: checking for --enable-tipdlg" >&5
+echo "configure:7690: 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:7268: checking for --enable-progressdlg" >&5
+echo "configure:7729: 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:7307: checking for --enable-wizarddlg" >&5
+echo "configure:7768: 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:7348: checking for --enable-menus" >&5
+echo "configure:7809: 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:7387: checking for --enable-miniframe" >&5
+echo "configure:7848: 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:7426: checking for --enable-tooltips" >&5
+echo "configure:7887: 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:7465: checking for --enable-splines" >&5
+echo "configure:7926: 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:7504: checking for --enable-validators" >&5
+echo "configure:7965: 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:7543: checking for --enable-busyinfo" >&5
+echo "configure:8004: 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:7582: checking for --enable-joystick" >&5
+echo "configure:8043: 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:7621: checking for --enable-metafile" >&5
+echo "configure:8082: 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:7660: checking for --enable-dragimage" >&5
+echo "configure:8121: 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:7701: checking for --enable-palette" >&5
+echo "configure:8162: 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:7740: checking for --enable-image" >&5
+echo "configure:8201: 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:7779: checking for --enable-gif" >&5
+echo "configure:8240: 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:7818: checking for --enable-pcx" >&5
+echo "configure:8279: checking for --enable-pcx" >&5
no_cache=0
# Check whether --enable-pcx or --disable-pcx was given.
if test "${enable_pcx+set}" = set; then
fi
+ echo $ac_n "checking for --enable-iff""... $ac_c" 1>&6
+echo "configure:8318: checking for --enable-iff" >&5
+ no_cache=0
+ # Check whether --enable-iff or --disable-iff was given.
+if test "${enable_iff+set}" = set; then
+ enableval="$enable_iff"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_iff='wxUSE_IFF=yes'
+ else
+ ac_cv_use_iff='wxUSE_IFF=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_IFF" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_iff='wxUSE_IFF='$DEFAULT_wxUSE_IFF
+
+fi
+
+
+ eval "$ac_cv_use_iff"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_iff >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_IFF" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
-echo "configure:7857: checking for --enable-pnm" >&5
+echo "configure:8357: 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:7896: checking for --enable-xpm" >&5
+echo "configure:8396: checking for --enable-xpm" >&5
no_cache=0
# Check whether --enable-xpm or --disable-xpm was given.
if test "${enable_xpm+set}" = set; then
fi
+ echo $ac_n "checking for --enable-ico_cur""... $ac_c" 1>&6
+echo "configure:8435: checking for --enable-ico_cur" >&5
+ no_cache=0
+ # Check whether --enable-ico_cur or --disable-ico_cur was given.
+if test "${enable_ico_cur+set}" = set; then
+ enableval="$enable_ico_cur"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_ico_cur='wxUSE_ICO_CUR=yes'
+ else
+ ac_cv_use_ico_cur='wxUSE_ICO_CUR=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_ICO_CUR" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_ico_cur='wxUSE_ICO_CUR='$DEFAULT_wxUSE_ICO_CUR
+
+fi
+
+
+ eval "$ac_cv_use_ico_cur"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_ICO_CUR" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
fi
+case "${host}" in
+ *-pc-os2_emx | *-pc-os2-emx )
+ LEX_STEM="lexyy"
+ ;;
+ *)
+ PATH_IFS=':'
+ LEX_STEM="lex.yy"
+ ;;
+esac
+
+
echo "saving argument cache $wx_arg_cache_file"
mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:7943: checking for toolkit" >&5
+echo "configure:8493: 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} + ${wxUSE_X11:-0}`
- case "${host}" in
+ case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
- # PATH_IFS is autodetected by OS/2's configure (usually ';')
NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
- LEX_STEM="lexyy"
- ;;
- *)
- PATH_IFS=':'
- LEX_STEM="lex.yy"
- ;;
esac
case "$NUM_TOOLKITS" in
fi
done
else
- PATH_IFS=':'
echo "$ac_t""base ($host_alias hosted) only" 1>&6
fi
if test "$build" != "$host" ; then
- if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 ; then
+ if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 -o "$USE_UNIX"; then
CC=$host_alias-gcc
CXX=$host_alias-c++
AR=$host_alias-ar
fi
fi
+CFLAGS=${CFLAGS:=}
# 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:8081: checking for $ac_word" >&5
+echo "configure:8624: 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:8111: checking for $ac_word" >&5
+echo "configure:8654: 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:8162: checking for $ac_word" >&5
+echo "configure:8705: 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:8194: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:8737: 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 8205 "configure"
+#line 8748 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:8210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8753: \"$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:8236: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8779: 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:8241: checking whether we are using GNU C" >&5
+echo "configure:8784: 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:8250: \"$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:8793: \"$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:8269: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:8812: 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
fi
-CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
-
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:8304: checking how to run the C preprocessor" >&5
+echo "configure:8845: 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 8319 "configure"
+#line 8860 "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:8325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8866: \"$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 8336 "configure"
+#line 8877 "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:8342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8883: \"$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 8353 "configure"
+#line 8894 "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:8359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8900: \"$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:8385: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:8926: 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 8391 "configure"
+#line 8932 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 8409 "configure"
+#line 8950 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
cross_compiling=$ac_cv_prog_cxx_cross
+CXXFLAGS=${CXXFLAGS:=}
for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
do
# 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:8445: checking for $ac_word" >&5
+echo "configure:8987: 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:8477: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:9019: 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 8488 "configure"
+#line 9030 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:8493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9035: \"$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:8519: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:9061: 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:8524: checking whether we are using GNU C++" >&5
+echo "configure:9066: 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:8533: \"$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:9075: \"$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:8552: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:9094: 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
fi
-CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'`
-
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
# 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:8597: checking for $ac_word" >&5
+echo "configure:9137: 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:8628: checking for $ac_word" >&5
+echo "configure:9168: 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:8668: checking for a BSD compatible install" >&5
+echo "configure:9208: 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:8733: checking for $ac_word" >&5
+echo "configure:9273: 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
fi
-echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6
-echo "configure:8762: checking make for VPATH support" >&5
+echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6
+echo "configure:9302: checking if make is GNU make" >&5
+if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
+ egrep -s GNU > /dev/null); then
+ wx_cv_prog_makeisgnu="yes"
+ else
+ wx_cv_prog_makeisgnu="no"
+ fi
+
+fi
+
+echo "$ac_t""$wx_cv_prog_makeisgnu" 1>&6
+
+if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
+ IF_GNU_MAKE=""
+else
+ IF_GNU_MAKE="#"
+fi
+
+
+
+if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
+echo $ac_n "checking if make supports VPATH""... $ac_c" 1>&6
+echo "configure:9328: checking if make supports VPATH" >&5
+if eval "test \"`echo '$''{'wx_cv_prog_makevpath'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
cat - << EOF > confMake
check : file
cp \$? \$@
rm -f sub/file check final_file confMake
rmdir sub
if test "$RESULT" = 0; then
- echo "$ac_t""yes" 1>&6
+ wx_cv_prog_makevpath="yes"
else
- echo "$ac_t""no" 1>&6
- { echo "configure: error:
+ wx_cv_prog_makevpath="no"
+fi
+
+fi
+
+echo "$ac_t""$wx_cv_prog_makevpath" 1>&6
+
+if test "x$wx_cv_prog_makevpath" != "xyes"; then
+{ echo "configure: error:
You need a make-utility that is able to use the variable
VPATH correctly.
If your version of make does not support VPATH correctly,
Also please do remember to use gmake in this case every time
you are trying to compile.
" 1>&2; exit 1; }
-fi
-
+fi fi
for ac_prog in 'bison -y' byacc
do
# 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:8799: checking for $ac_word" >&5
+echo "configure:9375: 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:8833: checking for $ac_word" >&5
+echo "configure:9409: 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:8867: checking for yywrap in -l$ac_lib" >&5
+echo "configure:9443: 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 8875 "configure"
+#line 9451 "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:8886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9462: \"$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:8910: checking whether ln -s works" >&5
+echo "configure:9486: 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:9062: checking for regex.h" >&5
+echo "configure:9638: 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 9067 "configure"
+#line 9643 "configure"
#include "confdefs.h"
#include <regex.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9648: \"$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:9091: checking for $ac_func" >&5
+echo "configure:9667: 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 9096 "configure"
+#line 9672 "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:9119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9695: \"$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:9177: checking for zlib.h" >&5
+echo "configure:9753: 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 9182 "configure"
+#line 9758 "configure"
#include "confdefs.h"
#include <zlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9763: \"$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:9204: checking for deflate in -lz" >&5
+echo "configure:9780: 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 9212 "configure"
+#line 9788 "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:9223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9799: \"$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
#define wxUSE_LIBPNG 1
EOF
+
+ if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
+ echo "configure: warning: wxMGL doesn't work with builtin png library, will use MGL one instead" 1>&2
+ wxUSE_LIBPNG=sys
+ fi
- if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
+ if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
echo "configure: warning: system png library doesn't work without system zlib, will use built-in instead" 1>&2
wxUSE_LIBPNG=builtin
fi
- if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
- ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
+ if test "$wxUSE_MGL" != 1 ; then
+ 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:9282: checking for png.h" >&5
+echo "configure:9864: 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 9287 "configure"
+#line 9869 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9874: \"$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:9309: checking for png_check_sig in -lpng" >&5
+echo "configure:9891: 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 9317 "configure"
+#line 9899 "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:9328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9910: \"$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
fi
-
+
else
echo "$ac_t""no" 1>&6
fi
- if test "x$PNG_LINK" = "x" ; then
- if test "$wxUSE_LIBPNG" = "sys" ; then
- { echo "configure: error: system png library not found! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; }
+ if test "x$PNG_LINK" = "x" ; then
+ if test "$wxUSE_LIBPNG" = "sys" ; then
+ { echo "configure: error: system png library not found! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; }
+ else
+ echo "configure: warning: system png library not found, will use built-in instead" 1>&2
+ wxUSE_LIBPNG=builtin
+ fi
else
- echo "configure: warning: system png library not found, will use built-in instead" 1>&2
- wxUSE_LIBPNG=builtin
+ wxUSE_LIBPNG=yes
fi
- else
- wxUSE_LIBPNG=yes
fi
fi
EOF
- if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
- echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:9384: checking for jpeglib.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then
+ if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
+ echo "configure: warning: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" 1>&2
+ wxUSE_LIBJPEG=sys
+ fi
+
+ if test "$wxUSE_MGL" != 1 ; then
+ if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
+ echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
+echo "configure:9973: 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 9389 "configure"
+#line 9978 "configure"
#include "confdefs.h"
- #undef HAVE_STDLIB_H
- #include <stdio.h>
- #include <jpeglib.h>
-
+ #undef HAVE_STDLIB_H
+ #include <stdio.h>
+ #include <jpeglib.h>
+
int main() {
-
+
; return 0; }
EOF
-if { (eval echo configure:9401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_jpeglib_h=yes
else
cat conftest.$ac_ext >&5
rm -rf conftest*
ac_cv_header_jpeglib_h=no
-
+
fi
rm -f conftest*
-
+
fi
- echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6
+ echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6
- 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:9419: checking for jpeg_read_header in -ljpeg" >&5
+ 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:10008: 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 9427 "configure"
+#line 10016 "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:9438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10027: \"$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
fi
- fi
+ fi
- if test "x$JPEG_LINK" = "x" ; then
- if test "$wxUSE_LIBJPEG" = "sys" ; then
- { echo "configure: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" 1>&2; exit 1; }
+ if test "x$JPEG_LINK" = "x" ; then
+ if test "$wxUSE_LIBJPEG" = "sys" ; then
+ { echo "configure: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" 1>&2; exit 1; }
+ else
+ echo "configure: warning: system jpeg library not found, will use built-in instead" 1>&2
+ wxUSE_LIBJPEG=builtin
+ fi
else
- echo "configure: warning: system jpeg library not found, will use built-in instead" 1>&2
- wxUSE_LIBJPEG=builtin
+ wxUSE_LIBJPEG=sys
fi
- else
- wxUSE_LIBJPEG=sys
fi
fi
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:9489: checking for tiffio.h" >&5
+echo "configure:10079: 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 9494 "configure"
+#line 10084 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10089: \"$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:9516: checking for TIFFError in -ltiff" >&5
+echo "configure:10106: 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 9524 "configure"
+#line 10114 "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:9535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10125: \"$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
-FREETYPE_INCLUDE=
-FREETYPE_LINK=
-if test "$wxUSE_FREETYPE" != "no" ; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_FREETYPE 1
-EOF
-
-
- 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:9590: 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 9595 "configure"
-#include "confdefs.h"
-#include <freetype.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9600: \"$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
- echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6
-echo "configure:9617: 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
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lfreetype -lm $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 9625 "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
- builtin and then its argument prototype would still apply. */
-char FT_Render_Glyph();
-
-int main() {
-FT_Render_Glyph()
-; return 0; }
-EOF
-if { (eval echo configure:9636: \"$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"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- FREETYPE_LINK=" -lfreetype"
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
- if test "x$FREETYPE_LINK" = "x" ; then
- if test "$wxUSE_FREETYPE" = "sys" ; then
- { echo "configure: error: system freetype library not found! Use --with-freetype=builtin to use built-in version" 1>&2; exit 1; }
- else
- echo "configure: warning: system freetype library not found, will use built-in instead" 1>&2
- wxUSE_FREETYPE=builtin
- fi
- else
- wxUSE_FREETYPE=sys
- fi
- fi
-
- if test "$wxUSE_FREETYPE" = "builtin" ; then
- FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype"
- fi
-fi
-
-
AFMINSTALL=
TOOLKIT=
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9691: checking for $ac_hdr" >&5
+echo "configure:10180: 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 9696 "configure"
+#line 10185 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10190: \"$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:9729: checking for windows.h" >&5
+echo "configure:10218: 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 9734 "configure"
+#line 10223 "configure"
#include "confdefs.h"
#include <windows.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10228: \"$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:9765: checking if w32api has good enough MSIE support" >&5
+echo "configure:10254: 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 9771 "configure"
+#line 10260 "configure"
#include "confdefs.h"
#include <w32api.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:9787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10276: \"$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:9846: checking for GTK+ version" >&5
+echo "configure:10335: checking for GTK+ version" >&5
gtk_version_cached=1
if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
wx_cv_lib_gtk=
if test "x$wxUSE_GTK2" = "xyes"; 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.
+ # Check whether --enable-gtktest or --disable-gtktest was given.
if test "${enable_gtktest+set}" = set; then
enableval="$enable_gtktest"
:
fi
+ pkg_config_args=gtk+-2.0
for module in . $GTK_MODULES
do
case "$module" in
- gthread)
- gtk_config_args="$gtk_config_args gthread"
+ gthread)
+ pkg_config_args="$pkg_config_args gthread-2.0"
;;
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_2_0+set} != xset ; then
- GTK_CONFIG_2_0=$gtk_config_exec_prefix/bin/gtk-config-2.0
- fi
- fi
- if test x$gtk_config_prefix != x ; then
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- if test x${GTK_CONFIG_2_0+set} != xset ; then
- GTK_CONFIG_2_0=$gtk_config_prefix/bin/gtk-config-2.0
- fi
- fi
+ no_gtk=""
- # 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
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9913: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then
+echo "configure:10376: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- case "$GTK_CONFIG_2_0" in
+ case "$PKG_CONFIG" in
/*)
- ac_cv_path_GTK_CONFIG_2_0="$GTK_CONFIG_2_0" # Let the user override the test with a path.
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
?:/*)
- ac_cv_path_GTK_CONFIG_2_0="$GTK_CONFIG_2_0" # Let the user override the test with a dos path.
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- ac_cv_path_GTK_CONFIG_2_0="$ac_dir/$ac_word"
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_path_GTK_CONFIG_2_0" && ac_cv_path_GTK_CONFIG_2_0="no"
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
-GTK_CONFIG_2_0="$ac_cv_path_GTK_CONFIG_2_0"
-if test -n "$GTK_CONFIG_2_0"; then
- echo "$ac_t""$GTK_CONFIG_2_0" 1>&6
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+if test -n "$PKG_CONFIG"; then
+ echo "$ac_t""$PKG_CONFIG" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- min_gtk_version=1.3.1
- echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:9948: checking for GTK - version >= $min_gtk_version" >&5
- no_gtk=""
- if test "$GTK_CONFIG_2_0" = "no" ; then
- no_gtk=yes
+
+ if test x$PKG_CONFIG != xno ; then
+ if pkg-config --atleast-pkgconfig-version 0.7 ; then
+ :
+ else
+ echo *** pkg-config too old; version 0.7 or better required.
+ no_gtk=yes
+ PKG_CONFIG=no
+ fi
else
- GTK_CFLAGS=`$GTK_CONFIG_2_0 $gtk_config_args --cflags`
- GTK_LIBS=`$GTK_CONFIG_2_0 $gtk_config_args --libs`
- gtk_config_major_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+ no_gtk=yes
+ fi
+
+ min_gtk_version=2.0.0
+ echo $ac_n "checking for GTK+ - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:10424: checking for GTK+ - version >= $min_gtk_version" >&5
+
+ if test x$PKG_CONFIG != xno ; then
+ ## don't try to run the test against uninstalled libtool libs
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
+ echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+ enable_gtktest=no
+ fi
+
+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+ :
+ else
+ no_gtk=yes
+ fi
+ fi
+
+ if test x"$no_gtk" = x ; then
+ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
- gtk_config_minor_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
- gtk_config_micro_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
if test "x$enable_gtktest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 9971 "configure"
+#line 10459 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
-int
+int
main ()
{
int major, minor, micro;
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
- printf("\n*** 'gtk-config-2.0 --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+ printf("\n*** 'pkg-config --modversion gtk+-2.0' 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-2.0 was correct, then it is best\n");
+ printf ("*** was found! If pkg-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-2.0 was wrong, set the environment variable GTK_CONFIG_2_0\n");
- printf("*** to point to the correct copy of gtk-config-2.0, 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)
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+ printf("*** to point to the correct configuration files\n");
+ }
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
- (gtk_minor_version != GTK_MINOR_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);
+ 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);
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
}
-#endif /* defined (GTK_MAJOR_VERSION) ... */
else
{
if ((gtk_major_version > major) ||
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);
+ 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-2.0 shell script is\n");
+ printf("*** probably means that the wrong copy of the pkg-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_2_0 environment to point to the\n");
- printf("*** correct copy of gtk-config-2.0. (In this case, you will have to\n");
+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
+ printf("*** correct copy of pkg-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");
}
}
EOF
-if { (eval echo configure:10049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
fi
if test "x$no_gtk" = x ; then
echo "$ac_t""yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" 1>&6
- wx_cv_lib_gtk=2.0
+ wx_cv_lib_gtk=2.0
else
echo "$ac_t""no" 1>&6
- if test "$GTK_CONFIG_2_0" = "no" ; then
- echo "*** The gtk-config-2.0 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_2_0 environment variable to the"
- echo "*** full path to gtk-config-2.0."
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** A new enough version of pkg-config was not found."
+ echo "*** See http://pkgconfig.sourceforge.net"
else
if test -f conf.gtktest ; then
:
else
- echo "*** Could not run GTK test program, checking why..."
+ echo "*** Could not run GTK+ test program, checking why..."
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10083 "configure"
+#line 10566 "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:10093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10576: \"$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 "*** 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 "***"
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"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
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-2.0 script: $GTK_CONFIG_2_0"
+ 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 pkg-config script: $PKG_CONFIG"
fi
rm -f conftest*
CFLAGS="$ac_save_CFLAGS"
# 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:10184: checking for $ac_word" >&5
+echo "configure:10662: 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:10219: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:10697: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" = "no" ; then
no_gtk=yes
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 10242 "configure"
+#line 10720 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:10320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10798: \"$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 10354 "configure"
+#line 10832 "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:10364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10842: \"$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"
# 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:10455: checking for $ac_word" >&5
+echo "configure:10933: 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:10490: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:10968: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" = "no" ; then
no_gtk=yes
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 10513 "configure"
+#line 10991 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:10591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11069: \"$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 10625 "configure"
+#line 11103 "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:10635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11113: \"$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"
GUIDIST=GTK_DIST
echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:10715: checking for gdk_im_open in -lgdk" >&5
+echo "configure:11193: 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 10723 "configure"
+#line 11201 "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:10734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11212: \"$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_MGL" = 1; then
echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
-echo "configure:10761: checking for SciTech MGL library" >&5
+echo "configure:11239: 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; }
GUIDIST=MGL_DIST
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:10808: 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 10813 "configure"
-#include "confdefs.h"
-#include <windows.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10818: \"$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
- :
-else
- echo "$ac_t""no" 1>&6
-
- { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
-
-fi
-
-
- xpm_link=
- echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:10845: checking for Xpm library" >&5
-
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
- do
- for ac_extension in a so sl dylib; do
- if test -f "$ac_dir/libXpm.$ac_extension"; then
- ac_find_libraries=$ac_dir
- break 2
- fi
- done
- done
-
- if test "$ac_find_libraries" != "" ; then
- GUI_TK_LIBRARY="-L$ac_find_libraries"
- xpm_link=" -lXpm"
- cat >> confdefs.h <<\EOF
-#define wxHAVE_LIB_XPM 1
-EOF
-
- echo "$ac_t""found at $ac_find_libraries" 1>&6
+ if test "$wxUSE_MICROWIN" = 1; then
+ echo $ac_n "checking for MicroWindows""... $ac_c" 1>&6
+echo "configure:11285: 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""no" 1>&6
- echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+ echo "$ac_t""$MICROWINDOWS" 1>&6
fi
- mesa_link=
- echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:10873: checking for Mesa library" >&5
-
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
- do
- for ac_extension in a so sl dylib; do
- if test -f "$ac_dir/libMesaGL.$ac_extension"; then
- ac_find_libraries=$ac_dir
- break 2
- fi
- done
- done
-
- if test "$ac_find_libraries" != "" ; then
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
- mesa_link=" -lMesaGL"
- echo "$ac_t""found at $ac_find_libraries" 1>&6
+ if test -f $MICROWINDOWS/lib/libmwin.a; then
+ echo "$ac_t""MicroWindows' libraries found." 1>&6
else
- { echo "configure: error: no" 1>&2; exit 1; }
+ { echo "configure: error: Cannot find MicroWindows libraries, make sure they are compiled." 1>&2; exit 1; }
fi
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
- TOOLKIT=MSW
- GUIDIST=MSW_DIST
- TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__"
+ 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_MOTIF" = 1; then
+ if test "$wxUSE_X11" = 1; then
# If we find X, set shell vars x_includes and x_libraries to the
# paths, otherwise set no_x=yes.
# 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:10906: checking for X" >&5
+echo "configure:11315: 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 10968 "configure"
+#line 11377 "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:10973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11382: \"$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 11042 "configure"
+#line 11451 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:11049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11458: \"$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.
done
fi
rm -f conftest*
-fi # $ac_x_libraries = NO
+fi # $ac_x_libraries = NO
+
+if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
+ # Didn't find X anywhere. Cache the known absence of X.
+ ac_cv_have_x="have_x=no"
+else
+ # Record where we found X for the cache.
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+fi
+fi
+ fi
+ eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+ echo "$ac_t""$have_x" 1>&6
+ no_x=yes
+else
+ # If each of the values was on the command line, it overrides each guess.
+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+ # Update the cache value to reflect the command line values.
+ ac_cv_have_x="have_x=yes \
+ ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+ echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
+fi
+
+if test "$no_x" = yes; then
+ # Not all programs may use this symbol, but it does not hurt to define it.
+ cat >> confdefs.h <<\EOF
+#define X_DISPLAY_MISSING 1
+EOF
+
+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+else
+ if test -n "$x_includes"; then
+ X_CFLAGS="$X_CFLAGS -I$x_includes"
+ fi
+
+ # It would also be nice to do this for all -L options, not just this one.
+ if test -n "$x_libraries"; then
+ X_LIBS="$X_LIBS -L$x_libraries"
+ # For Solaris; some versions of Sun CC require a space after -R and
+ # others require no space. Words are not sufficient . . . .
+ 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:11564: 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 11567 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:11574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_nospace=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_R_nospace=no
+fi
+rm -f conftest*
+ if test $ac_R_nospace = yes; then
+ echo "$ac_t""no" 1>&6
+ X_LIBS="$X_LIBS -R$x_libraries"
+ else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat > conftest.$ac_ext <<EOF
+#line 11590 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:11597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_space=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_R_space=no
+fi
+rm -f conftest*
+ if test $ac_R_space = yes; then
+ echo "$ac_t""yes" 1>&6
+ X_LIBS="$X_LIBS -R $x_libraries"
+ else
+ echo "$ac_t""neither works" 1>&6
+ fi
+ fi
+ LIBS="$ac_xsave_LIBS"
+ esac
+ fi
+
+ # Check for system-dependent libraries X programs must link with.
+ # Do this before checking for the system-independent R6 libraries
+ # (-lICE), since we may need -lsocket or whatever for X linking.
+
+ if test "$ISC" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+ else
+ # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
+ # 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:11629: 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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-ldnet $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 11637 "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
+ builtin and then its argument prototype would still apply. */
+char dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:11648: \"$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"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ 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:11670: 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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-ldnet_stub $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 11678 "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
+ builtin and then its argument prototype would still apply. */
+char dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:11689: \"$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"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+ # to get the SysV transport functions.
+ # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
+ # needs -lnsl.
+ # 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:11718: 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 11723 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gethostbyname(); 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 gethostbyname();
+
+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_gethostbyname) || defined (__stub___gethostbyname)
+choke me
+#else
+gethostbyname();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:11746: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_gethostbyname=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test $ac_cv_func_gethostbyname = no; then
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:11767: 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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lnsl $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 11775 "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
+ builtin and then its argument prototype would still apply. */
+char gethostbyname();
+
+int main() {
+gethostbyname()
+; return 0; }
+EOF
+if { (eval echo configure:11786: \"$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"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ # lieder@skyler.mavd.honeywell.com says without -lsocket,
+ # socket/setsockopt and other routines are undefined under SCO ODT
+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
+ # on later versions), says simon@lia.di.epfl.ch: it contains
+ # gethostby* variants that don't use the nameserver (or something).
+ # -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:11816: 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 11821 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char connect(); 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 connect();
+
+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_connect) || defined (__stub___connect)
+choke me
+#else
+connect();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:11844: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_connect=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test $ac_cv_func_connect = no; then
+ echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+echo "configure:11865: 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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 11873 "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
+ builtin and then its argument prototype would still apply. */
+char connect();
+
+int main() {
+connect()
+; return 0; }
+EOF
+if { (eval echo configure:11884: \"$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"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+ echo $ac_n "checking for remove""... $ac_c" 1>&6
+echo "configure:11908: 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 11913 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char remove(); 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 remove();
+
+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_remove) || defined (__stub___remove)
+choke me
+#else
+remove();
+#endif
+
+; return 0; }
+EOF
+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_func_remove=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_remove=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test $ac_cv_func_remove = no; then
+ echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+echo "configure:11957: 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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lposix $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 11965 "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
+ builtin and then its argument prototype would still apply. */
+char remove();
+
+int main() {
+remove()
+; return 0; }
+EOF
+if { (eval echo configure:11976: \"$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"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ echo $ac_n "checking for shmat""... $ac_c" 1>&6
+echo "configure:12000: 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 12005 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shmat(); 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 shmat();
+
+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_shmat) || defined (__stub___shmat)
+choke me
+#else
+shmat();
+#endif
+
+; return 0; }
+EOF
+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_func_shmat=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_shmat=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test $ac_cv_func_shmat = no; then
+ echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+echo "configure:12049: 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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lipc $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12057 "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
+ builtin and then its argument prototype would still apply. */
+char shmat();
+
+int main() {
+shmat()
+; return 0; }
+EOF
+if { (eval echo configure:12068: \"$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"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ fi
+ fi
+
+ # Check for libraries that X11R6 Xt/Xaw programs need.
+ ac_save_LDFLAGS="$LDFLAGS"
+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+ # check for ICE first), but we must link in the order -lSM -lICE or
+ # we get undefined symbols. So assume we have SM if we have ICE.
+ # These have to be linked with before -lX11, unlike the other
+ # 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:12101: 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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#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
+ builtin and then its argument prototype would still apply. */
+char IceConnectionNumber();
+
+int main() {
+IceConnectionNumber()
+; return 0; }
+EOF
+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
+ 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"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ LDFLAGS="$ac_save_LDFLAGS"
+
+fi
+
+
+ if test "$no_x" = "yes"; then
+ { echo "configure: error: X11 not found" 1>&2; exit 1; }
+ fi
+
+ GUI_TK_LIBRARY="$X_LIBS"
+ TOOLKIT_INCLUDE="$X_CFLAGS"
+ AFMINSTALL=afminstall
+ COMPILED_X_PROGRAM=0
+
+ if test "$wxUSE_NANOX" = "yes"; then
+ echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6
+echo "configure:12156: checking for MicroWindows/NanoX distribution" >&5
+ if test "x$MICROWIN" = x ; then
+ echo "$ac_t""not found" 1>&6
+ { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWIN is set." 1>&2; exit 1; }
+ else
+ echo "$ac_t""$MICROWIN" 1>&6
+ cat >> confdefs.h <<\EOF
+#define wxUSE_NANOX 1
+EOF
+
+ fi
+ fi
+
+ xpm_link=
+ echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:12171: checking for Xpm library" >&5
+
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+ do
+ for ac_extension in a so sl dylib; do
+ if test -f "$ac_dir/libXpm.$ac_extension"; then
+ ac_find_libraries=$ac_dir
+ break 2
+ fi
+ done
+ done
+
+ if test "$ac_find_libraries" != "" ; then
+
+ echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
+ result=$?
+ if test $result = 0; then
+ ac_path_to_link=""
+ else
+ ac_path_to_link=" -L$ac_find_libraries"
+ fi
+
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+ xpm_link=" -lXpm"
+ cat >> confdefs.h <<\EOF
+#define wxHAVE_LIB_XPM 1
+EOF
+
+ echo "$ac_t""found at $ac_find_libraries" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+#line 12203 "configure"
+#include "confdefs.h"
+
+ #include <X11/xpm.h>
+
+int main() {
+
+ int version;
+ version = XpmLibraryVersion();
+
+; return 0; }
+EOF
+if { (eval echo configure:12215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ xpm_link=" -lXpm"
+ cat >> confdefs.h <<\EOF
+#define wxHAVE_LIB_XPM 1
+EOF
+
+ echo "$ac_t""found in default search path" 1>&6
+ COMPILED_X_PROGRAM=0
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ echo "$ac_t""no" 1>&6
+ echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+
+
+fi
+rm -f conftest*
+ fi
-if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
- # Didn't find X anywhere. Cache the known absence of X.
- ac_cv_have_x="have_x=no"
+ if test "$wxUSE_NANOX" = "yes"; then
+ TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
+ else
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
+ fi
+
+ TOOLKIT_VPATH="\${top_srcdir}/src/x11"
+ TOOLKIT=X11
+ GUIDIST=X11_DIST
+ 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:12255: 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
- # Record where we found X for the cache.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+ cat > conftest.$ac_ext <<EOF
+#line 12260 "configure"
+#include "confdefs.h"
+#include <windows.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12265: \"$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
- fi
- eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
- echo "$ac_t""$have_x" 1>&6
- no_x=yes
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
else
- # If each of the values was on the command line, it overrides each guess.
- test "x$x_includes" = xNONE && x_includes=$ac_x_includes
- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
- # Update the cache value to reflect the command line values.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
+ echo "$ac_t""no" 1>&6
+
+ { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+
fi
-if test "$no_x" = yes; then
+
+ xpm_link=
+ echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:12292: checking for Xpm library" >&5
+
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+ do
+ for ac_extension in a so sl dylib; do
+ if test -f "$ac_dir/libXpm.$ac_extension"; then
+ ac_find_libraries=$ac_dir
+ break 2
+ fi
+ done
+ done
+
+ if test "$ac_find_libraries" != "" ; then
+ GUI_TK_LIBRARY="-L$ac_find_libraries"
+ xpm_link=" -lXpm"
+ cat >> confdefs.h <<\EOF
+#define wxHAVE_LIB_XPM 1
+EOF
+
+ echo "$ac_t""found at $ac_find_libraries" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+ fi
+
+ mesa_link=
+ echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
+echo "configure:12320: checking for Mesa library" >&5
+
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+ do
+ for ac_extension in a so sl dylib; do
+ if test -f "$ac_dir/libMesaGL.$ac_extension"; then
+ ac_find_libraries=$ac_dir
+ break 2
+ fi
+ done
+ done
+
+ if test "$ac_find_libraries" != "" ; then
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
+ mesa_link=" -lMesaGL"
+ echo "$ac_t""found at $ac_find_libraries" 1>&6
+ else
+ { echo "configure: error: no" 1>&2; exit 1; }
+ fi
+
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
+ TOOLKIT=MSW
+ GUIDIST=MSW_DIST
+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__"
+ fi
+
+ if test "$wxUSE_MOTIF" = 1; then
+ if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
cat >> confdefs.h <<\EOF
#define X_DISPLAY_MISSING 1
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:11155: checking whether -R must be followed by a space" >&5
+echo "configure:12368: 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 11158 "configure"
+#line 12371 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:11165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12378: \"$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 11181 "configure"
+#line 12394 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:11188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12401: \"$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:11220: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:12433: 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 11228 "configure"
+#line 12441 "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:11239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12452: \"$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:11261: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:12474: 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 11269 "configure"
+#line 12482 "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:11280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12493: \"$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:11309: checking for gethostbyname" >&5
+echo "configure:12522: 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 11314 "configure"
+#line 12527 "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:11337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12550: \"$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:11358: checking for gethostbyname in -lnsl" >&5
+echo "configure:12571: 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 11366 "configure"
+#line 12579 "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:11377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12590: \"$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:11407: checking for connect" >&5
+echo "configure:12620: 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 11412 "configure"
+#line 12625 "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:11435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12648: \"$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:11456: checking for connect in -lsocket" >&5
+echo "configure:12669: 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 11464 "configure"
+#line 12677 "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:11475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12688: \"$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:11499: checking for remove" >&5
+echo "configure:12712: 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 11504 "configure"
+#line 12717 "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:11527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12740: \"$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:11548: checking for remove in -lposix" >&5
+echo "configure:12761: 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 11556 "configure"
+#line 12769 "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:11567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12780: \"$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:11591: checking for shmat" >&5
+echo "configure:12804: 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 11596 "configure"
+#line 12809 "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:11619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12832: \"$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:11640: checking for shmat in -lipc" >&5
+echo "configure:12853: 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 11648 "configure"
+#line 12861 "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:11659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12872: \"$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:11692: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:12905: 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 11700 "configure"
+#line 12913 "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:11711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12924: \"$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:11746: checking for Motif/Lesstif headers" >&5
+echo "configure:12959: 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 11761 "configure"
+#line 12974 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:11773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12986: \"$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:11794: checking for Motif/Lesstif library" >&5
+echo "configure:13007: 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 11833 "configure"
+#line 13046 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:11845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13058: \"$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:11867: checking for Xpm library" >&5
+echo "configure:13080: 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 11899 "configure"
+#line 13112 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
; return 0; }
EOF
-if { (eval echo configure:11911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
xpm_link=" -lXpm"
CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
CFLAGS="$CFLAGS -fpascal-strings"
CXXFLAGS="$CXXFLAGS -fpascal-strings"
- TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -DTARGET_CARBON"
TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
TOOLKIT=MAC
if test "$wxUSE_UNIVERSAL" = "yes"; then
ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+
+ ALL_SOURCES="\$(ALL_SOURCES) \${UNIV_SOURCES}"
+ ALL_HEADERS="\$(ALL_HEADERS) \${UNIV_HEADERS}"
+
PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
- TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
+ if test "$wxUSE_X11" = 1; then
+ TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}${PATH_IFS}\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes"
+ else
+ TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
+ fi
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
WIDGET_SET=univ
else
ALL_OBJECTS="\$(GUIOBJS)"
+ ALL_SOURCES="\$(ALL_SOURCES)"
+ ALL_HEADERS="\$(ALL_HEADERS)"
fi
ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)"
fi
- if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
- ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
- fi
if test "$wxUSE_LIBJPEG" = "builtin" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
fi
if test "$wxUSE_LIBPNG" = "builtin" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)"
fi
- if test "$wxUSE_FREETYPE" = "builtin" ; then
- ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
- fi
GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
DISTDIR="wx\$(TOOLKIT)"
TOOLKIT_VPATH="\${top_srcdir}/src/unix"
fi
+ ALL_SOURCES="\$(ALL_SOURCES)"
+ ALL_HEADERS="\$(ALL_HEADERS)"
+
PORT_FILES="\${top_srcdir}/src/files.lst"
GUIDIST="BASE_DIST"
DISTDIR="wxBase"
fi
+
+if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+fi
+
if test "$wxUSE_REGEX" = "builtin" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
fi
ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
-echo "configure:12041: checking for GL/gl.h" >&5
+echo "configure:13265: 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 12046 "configure"
+#line 13270 "configure"
#include "confdefs.h"
#include <GL/gl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13275: \"$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:12069: checking for -lGL" >&5
+echo "configure:13293: checking for -lGL" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
ac_path_to_link=" -L$ac_find_libraries"
fi
- LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+ if test "$ac_path_to_link" = " -L/usr/lib" ; then
+ LDFLAGS_GL="$LDFLAGS"
+ else
+ LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+ fi
OPENGL_LIBS="-lGL -lGLU"
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6
-echo "configure:12098: checking for -lMesaGL" >&5
+echo "configure:13326: checking for -lMesaGL" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
+if test "$wxUSE_SHARED" = "yes"; then
+ case "${host}" in
+ *-pc-os2_emx | *-pc-os2-emx | \
+ *-pc-msdosdjgpp )
+ wxUSE_SHARED=no
+ echo "configure: warning: Host system doesn't support shared libraries, disabling" 1>&2
+ ;;
+ esac
+fi
+
if test "$wxUSE_SHARED" = "yes"; then
if test "$wxUSE_OPENGL" = "yes"; then
case "${host}" in
*-hp-hpux* )
- if test "$GCC" != "yes"; then
+ if test "$GCC" == "yes"; then
+ SHARED_LD="${SHARED_LD} ${PIC_FLAG}"
+ else
LDFLAGS="$LDFLAGS -L/usr/lib"
SHARED_LD="${CXX} -b -o"
*-*-linux* )
if test "$GCC" != "yes"; then
echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6
-echo "configure:12276: checking for Intel compiler" >&5
+echo "configure:13516: 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 12282 "configure"
+#line 13522 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:12293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_prog_icc=yes
else
SHARED_LD="${CXX} -G -o"
PIC_FLAG="-KPIC"
SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
- SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED}"
+ SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
fi
;;
*-*-darwin* )
- CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
+ CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
+ LDFLAGS_EXE="$LDFLAGS_EXE -Wl,-bind_at_load"
SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
PIC_FLAG="-dynamic -fPIC"
+ SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
+ SONAME_FLAGS_GL=${SONAME_FLAGS}
;;
*-*-aix* )
fi
;;
- *-pc-os2_emx | *-pc-os2-emx )
- wxUSE_SHARED=no
- ;;
-
*-*-beos* )
SHARED_LD="${LD} -shared -o"
;;
# 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:12418: checking for $ac_word" >&5
+echo "configure:13657: 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
# 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:12448: checking for $ac_word" >&5
+echo "configure:13687: 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
echo "$ac_t""no" 1>&6
fi
+ MACOSX_BUNDLE="bundle"
LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o"
+else
+ if test "$wxUSE_PM" = 1; then
+ LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
+ fi
fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12486: checking for $ac_hdr" >&5
+echo "configure:13730: 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 12491 "configure"
+#line 13735 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13740: \"$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:12528: checking for $ac_hdr" >&5
+echo "configure:13772: 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 12533 "configure"
+#line 13777 "configure"
#include "confdefs.h"
#include <$ac_hdr>
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:13782: \"$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:12568: checking for $ac_hdr" >&5
+echo "configure:13812: 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 12573 "configure"
+#line 13817 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13822: \"$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:12608: checking for $ac_hdr" >&5
+echo "configure:13852: 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 12613 "configure"
+#line 13857 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13862: \"$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:12648: checking for $ac_hdr" >&5
+echo "configure:13892: 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 12653 "configure"
+#line 13897 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13902: \"$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*
fi
done
-for ac_hdr in wcstr.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12688: 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 12693 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12698: \"$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 wctype.h
+if test "$ac_cv_header_wchar_h" != "yes"; then
+ for ac_hdr in wcstr.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12728: checking for $ac_hdr" >&5
+echo "configure:13934: 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 12733 "configure"
+#line 13939 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13944: \"$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*
fi
done
-for ac_hdr in fnmatch.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12768: 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 12773 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12778: \"$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 iconv.h
+
+for ac_hdr in fnmatch.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12808: checking for $ac_hdr" >&5
+echo "configure:13977: 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 12813 "configure"
+#line 13982 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13987: \"$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:12848: checking for $ac_hdr" >&5
+echo "configure:14017: 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 12853 "configure"
+#line 14022 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14027: \"$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:12891: checking for $ac_hdr" >&5
+echo "configure:14060: 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 12896 "configure"
+#line 14065 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14070: \"$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:12932: checking for ANSI C header files" >&5
+echo "configure:14101: 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 12937 "configure"
+#line 14106 "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:12945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14114: \"$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 12962 "configure"
+#line 14131 "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 12980 "configure"
+#line 14149 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 13001 "configure"
+#line 14170 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:13012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14181: \"$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:13036: checking for mode_t" >&5
+echo "configure:14205: 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 13041 "configure"
+#line 14210 "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:13069: checking for off_t" >&5
+echo "configure:14238: 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 13074 "configure"
+#line 14243 "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:13102: checking for pid_t" >&5
+echo "configure:14271: 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 13107 "configure"
+#line 14276 "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:13135: checking for size_t" >&5
+echo "configure:14304: 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 13140 "configure"
+#line 14309 "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:13168: checking for uid_t in sys/types.h" >&5
+echo "configure:14337: 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 13173 "configure"
+#line 14342 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
-echo "configure:13203: checking for wchar_t" >&5
+echo "configure:14372: 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 13209 "configure"
+#line 14378 "configure"
#include "confdefs.h"
#ifdef HAVE_WCHAR_H
; return 0; }
EOF
-if { (eval echo configure:13230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14399: \"$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:13262: checking if size_t is unsigned int" >&5
+echo "configure:14431: 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 13267 "configure"
+#line 14436 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:13280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14449: \"$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:13303: checking if size_t is unsigned long" >&5
+echo "configure:14472: 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 13308 "configure"
+#line 14477 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:13321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14490: \"$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:13355: checking for pw_gecos in struct passwd" >&5
+echo "configure:14524: 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 13361 "configure"
+#line 14530 "configure"
#include "confdefs.h"
#include <pwd.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:13372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14541: \"$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:13402: checking for working const" >&5
+echo "configure:14571: 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 13407 "configure"
+#line 14576 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:13456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14625: \"$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:13477: checking for inline" >&5
+echo "configure:14646: 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 13484 "configure"
+#line 14653 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:13491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14660: \"$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:13518: checking size of char" >&5
+echo "configure:14687: 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 13526 "configure"
+#line 14695 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:13538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14706: \"$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:13558: checking size of short" >&5
+echo "configure:14726: 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 13566 "configure"
+#line 14734 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:13578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14745: \"$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
EOF
-echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:13598: checking size of int *" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
+echo $ac_n "checking size of void *""... $ac_c" 1>&6
+echo "configure:14765: checking size of void *" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
- ac_cv_sizeof_int_p=4
+ ac_cv_sizeof_void_p=4
else
cat > conftest.$ac_ext <<EOF
-#line 13606 "configure"
+#line 14773 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(int *));
+ fprintf(f, "%d\n", sizeof(void *));
exit(0);
}
EOF
-if { (eval echo configure:13618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14784: \"$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`
+ ac_cv_sizeof_void_p=`cat conftestval`
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -fr conftest*
- ac_cv_sizeof_int_p=0
+ ac_cv_sizeof_void_p=0
fi
rm -fr conftest*
fi
fi
-echo "$ac_t""$ac_cv_sizeof_int_p" 1>&6
+echo "$ac_t""$ac_cv_sizeof_void_p" 1>&6
cat >> confdefs.h <<EOF
-#define SIZEOF_INT_P $ac_cv_sizeof_int_p
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
EOF
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:13638: checking size of int" >&5
+echo "configure:14804: 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
if test "$cross_compiling" = yes; then
- ac_cv_sizeof_int=4
+ ac_cv_sizeof_int=4
+else
+ cat > conftest.$ac_ext <<EOF
+#line 14812 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+ fprintf(f, "%d\n", sizeof(int));
+ exit(0);
+}
+EOF
+if { (eval echo configure:14823: \"$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 "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ac_cv_sizeof_int=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
+
+
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:14843: 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
+ if test "$cross_compiling" = yes; then
+ ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 13646 "configure"
+#line 14851 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(int));
+ fprintf(f, "%d\n", sizeof(long));
exit(0);
}
EOF
-if { (eval echo configure:13658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14862: \"$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`
+ ac_cv_sizeof_long=`cat conftestval`
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -fr conftest*
- ac_cv_sizeof_int=0
+ ac_cv_sizeof_long=0
fi
rm -fr conftest*
fi
fi
-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
cat >> confdefs.h <<EOF
-#define SIZEOF_INT $ac_cv_sizeof_int
+#define SIZEOF_LONG $ac_cv_sizeof_long
EOF
-echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:13678: checking size of long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+
+case "${host}" in
+ arm-*-linux* )
+ echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:14885: 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
if test "$cross_compiling" = yes; then
- ac_cv_sizeof_long=4
+ ac_cv_sizeof_long_long=8
else
cat > conftest.$ac_ext <<EOF
-#line 13686 "configure"
+#line 14893 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long));
+ fprintf(f, "%d\n", sizeof(long long));
exit(0);
}
EOF
-if { (eval echo configure:13698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14904: \"$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`
+ ac_cv_sizeof_long_long=`cat conftestval`
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -fr conftest*
- ac_cv_sizeof_long=0
+ ac_cv_sizeof_long_long=0
fi
rm -fr conftest*
fi
fi
-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
cat >> confdefs.h <<EOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
EOF
-echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:13718: checking size of long long" >&5
+ ;;
+ * )
+ echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:14926: 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 13726 "configure"
+#line 14934 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:13738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:14945: \"$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
EOF
+esac
+
echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
-echo "configure:13759: checking size of wchar_t" >&5
+echo "configure:14968: 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 13769 "configure"
+#line 14978 "configure"
#include "confdefs.h"
#ifdef HAVE_WCHAR_H
}
EOF
-if { (eval echo configure:13791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15000: \"$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:13814: checking whether byte ordering is bigendian" >&5
+echo "configure:15023: 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 13821 "configure"
+#line 15030 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:13832: \"$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*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 13836 "configure"
+#line 15045 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:13847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15056: \"$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 13867 "configure"
+#line 15076 "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:13880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15089: \"$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:13908: checking how to run the C++ preprocessor" >&5
+echo "configure:15117: 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 13921 "configure"
+#line 15130 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15135: \"$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:13970: checking for $ac_hdr" >&5
+echo "configure:15179: 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 13975 "configure"
+#line 15184 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15189: \"$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:14028: checking if C++ compiler supports bool" >&5
+echo "configure:15237: 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 14043 "configure"
+#line 15252 "configure"
#include "confdefs.h"
; return 0; }
EOF
-if { (eval echo configure:14055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15264: \"$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:14093: checking for wcslen in -lc" >&5
+echo "configure:15302: 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 14101 "configure"
+#line 15310 "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:14112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15321: \"$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:14138: checking for wcslen in -lw" >&5
+echo "configure:15347: 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 14146 "configure"
+#line 15355 "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:14157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15366: \"$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:14183: checking for wcslen in -lmsvcrt" >&5
+echo "configure:15392: 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 14191 "configure"
+#line 15400 "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:14202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15411: \"$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:14238: checking for $ac_func" >&5
+echo "configure:15447: 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 14243 "configure"
+#line 15452 "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:14266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15475: \"$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:14292: checking for vprintf" >&5
+echo "configure:15501: 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 14297 "configure"
+#line 15506 "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:14320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15529: \"$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:14344: checking for _doprnt" >&5
+echo "configure:15553: 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 14349 "configure"
+#line 15558 "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:14372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15581: \"$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:14402: checking for vsnprintf" >&5
+echo "configure:15611: 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 14408 "configure"
+#line 15617 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:14433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15642: \"$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 14444 "configure"
+#line 15653 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:14469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
wx_cv_func_vsnprintf=yes
fi
echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
-echo "configure:14501: checking for vsscanf" >&5
+echo "configure:15710: 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 14507 "configure"
+#line 15716 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:14530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_vsscanf=yes
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
-echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6
-echo "configure:14568: checking if iconv() takes char**" >&5
-if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then
+
+
+ # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then
+ withval="$with_libiconv_prefix"
+
+ for dir in `echo "$withval" | tr : ' '`; do
+ if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+ if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+ done
+
+fi
+
+
+ echo $ac_n "checking for iconv""... $ac_c" 1>&6
+echo "configure:15791: checking for iconv" >&5
+if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
cat > conftest.$ac_ext <<EOF
-#line 14574 "configure"
+#line 15799 "configure"
#include "confdefs.h"
+#include <stdlib.h>
#include <iconv.h>
int main() {
-
- char **inbuf, **outbuf;
- iconv_t cd;
- size_t insz, outsz;
- iconv(cd, inbuf, &insz, outbuf, &outsz);
-
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
; return 0; }
EOF
-if { (eval echo configure:14586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- wx_cv_iconv_takes_char=yes
+ am_cv_func_iconv=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS -liconv"
+ cat > conftest.$ac_ext <<EOF
+#line 15821 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <iconv.h>
+int main() {
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+; return 0; }
+EOF
+if { (eval echo configure:15831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- wx_cv_iconv_takes_char=no
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
fi
rm -f conftest*
+ LIBS="$am_save_LIBS"
+ fi
+
+fi
+
+echo "$ac_t""$am_cv_func_iconv" 1>&6
+ if test "$am_cv_func_iconv" = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_ICONV 1
+EOF
+
+ echo $ac_n "checking if iconv needs const""... $ac_c" 1>&6
+echo "configure:15852: checking if iconv needs const" >&5
+if eval "test \"`echo '$''{'wx_cv_func_iconv_const'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 15857 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+
+int main() {
+; return 0; }
+EOF
+if { (eval echo configure:15876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_func_iconv_const="no"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ wx_cv_func_iconv_const="yes"
+
+fi
+rm -f conftest*
+
fi
-echo "$ac_t""$wx_cv_iconv_takes_char" 1>&6
+echo "$ac_t""$wx_cv_func_iconv_const" 1>&6
+
+ iconv_const=
+ if test "x$wx_cv_func_iconv_const" = "xyes"; then
+ iconv_const="const"
+ fi
+
+ cat >> confdefs.h <<EOF
+#define ICONV_CONST $iconv_const
+EOF
+
+ fi
+ LIBICONV=
+ if test "$am_cv_lib_iconv" = yes; then
+ LIBICONV="-liconv"
+ fi
+
+
+LIBS="$LIBICONV $LIBS"
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
-if test "$wx_cv_iconv_takes_char" = yes ; then
- cat >> confdefs.h <<\EOF
-#define WX_ICONV_TAKES_CHAR 1
-EOF
-
-fi
-
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
for ac_func in sigaction
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14619: checking for $ac_func" >&5
+echo "configure:15921: 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 14624 "configure"
+#line 15926 "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:14647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15949: \"$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:14688: checking for sa_handler type" >&5
+echo "configure:15990: 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 14694 "configure"
+#line 15996 "configure"
#include "confdefs.h"
#include <signal.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:14706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16008: \"$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:14743: checking for $ac_func" >&5
+echo "configure:16045: 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 14748 "configure"
+#line 16050 "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:14771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16073: \"$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 mkstemp mktemp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14799: checking for $ac_func" >&5
+echo "configure:16101: 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 14804 "configure"
+#line 16106 "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:14827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16129: \"$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 statfs""... $ac_c" 1>&6
-echo "configure:14853: checking for statfs" >&5
+echo "configure:16155: 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 14858 "configure"
+#line 16160 "configure"
#include "confdefs.h"
#if defined(__BSD__)
; return 0; }
EOF
-if { (eval echo configure:14879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16181: \"$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:14906: checking for statvfs" >&5
+echo "configure:16208: 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 14911 "configure"
+#line 16213 "configure"
#include "confdefs.h"
#include <sys/statvfs.h>
; return 0; }
EOF
-if { (eval echo configure:14927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16229: \"$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:14961: checking for $ac_func" >&5
+echo "configure:16263: 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 14966 "configure"
+#line 16268 "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:14989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16291: \"$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:15023: checking for $ac_func" >&5
+echo "configure:16325: 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 15028 "configure"
+#line 16330 "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:15051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16353: \"$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:15079: checking for $ac_func" >&5
+echo "configure:16381: 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 15084 "configure"
+#line 16386 "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:15107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16409: \"$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:15154: checking for $ac_func" >&5
+echo "configure:16456: 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 15159 "configure"
+#line 16461 "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:15182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16484: \"$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:15207: checking for nanosleep in -lposix4" >&5
+echo "configure:16509: 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 15215 "configure"
+#line 16517 "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:15226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16528: \"$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:15254: checking for $ac_func" >&5
+echo "configure:16556: 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"
+#line 16561 "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:15282: \"$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_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:15325: checking for $ac_func" >&5
+echo "configure:16627: 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 15330 "configure"
+#line 16632 "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:15353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16655: \"$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:15390: checking for $ac_func" >&5
+echo "configure:16692: 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 15395 "configure"
+#line 16697 "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:15421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16723: \"$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:15458: checking for $ac_func" >&5
+echo "configure:16760: 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 15463 "configure"
+#line 16765 "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:15486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16788: \"$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:15511: checking for inet_addr in -lnsl" >&5
+echo "configure:16813: 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 15519 "configure"
+#line 16821 "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:15530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16832: \"$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:15549: checking for inet_addr in -lresolv" >&5
+echo "configure:16851: 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 15557 "configure"
+#line 16859 "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:15568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16870: \"$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
INET_LINK="resolv"
-
else
echo "$ac_t""no" 1>&6
+echo $ac_n "checking for inet_addr in -lsocket""... $ac_c" 1>&6
+echo "configure:16889: checking for inet_addr in -lsocket" >&5
+ac_lib_var=`echo socket'_'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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lsocket $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 16897 "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
+ builtin and then its argument prototype would still apply. */
+char inet_addr();
+
+int main() {
+inet_addr()
+; return 0; }
+EOF
+if { (eval echo configure:16908: \"$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"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ INET_LINK="socket"
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
fi
for ac_func in inet_aton
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15601: checking for $ac_func" >&5
+echo "configure:16944: 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 15606 "configure"
+#line 16949 "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:15629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16972: \"$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:15654: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:16997: 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 15662 "configure"
+#line 17005 "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:15673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17016: \"$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
+CPP_MT_FLAG=
if test "$TOOLKIT" != "MSW"; then
-
+
THREADS_LINK=
- THREADS_OBJ=
- CODE_GEN_FLAGS=
- CODE_GEN_FLAGS_CXX=
+ THREADS_CFLAGS=
if test "$wxUSE_THREADS" = "yes" ; then
if test "$wxUSE_WINE" = 1 ; then
fi
if test "$wxUSE_THREADS" = "yes" ; then
+
- if test "$USE_AIX" = 1; then
- THREADS_LIB=pthreads
- else
- THREADS_LIB=pthread
- fi
-
- echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
-echo "configure:15788: 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
-else
- ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LIB $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 15796 "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
- builtin and then its argument prototype would still apply. */
-char pthread_create();
+ THREAD_OPTS="-pthread"
+ case "${host}" in
+ *-*-solaris2* | *-*-sunos4* )
+ if test "x$GCC" = "xyes"; then
+ THREAD_OPTS="-pthreads $THREAD_OPTS"
+ else
+ THREAD_OPTS="-mt $THREAD_OPTS"
+ fi
+ ;;
+ *-*-freebsd*)
+ THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
+ ;;
+ *-*-darwin*)
+ THREAD_OPTS=""
+ ;;
+ *-*-aix*)
+ THREAD_OPTS="pthreads"
+ ;;
+ esac
-int main() {
-pthread_create()
-; return 0; }
-EOF
-if { (eval echo configure:15807: \"$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"
+ THREAD_OPTS="$THREAD_OPTS pthread none"
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-
- THREADS_OBJ="threadpsx.lo"
- THREADS_LINK=$THREADS_LIB
-
-else
- echo "$ac_t""no" 1>&6
+ THREADS_OK=no
+ for flag in $THREAD_OPTS; do
+ case $flag in
+ none)
+ echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6
+echo "configure:17151: checking whether pthreads work without any flags" >&5
+ ;;
- echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:15830: 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
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lc_r $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 15838 "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
- builtin and then its argument prototype would still apply. */
-char pthread_create();
+ -*)
+ echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6
+echo "configure:17156: checking whether pthreads work with $flag" >&5
+ THREADS_CFLAGS="$flag"
+ ;;
-int main() {
-pthread_create()
-; return 0; }
-EOF
-if { (eval echo configure:15849: \"$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"
+ *)
+ echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6
+echo "configure:17162: checking for the pthreads library -l$flag" >&5
+ THREADS_LINK="-l$flag"
+ ;;
+ esac
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-
- THREADS_OBJ="threadpsx.lo"
- THREADS_LINK="c_r"
-
-else
- echo "$ac_t""no" 1>&6
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+ LIBS="$THREADS_LINK $LIBS"
+ CFLAGS="$THREADS_CFLAGS $CFLAGS"
- ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
-echo "configure:15873: 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 15878 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 17173 "configure"
#include "confdefs.h"
-#include <sys/prctl.h>
+#include <pthread.h>
+int main() {
+pthread_create(0,0,0,0);
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15883: \"$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 { (eval echo configure:17180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ THREADS_OK=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
-
- THREADS_OBJ="threadsgi.lo"
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
-fi
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
-
-fi
+ echo "$ac_t""$THREADS_OK" 1>&6
+ if test "x$THREADS_OK" = "xyes"; then
+ break;
+ fi
+ THREADS_LINK=""
+ THREADS_CFLAGS=""
+ done
- if test -z "$THREADS_OBJ" ; then
- wxUSE_THREADS=no
- echo "configure: warning: No thread support on this system... disabled" 1>&2
- fi
+ if test "x$THREADS_OK" != "xyes"; then
+ wxUSE_THREADS=no
+ echo "configure: warning: No thread support on this system... disabled" 1>&2
+ else
+ LIBS="$THREADS_LINK $THREADS_CFLAGS $LIBS"
+
+ echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6
+echo "configure:17208: checking if more special flags are required for pthreads" >&5
+ flag=no
+ case "${host}" in
+ *-aix* | *-freebsd*)
+ flag="-D_THREAD_SAFE"
+ ;;
+ *solaris* | alpha*-osf*)
+ flag="-D_REENTRANT"
+ ;;
+ esac
+ echo "$ac_t""${flag}" 1>&6
+ if test "x$flag" != xno; then
+ THREADS_CFLAGS="$THREADS_CFLAGS $flag"
+ fi
+
+ if test "x$THREADS_CFLAGS" != "x"; then
+ CFLAGS="$CFLAGS $THREADS_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $THREADS_CFLAGS"
+ fi
+ fi
fi
if test "$wxUSE_THREADS" = "yes" ; then
for ac_func in thr_setconcurrency
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15923: checking for $ac_func" >&5
+echo "configure:17234: 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 15928 "configure"
+#line 17239 "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:15951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17262: \"$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_hdr in sched.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15981: checking for $ac_hdr" >&5
+echo "configure:17291: 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 15986 "configure"
+#line 17296 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17301: \"$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*
fi
done
-
- echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:16019: 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
+ if test "$ac_cv_header_sched_h" = "yes"; then
+ echo $ac_n "checking for sched_yield""... $ac_c" 1>&6
+echo "configure:17329: checking for sched_yield" >&5
+if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 16027 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 17334 "configure"
#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char sched_yield(); 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 sched_yield();
-int main() {
-sched_yield()
+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_sched_yield) || defined (__stub___sched_yield)
+choke me
+#else
+sched_yield();
+#endif
+
; return 0; }
EOF
-if { (eval echo configure:16038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17357: \"$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"
+ eval "ac_cv_func_sched_yield=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_func_sched_yield=no"
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'sched_yield`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define HAVE_SCHED_YIELD 1
else
echo "$ac_t""no" 1>&6
-echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
-echo "configure:16060: checking for sched_yield in -lposix4" >&5
+
+ echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
+echo "configure:17379: 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 16068 "configure"
+#line 17387 "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:16079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17398: \"$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 "configure: warning: wxThread::Yield will not work properly" 1>&2
-
+
fi
-
+
+
fi
+ fi
HAVE_PRIOR_FUNCS=0
- echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:16110: 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 "checking for pthread_attr_getschedpolicy""... $ac_c" 1>&6
+echo "configure:17431: checking for pthread_attr_getschedpolicy" >&5
+if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_getschedpolicy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 16118 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 17436 "configure"
#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char pthread_attr_getschedpolicy(); 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 pthread_attr_getschedpolicy();
int main() {
-pthread_attr_getschedpolicy()
+
+/* 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_pthread_attr_getschedpolicy) || defined (__stub___pthread_attr_getschedpolicy)
+choke me
+#else
+pthread_attr_getschedpolicy();
+#endif
+
; return 0; }
EOF
-if { (eval echo configure:16129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17459: \"$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"
+ eval "ac_cv_func_pthread_attr_getschedpolicy=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_func_pthread_attr_getschedpolicy=no"
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'pthread_attr_getschedpolicy`\" = 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:16145: 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 "checking for pthread_attr_setschedparam""... $ac_c" 1>&6
+echo "configure:17474: checking for pthread_attr_setschedparam" >&5
+if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setschedparam'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 16153 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 17479 "configure"
#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char pthread_attr_setschedparam(); 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 pthread_attr_setschedparam();
int main() {
-pthread_attr_setschedparam()
+
+/* 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_pthread_attr_setschedparam) || defined (__stub___pthread_attr_setschedparam)
+choke me
+#else
+pthread_attr_setschedparam();
+#endif
+
; return 0; }
EOF
-if { (eval echo configure:16164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17502: \"$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"
+ eval "ac_cv_func_pthread_attr_setschedparam=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_func_pthread_attr_setschedparam=no"
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'pthread_attr_setschedparam`\" = 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:16180: 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 "checking for sched_get_priority_max""... $ac_c" 1>&6
+echo "configure:17517: checking for sched_get_priority_max" >&5
+if eval "test \"`echo '$''{'ac_cv_func_sched_get_priority_max'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 16188 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 17522 "configure"
#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes
+else
+ echo "$ac_t""no" 1>&6
+which can conflict with char sched_get_priority_max(); 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 sched_get_priority_max();
int main() {
-sched_get_priority_max()
+
+/* 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_sched_get_priority_max) || defined (__stub___sched_get_priority_max)
+choke me
+#else
+sched_get_priority_max();
+#endif
+
; return 0; }
EOF
-if { (eval echo configure:16199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17547: \"$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"
+ eval "ac_cv_func_sched_get_priority_max=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_func_sched_get_priority_max=no"
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'sched_get_priority_max`\" = yes"; then
echo "$ac_t""yes" 1>&6
HAVE_PRIOR_FUNCS=1
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
-echo "configure:16218: checking for sched_get_priority_max in -lposix4" >&5
+echo "configure:17565: 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 16226 "configure"
+#line 17573 "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:16237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17584: \"$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
-else
- echo "$ac_t""no" 1>&6
fi
echo "configure: warning: Setting thread priority will not work" 1>&2
fi
- echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:16284: 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 "checking for pthread_cancel""... $ac_c" 1>&6
+echo "configure:17629: checking for pthread_cancel" >&5
+if eval "test \"`echo '$''{'ac_cv_func_pthread_cancel'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 16292 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 17634 "configure"
#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char pthread_cancel(); 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 pthread_cancel();
int main() {
-pthread_cancel()
+
+/* 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_pthread_cancel) || defined (__stub___pthread_cancel)
+choke me
+#else
+pthread_cancel();
+#endif
+
; return 0; }
EOF
-if { (eval echo configure:16303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17657: \"$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"
+ eval "ac_cv_func_pthread_cancel=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_func_pthread_cancel=no"
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'pthread_cancel`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define HAVE_PTHREAD_CANCEL 1
echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:16329: checking for pthread_cleanup_push/pop" >&5
+echo "configure:17682: 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 16335 "configure"
+#line 17688 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:16345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17698: \"$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:16377: checking for pthread_mutexattr_t" >&5
+echo "configure:17730: 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 16383 "configure"
+#line 17736 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:16393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17746: \"$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:16420: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+echo "configure:17773: 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 16426 "configure"
+#line 17779 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:16435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_pthread_rec_mutex_init=yes
echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2
fi
fi
-
- THREADS_LINK=" -l$THREADS_LINK"
-
- if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
- CPPFLAGS="$CFLAGS -mt"
- CXXFLAGS="$CXXFLAGS -mt"
- LDFLAGS="$LDFLAGS -mt"
- fi
fi
fi
EOF
- 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:16487: checking if -D_REENTRANT is needed" >&5
+echo "configure:17830: 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
PROFILE=" -pg"
fi
+CODE_GEN_FLAGS=
+CODE_GEN_FLAGS_CXX=
if test "$GCC" = "yes" ; then
if test "$wxUSE_NO_RTTI" = "yes" ; then
CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti"
fi
fi
-
-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
if test "$wxUSE_OPTIMISE" = "no" ; then
OPTIMISE=
else
WXWIN_COMPATIBILITY_2_2="yes"
fi
-if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then
+if test "x$WXWIN_COMPATIBILITY_2_2" != "xno"; then
cat >> confdefs.h <<\EOF
#define WXWIN_COMPATIBILITY_2_2 1
EOF
for ac_func in strptime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16867: checking for $ac_func" >&5
+echo "configure:18209: 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 16872 "configure"
+#line 18214 "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:16895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18237: \"$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:16921: checking for timezone variable in <time.h>" >&5
+echo "configure:18263: 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 16927 "configure"
+#line 18269 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:16939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18281: \"$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 16950 "configure"
+#line 18292 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:16962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18304: \"$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 16973 "configure"
+#line 18315 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:16985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_var_timezone=__timezone
for ac_func in localtime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17026: checking for $ac_func" >&5
+echo "configure:18368: 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 17031 "configure"
+#line 18373 "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:17054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18396: \"$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:17081: checking for tm_gmtoff in struct tm" >&5
+echo "configure:18423: 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 17087 "configure"
+#line 18429 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:17099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18441: \"$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:17128: checking for $ac_func" >&5
+echo "configure:18470: 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 17133 "configure"
+#line 18475 "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:17156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18498: \"$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:17183: checking whether gettimeofday takes two arguments" >&5
+echo "configure:18525: 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 17198 "configure"
+#line 18540 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:17211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18553: \"$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 17219 "configure"
+#line 18561 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:17232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_gettimeofday_has_2_args=no
else
fi
-if test "$TOOLKIT" != "MSW"; then
+if test "$wxUSE_SOCKETS" = "yes"; then
+ if test "$TOOLKIT" = "X11"; then
+ echo "configure: warning: wxSocket not yet supported under X11... disabled" 1>&2
+ wxUSE_SOCKETS="no"
+ fi
+fi
- if test "$wxUSE_SOCKETS" = "yes"; then
+if test "$wxUSE_SOCKETS" = "yes"; then
+ if test "$TOOLKIT" != "MSW"; then
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:17281: checking for socket" >&5
+echo "configure:18629: 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 17286 "configure"
+#line 18634 "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:17309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18657: \"$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:17327: checking for socket in -lsocket" >&5
+echo "configure:18675: 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 17335 "configure"
+#line 18683 "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:17346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18694: \"$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 eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- INET_LINK="$INET_LINK -lsocket"
+ if test "$INET_LINK" != " -lsocket"; then
+ INET_LINK="$INET_LINK -lsocket"
+ fi
else
echo "$ac_t""no" 1>&6
fi
fi
+fi
-
- if test "$wxUSE_SOCKETS" = "yes" ; then
+if test "$wxUSE_SOCKETS" = "yes" ; then
+ if test "$TOOLKIT" != "MSW"; then
echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:17379: checking what is the type of the third argument of getsockname" >&5
+echo "configure:18730: 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 17394 "configure"
+#line 18745 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:17407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18758: \"$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 17415 "configure"
+#line 18766 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:17428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18779: \"$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 17436 "configure"
+#line 18787 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:17449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=int
else
if test "$TOOLKIT" = "MOTIF"; then
echo "configure: warning: Joystick not yet supported under Motif... disabled" 1>&2
wxUSE_JOYSTICK=no
+ fi
+ if test "$TOOLKIT" = "X11"; then
+ echo "configure: warning: Joystick not yet supported under X11... disabled" 1>&2
+ wxUSE_JOYSTICK=no
fi
if test "$TOOLKIT" != "MSW"; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:17517: checking for $ac_hdr" >&5
+echo "configure:18872: 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 17522 "configure"
+#line 18877 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:18882: \"$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 dlopen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17581: checking for $ac_func" >&5
+echo "configure:18936: 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 17586 "configure"
+#line 18941 "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:17609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18964: \"$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:17637: checking for dlopen in -ldl" >&5
+echo "configure:18992: 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 17645 "configure"
+#line 19000 "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:17656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19011: \"$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:17685: checking for $ac_func" >&5
+echo "configure:19040: 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 17690 "configure"
+#line 19045 "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:17713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19068: \"$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:17741: checking for dld in -lshl_load" >&5
+echo "configure:19096: 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 17749 "configure"
+#line 19104 "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:17760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19115: \"$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:17799: checking for $ac_func" >&5
+echo "configure:19154: 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 17804 "configure"
+#line 19159 "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:17827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19182: \"$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:17852: checking for dlerror in -ldl" >&5
+echo "configure:19207: 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 17860 "configure"
+#line 19215 "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:17871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19226: \"$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
#define wxUSE_UNICODE 1
EOF
+
+ if test "$wxUSE_MSW" != 1; then
+ wxUSE_UNICODE_MSLU=no
+ fi
+
+ 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:19301: 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 19309 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:19316: \"$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"
+
+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_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
if test "$wxUSE_UNIVERSAL" = "yes"; then
- echo "configure: warning: MDI not yet supported for wxUNIVERSAL... disabled" 1>&2
+ echo "configure: warning: MDI not yet supported for wxUniversal... disabled" 1>&2
wxUSE_MDI_ARCHITECTURE=no
fi
if test "$wxUSE_MSW" = 1; then
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:18024: 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 18029 "configure"
-#include "confdefs.h"
-#include <htmlhelp.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:18034: \"$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
-
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define wxUSE_MS_HTML_HELP 1
EOF
-
-else
- echo "$ac_t""no" 1>&6
-
- echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h... disabled" 1>&2
- wxUSE_MS_HTML_HELP=no
-
-fi
-
fi
fi
fi
if test "$wxUSE_RESOURCES" = "yes" ; then
- cat >> confdefs.h <<\EOF
+ if test "$wxUSE_NANOX" = "yes"; then
+ echo "configure: warning: Cannot use resource database functions in NanoX" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
#define wxUSE_RESOURCES 1
EOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
+ fi
fi
if test "$wxUSE_X_RESOURCES" = "yes"; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:18122: checking for $ac_hdr" >&5
+echo "configure:19496: 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 18127 "configure"
+#line 19501 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:18132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:19506: \"$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*
wxUSE_DRAG_AND_DROP=no
fi
- if test "$wxUSE_MAC" = 1; then
- echo "configure: warning: Drag and drop not yet supported under Mac OS X... disabled" 1>&2
+ if test "$wxUSE_X11" = 1; then
+ echo "configure: warning: Drag and drop not yet supported under X11... disabled" 1>&2
wxUSE_DRAG_AND_DROP=no
fi
wxUSE_TOGGLEBTN=no
fi
if test "$wxUSE_UNIVERSAL" = "yes"; then
- echo "configure: warning: Toggle button not yet supported under wxUNIVERSAL... disabled" 1>&2
+ echo "configure: warning: Toggle button not yet supported under wxUniversal... disabled" 1>&2
wxUSE_TOGGLEBTN=no
fi
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_MOTIF" = 1; then
echo "configure: warning: wxPopupWindow not yet supported under Motif... disabled" 1>&2
else
- cat >> confdefs.h <<\EOF
+ if test "$wxUSE_PM" = 1; then
+ echo "configure: warning: wxPopupWindow not yet supported under PM... disabled" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
#define wxUSE_POPUPWIN 1
EOF
- USES_CONTROLS=1
+ USES_CONTROLS=1
+ fi
fi
fi
fi
if test "$wxUSE_TIPWINDOW" = "yes"; then
- cat >> confdefs.h <<\EOF
+ if test "$wxUSE_PM" = 1; then
+ echo "configure: warning: wxTipWindow not yet supported under PM... disabled" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
#define wxUSE_TIPWINDOW 1
EOF
+ fi
fi
if test "$USES_CONTROLS" = 1; then
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_IFF" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_IFF 1
+EOF
+
+fi
+
if test "$wxUSE_PNM" = "yes" ; then
cat >> confdefs.h <<\EOF
#define wxUSE_PNM 1
fi
+if test "$wxUSE_ICO_CUR" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_ICO_CUR 1
+EOF
+
+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
if test "$wxUSE_DIRDLG" = "yes"; then
- if test "$wxUSE_CONSTRAINTS" != "yes"; then
- echo "configure: warning: wxDirDialog requires constraints so it won't be compiled without them" 1>&2
+ if test "$wxUSE_TREECTRL" != "yes"; then
+ echo "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2
else
- if test "$wxUSE_TREECTRL" != "yes"; then
- echo "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2
- else
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define wxUSE_DIRDLG 1
EOF
- fi
fi
fi
fi
-LIBS="$ZLIB_LINK$POSIX4_LINK$INET_LINK$WCHAR_LINK$THREADS_LINK$DL_LINK -lm$LIBS"
+LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK -lm $LIBS"
if test "$wxUSE_GUI" = "yes"; then
- LIBS=" $GUI_TK_LIBRARY$PNG_LINK$JPEG_LINK$TIFF_LINK$FREETYPE_LINK$LIBS"
+ LIBS="$GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LIBS"
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
drawing dynamic erase event exec font image \
minimal richedit rotate widgets"
INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \
-$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
-$FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
+$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
if test "$wxUSE_GTK" = 1; then
WXCONFIG_INCLUDE=
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'`
+LIBS=`echo $LIBS | sed 's/ \+/ /g'`
-LDFLAGS="$LDFLAGS$PROFILE"
+LDFLAGS="$LDFLAGS $PROFILE"
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
+
+
+
+
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:19033: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:20479: 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
if test "$wxUSE_GUI" = "yes"; then
wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
+ wx_cv_if_gnu_make=$IF_GNU_MAKE
wx_cv_path_ifs=$PATH_IFS
wx_cv_program_ext=$PROGRAM_EXT
wx_cv_target_library=$WX_TARGET_LIBRARY
wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
- export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \
+ export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
+ wx_cv_path_ifs wx_cv_program_ext \
wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
subdirs="demos samples utils contrib"
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@STRIP@%$STRIP%g
+s%@IF_GNU_MAKE@%$IF_GNU_MAKE%g
s%@YACC@%$YACC%g
s%@LEX@%$LEX%g
s%@LEXLIB@%$LEXLIB%g
s%@LN_S@%$LN_S%g
-s%@GTK_CONFIG_2_0@%$GTK_CONFIG_2_0%g
+s%@PKG_CONFIG@%$PKG_CONFIG%g
s%@GTK_CFLAGS@%$GTK_CFLAGS%g
s%@GTK_LIBS@%$GTK_LIBS%g
s%@GTK_CONFIG@%$GTK_CONFIG%g
s%@RESCOMP@%$RESCOMP%g
s%@DEREZ@%$DEREZ%g
s%@CXXCPP@%$CXXCPP%g
+s%@LIBICONV@%$LIBICONV%g
s%@LEX_STEM@%$LEX_STEM%g
s%@PATH_IFS@%$PATH_IFS%g
s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g
s%@WXCONFIG_LIBS_STATIC_GL@%$WXCONFIG_LIBS_STATIC_GL%g
s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
s%@ALL_OBJECTS@%$ALL_OBJECTS%g
+s%@ALL_HEADERS@%$ALL_HEADERS%g
+s%@ALL_SOURCES@%$ALL_SOURCES%g
s%@GUIDIST@%$GUIDIST%g
s%@PORT_FILES@%$PORT_FILES%g
s%@DISTDIR@%$DISTDIR%g
s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
s%@LDFLAGS_GL@%$LDFLAGS_GL%g
+s%@LDFLAGS_EXE@%$LDFLAGS_EXE%g
s%@OPENGL_LIBS@%$OPENGL_LIBS%g
s%@DMALLOC_LIBS@%$DMALLOC_LIBS%g
s%@EXTRADEFS@%$EXTRADEFS%g
s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g
s%@WX_RESOURCES_MACOSX@%$WX_RESOURCES_MACOSX%g
s%@WX_RESOURCES_MACOSX_COMPILED@%$WX_RESOURCES_MACOSX_COMPILED%g
+s%@MACOSX_BUNDLE@%$MACOSX_BUNDLE%g
s%@LIBWXMACRES@%$LIBWXMACRES%g
s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g
s%@LIBWXMACRESWXCONFIG@%$LIBWXMACRESWXCONFIG%g
projects / wxWidgets.git / blobdiff