-# Configure paths for GTK+
-# Owen Taylor 1997-2001
+
+# Configure paths for GTK+
+# Owen Taylor 1997-2001
+
+
+
+
+
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.13
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
ac_help="$ac_help
--with-mac use Mac OS X"
ac_help="$ac_help
- --with-wine use WINE"
+ --with-cocoa use Cocoa"
+ac_help="$ac_help
+ --with-wine use Wine"
ac_help="$ac_help
--with-msw use MS-Windows"
ac_help="$ac_help
ac_help="$ac_help
--enable-debug same as debug_flag and debug_info"
ac_help="$ac_help
- --enable-precomp enable use of precompiled headers (Mac OS X)"
+ --enable-precomp enable use of precompiled headers (Mac OS X/Darwin)"
ac_help="$ac_help
--enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)"
ac_help="$ac_help
ac_help="$ac_help
--enable-compat20 enable wxWindows 2.0 compatibility"
ac_help="$ac_help
- --disable-compat22 disable wxWindows 2.2 compatibility"
+ --enable-compat22 enable wxWindows 2.2 compatibility"
+ac_help="$ac_help
+ --disable-compat24 disable wxWindows 2.4 compatibility"
ac_help="$ac_help
--enable-rpath=DIR output the rpath flag from wx-config"
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-ole use OLE classes"
+ac_help="$ac_help
+ --enable-dataobj use data object classes"
ac_help="$ac_help
--enable-ipc use interprocess communication (wxSocket etc.)"
ac_help="$ac_help
--enable-cmdline use wxCmdLineParser class"
ac_help="$ac_help
--enable-datetime use wxDateTime class"
-ac_help="$ac_help
- --enable-timedate use obsolete wxDate/wxTime classes"
ac_help="$ac_help
--enable-stopwatch use wxStopWatch class"
ac_help="$ac_help
--enable-logdialog use wxLogDialog"
ac_help="$ac_help
--enable-postscript use wxPostscriptDC device context (default for gtk+)"
-ac_help="$ac_help
- --enable-prologio use Prolog IO library"
ac_help="$ac_help
--enable-resources use wxWindows resources"
ac_help="$ac_help
--enable-xresources use X resources for save (default for gtk+)"
ac_help="$ac_help
- --enable-clipboard use wxClipboard classes"
+ --enable-clipboard use wxClipboard class"
ac_help="$ac_help
--enable-dnd use Drag'n'Drop classes"
ac_help="$ac_help
--enable-metafile use win32 metafiles"
-ac_help="$ac_help
- --enable-treelayout use wxTreeLayout classes"
ac_help="$ac_help
--enable-controls use all usual controls"
ac_help="$ac_help
ac_help="$ac_help
--enable-choice use wxChoice class"
ac_help="$ac_help
- --enable-combobox use wxComboBox classes"
+ --enable-combobox use wxComboBox class"
+ac_help="$ac_help
+ --enable-display use wxDisplay class"
ac_help="$ac_help
--enable-gauge use wxGauge class"
ac_help="$ac_help
--enable-grid use wxGrid class"
-ac_help="$ac_help
- --enable-newgrid use new wxGrid class"
ac_help="$ac_help
--enable-imaglist use wxImageList class"
ac_help="$ac_help
--enable-listctrl use wxListCtrl class"
ac_help="$ac_help
--enable-notebook use wxNotebook class"
-ac_help="$ac_help
- --enable-propsheet use wxPropertySheet class"
ac_help="$ac_help
--enable-radiobox use wxRadioBox class"
ac_help="$ac_help
--enable-metafiles use wxMetaFile (Windows only)"
ac_help="$ac_help
--enable-dragimage use wxDragImage"
+ac_help="$ac_help
+ --enable-accessibility enable accessibility support"
ac_help="$ac_help
--enable-palette use wxPalette class"
ac_help="$ac_help
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1014: checking host system type" >&5
+echo "configure:1022: 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:1035: checking target system type" >&5
+echo "configure:1043: 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:1053: checking build system type" >&5
+echo "configure:1061: 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=3
+WX_MINOR_VERSION_NUMBER=5
+WX_RELEASE_NUMBER=0
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=2
+WX_CURRENT=0
WX_REVISION=0
WX_AGE=0
USE_BEOS=0
USE_MAC=0
-USE_LINUX=
-USE_SGI=
-USE_HPUX=
-USE_SYSV=
-USE_SVR4=
USE_AIX=
-USE_SUN=
-USE_SOLARIS=
-USE_SUNOS=
-USE_ALPHA=
-USE_OSF=
USE_BSD=
USE_DARWIN=
USE_FREEBSD=
-USE_OPENBSD=
+USE_HPUX=
+USE_LINUX=
USE_NETBSD=
+USE_OPENBSD=
+USE_OSF=
+USE_SGI=
+USE_SOLARIS=
+USE_SUN=
+USE_SUNOS=
+USE_SVR4=
+USE_SYSV=
USE_VMS=
USE_ULTRIX=
-USE_DATA_GENERAL=
+USE_UNIXWARE=
+
+USE_ALPHA=
NEEDS_D_REENTRANT_FOR_R_FUNCS=0
-ALL_TOOLKITS="GTK MAC MGL MICROWIN MOTIF MSW PM WINE X11"
+ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11"
+DEFAULT_wxUSE_COCOA=0
DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_MAC=0
DEFAULT_wxUSE_MGL=0
DEFAULT_wxUSE_MOTIF=0
DEFAULT_wxUSE_MSW=0
DEFAULT_wxUSE_PM=0
-DEFAULT_wxUSE_WINE=0
DEFAULT_wxUSE_X11=0
+DEFAULT_DEFAULT_wxUSE_COCOA=0
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MAC=0
DEFAULT_DEFAULT_wxUSE_MGL=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=
USE_BSD=1
USE_OPENBSD=1
cat >> confdefs.h <<\EOF
-#define __FREEBSD__ 1
+#define __OPENBSD__ 1
EOF
cat >> confdefs.h <<\EOF
-#define __OPENBSD__ 1
+#define __BSD__ 1
EOF
DEFAULT_DEFAULT_wxUSE_GTK=1
USE_BSD=1
USE_NETBSD=1
cat >> confdefs.h <<\EOF
-#define __FREEBSD__ 1
+#define __NETBSD__ 1
EOF
cat >> confdefs.h <<\EOF
-#define __NETBSD__ 1
+#define __BSD__ 1
EOF
DEFAULT_DEFAULT_wxUSE_GTK=1
USE_AIX=1
USE_SYSV=1
USE_SVR4=1
- SO_SUFFIX=a
+ SO_SUFFIX=a
cat >> confdefs.h <<\EOF
#define __AIX__ 1
EOF
DEFAULT_DEFAULT_wxUSE_MOTIF=1
;;
+ *-*-*UnixWare*)
+ USE_SYSV=1
+ USE_SVR4=1
+ USE_UNIXWARE=1
+ cat >> confdefs.h <<\EOF
+#define __UNIXWARE__ 1
+EOF
+
+ ;;
+
*-*-cygwin* | *-*-mingw32* )
SO_SUFFIX=dll
PROGRAM_EXT=".exe"
PROGRAM_EXT=".exe"
DEFAULT_DEFAULT_wxUSE_PM=1
- LIBS="$LIBS -lstdcpp"
;;
powerpc-*-darwin* )
cat >> confdefs.h <<\EOF
#define __POWERPC__ 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define TARGET_CARBON 1
EOF
DEFAULT_DEFAULT_wxUSE_MAC=1
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_CMDLINE_PARSER=no
DEFAULT_wxUSE_DATETIME=no
- DEFAULT_wxUSE_TIMEDATE=no
DEFAULT_wxUSE_TIMER=no
DEFAULT_wxUSE_STOPWATCH=no
DEFAULT_wxUSE_FILE=no
DEFAULT_wxUSE_FONTMAP=no
DEFAULT_wxUSE_STREAMS=no
DEFAULT_wxUSE_SOCKETS=no
+ DEFAULT_wxUSE_OLE=no
+ DEFAULT_wxUSE_DATAOBJ=no
DEFAULT_wxUSE_DIALUP_MANAGER=no
DEFAULT_wxUSE_JOYSTICK=no
DEFAULT_wxUSE_DYNLIB_CLASS=no
DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
- DEFAULT_wxUSE_PROLOGIO=no
DEFAULT_wxUSE_RESOURCES=no
DEFAULT_wxUSE_CONSTRAINTS=no
DEFAULT_wxUSE_IPC=no
DEFAULT_wxUSE_CHECKLST=no
DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_COMBOBOX=no
+ DEFAULT_wxUSE_DISPLAY=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
- DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_IMAGLIST=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_LISTCTRL=no
DEFAULT_wxUSE_NOTEBOOK=no
- DEFAULT_wxUSE_PROPSHEET=no
DEFAULT_wxUSE_RADIOBOX=no
DEFAULT_wxUSE_RADIOBTN=no
DEFAULT_wxUSE_SASH=no
DEFAULT_wxUSE_IFF=no
DEFAULT_wxUSE_XPM=no
DEFAULT_wxUSE_ICO_CUR=no
+ DEFAULT_wxUSE_ACCESSIBILITY=no
else
DEFAULT_wxUSE_UNIVERSAL=no
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_CMDLINE_PARSER=yes
DEFAULT_wxUSE_DATETIME=yes
- DEFAULT_wxUSE_TIMEDATE=no
DEFAULT_wxUSE_TIMER=yes
DEFAULT_wxUSE_STOPWATCH=yes
DEFAULT_wxUSE_FILE=yes
DEFAULT_wxUSE_FONTMAP=yes
DEFAULT_wxUSE_STREAMS=yes
DEFAULT_wxUSE_SOCKETS=yes
+ DEFAULT_wxUSE_OLE=yes
+ DEFAULT_wxUSE_DATAOBJ=yes
DEFAULT_wxUSE_DIALUP_MANAGER=yes
DEFAULT_wxUSE_JOYSTICK=yes
DEFAULT_wxUSE_DYNLIB_CLASS=yes
DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes
- DEFAULT_wxUSE_PROLOGIO=yes
- DEFAULT_wxUSE_RESOURCES=yes
+ DEFAULT_wxUSE_RESOURCES=no
DEFAULT_wxUSE_CONSTRAINTS=yes
DEFAULT_wxUSE_IPC=yes
DEFAULT_wxUSE_HELP=yes
DEFAULT_wxUSE_CHECKLST=yes
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_COMBOBOX=yes
+ DEFAULT_wxUSE_DISPLAY=no
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
- DEFAULT_wxUSE_NEW_GRID=yes
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_NOTEBOOK=yes
- DEFAULT_wxUSE_PROPSHEET=yes
DEFAULT_wxUSE_RADIOBOX=yes
DEFAULT_wxUSE_RADIOBTN=yes
DEFAULT_wxUSE_SASH=yes
DEFAULT_wxUSE_PNM=yes
DEFAULT_wxUSE_XPM=yes
DEFAULT_wxUSE_ICO_CUR=yes
+ DEFAULT_wxUSE_ACCESSIBILITY=no
fi
for toolkit in `echo $ALL_TOOLKITS`; do
- LINE=`grep "wxUSE_$toolkit" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
+ LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
+ if test "x$LINE" != "x" ; then
has_toolkit_in_cache=1
eval "DEFAULT_$LINE"
eval "CACHE_$toolkit=1"
- echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
-echo "configure:1755: checking for --enable-gui" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-gui""... $ac_c" 1>&6
+echo "configure:1778: checking for --${enablestring:-enable}-gui" >&5
no_cache=0
# Check whether --enable-gui or --disable-gui was given.
if test "${enable_gui+set}" = set; then
if test "$wxUSE_GUI" = "yes"; then
- echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6
-echo "configure:1797: checking for --enable-universal" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-universal""... $ac_c" 1>&6
+echo "configure:1821: checking for --${enablestring:-enable}-universal" >&5
no_cache=0
# Check whether --enable-universal or --disable-universal was given.
if test "${enable_universal+set}" = set; then
wxUSE_MAC="$withval" TOOLKIT_GIVEN=1
fi
+# Check whether --with-cocoa or --without-cocoa was given.
+if test "${with_cocoa+set}" = set; then
+ withval="$with_cocoa"
+ wxUSE_COCOA="$withval" TOOLKIT_GIVEN=1
+fi
+
# Check whether --with-wine or --without-wine was given.
if test "${with_wine+set}" = set; then
withval="$with_wine"
- wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1
+ wxUSE_WINE="$withval" CACHE_WINE=1
fi
# Check whether --with-msw or --without-msw was given.
fi
- echo $ac_n "checking for --enable-nanox""... $ac_c" 1>&6
-echo "configure:1890: checking for --enable-nanox" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-nanox""... $ac_c" 1>&6
+echo "configure:1921: checking for --${enablestring:-enable}-nanox" >&5
no_cache=0
# Check whether --enable-nanox or --disable-nanox was given.
if test "${enable_nanox+set}" = set; then
fi
-# Check whether --enable-gtk2 or --disable-gtk2 was given.
+
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-gtk2""... $ac_c" 1>&6
+echo "configure:1962: checking for --${enablestring:-enable}-gtk2" >&5
+ no_cache=0
+ # Check whether --enable-gtk2 or --disable-gtk2 was given.
if test "${enable_gtk2+set}" = set; then
enableval="$enable_gtk2"
- wxUSE_GTK2="yes"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_gtk2='wxUSE_GTK2=yes'
+ else
+ ac_cv_use_gtk2='wxUSE_GTK2=no'
+ fi
+
else
- wxUSE_GTK2="no"
+
+ LINE=`grep "wxUSE_GTK2" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_gtk2='wxUSE_GTK2='$DEFAULT_wxUSE_GTK2
+
fi
+ eval "$ac_cv_use_gtk2"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_gtk2 >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_GTK2" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
-echo "configure:1939: checking for --with-libpng" >&5
+echo "configure:2002: 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:1990: checking for --with-libjpeg" >&5
+echo "configure:2053: 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:2041: checking for --with-libtiff" >&5
+echo "configure:2104: checking for --with-libtiff" >&5
no_cache=0
# Check whether --with-libtiff or --without-libtiff was given.
if test "${with_libtiff+set}" = set; then
echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
-echo "configure:2092: checking for --with-opengl" >&5
+echo "configure:2155: 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:2134: checking for --with-dmalloc" >&5
+echo "configure:2197: 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:2173: checking for --with-regex" >&5
+echo "configure:2236: 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:2224: checking for --with-zlib" >&5
+echo "configure:2287: 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:2275: checking for --with-odbc" >&5
+echo "configure:2338: 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:2316: checking for --enable-shared" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-shared""... $ac_c" 1>&6
+echo "configure:2380: checking for --${enablestring:-enable}-shared" >&5
no_cache=0
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
fi
- echo $ac_n "checking for --enable-soname""... $ac_c" 1>&6
-echo "configure:2355: checking for --enable-soname" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-soname""... $ac_c" 1>&6
+echo "configure:2420: checking for --${enablestring:-enable}-soname" >&5
no_cache=0
# Check whether --enable-soname or --disable-soname was given.
if test "${enable_soname+set}" = set; then
fi
- echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
-echo "configure:2394: checking for --enable-optimise" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-optimise""... $ac_c" 1>&6
+echo "configure:2460: checking for --${enablestring:-enable}-optimise" >&5
no_cache=0
# Check whether --enable-optimise or --disable-optimise was given.
if test "${enable_optimise+set}" = set; then
fi
- echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
-echo "configure:2433: checking for --enable-debug" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-debug""... $ac_c" 1>&6
+echo "configure:2500: checking for --${enablestring:-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:2473: checking for --enable-precomp" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-precomp""... $ac_c" 1>&6
+echo "configure:2541: checking for --${enablestring:-enable}-precomp" >&5
no_cache=0
# Check whether --enable-precomp or --disable-precomp was given.
if test "${enable_precomp+set}" = set; then
fi
- echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6
-echo "configure:2521: checking for --enable-debug_flag" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-debug_flag""... $ac_c" 1>&6
+echo "configure:2590: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6
-echo "configure:2560: checking for --enable-debug_info" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-debug_info""... $ac_c" 1>&6
+echo "configure:2630: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6
-echo "configure:2599: checking for --enable-debug_gdb" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-debug_gdb""... $ac_c" 1>&6
+echo "configure:2670: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6
-echo "configure:2638: checking for --enable-debug_cntxt" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-debug_cntxt""... $ac_c" 1>&6
+echo "configure:2710: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6
-echo "configure:2677: checking for --enable-mem_tracing" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-mem_tracing""... $ac_c" 1>&6
+echo "configure:2750: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
-echo "configure:2716: checking for --enable-profile" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-profile""... $ac_c" 1>&6
+echo "configure:2790: checking for --${enablestring:-enable}-profile" >&5
no_cache=0
# Check whether --enable-profile or --disable-profile was given.
if test "${enable_profile+set}" = set; then
fi
- echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6
-echo "configure:2755: checking for --enable-no_rtti" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-no_rtti""... $ac_c" 1>&6
+echo "configure:2830: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6
-echo "configure:2794: checking for --enable-no_exceptions" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-no_exceptions""... $ac_c" 1>&6
+echo "configure:2870: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
-echo "configure:2833: checking for --enable-permissive" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-permissive""... $ac_c" 1>&6
+echo "configure:2910: checking for --${enablestring:-enable}-permissive" >&5
no_cache=0
# Check whether --enable-permissive or --disable-permissive was given.
if test "${enable_permissive+set}" = set; then
fi
- echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6
-echo "configure:2872: checking for --enable-no_deps" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-no_deps""... $ac_c" 1>&6
+echo "configure:2950: checking for --${enablestring:-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:2912: checking for --enable-compat20" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-compat20""... $ac_c" 1>&6
+echo "configure:2991: checking for --${enablestring:-enable}-compat20" >&5
no_cache=0
# Check whether --enable-compat20 or --disable-compat20 was given.
if test "${enable_compat20+set}" = set; then
fi
- echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6
-echo "configure:2951: checking for --enable-compat22" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-compat22""... $ac_c" 1>&6
+echo "configure:3031: checking for --${enablestring:-enable}-compat22" >&5
no_cache=0
# Check whether --enable-compat22 or --disable-compat22 was given.
if test "${enable_compat22+set}" = set; then
fi
+ enablestring=disable
+ echo $ac_n "checking for --${enablestring:-enable}-compat24""... $ac_c" 1>&6
+echo "configure:3071: checking for --${enablestring:-enable}-compat24" >&5
+ no_cache=0
+ # Check whether --enable-compat24 or --disable-compat24 was given.
+if test "${enable_compat24+set}" = set; then
+ enableval="$enable_compat24"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=yes'
+ else
+ ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=no'
+ fi
+
+else
+
+ LINE=`grep "WXWIN_COMPATIBILITY_2_4" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4='$DEFAULT_WXWIN_COMPATIBILITY_2_4
+
+fi
+
+
+ eval "$ac_cv_use_compat24"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_compat24 >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$WXWIN_COMPATIBILITY_2_4" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
# Check whether --enable-rpath or --disable-rpath was given.
if test "${enable_rpath+set}" = set; then
enableval="$enable_rpath"
- echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6
-echo "configure:3004: checking for --enable-intl" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-intl""... $ac_c" 1>&6
+echo "configure:3125: checking for --${enablestring:-enable}-intl" >&5
no_cache=0
# Check whether --enable-intl or --disable-intl was given.
if test "${enable_intl+set}" = set; then
fi
- echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
-echo "configure:3043: checking for --enable-config" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-config""... $ac_c" 1>&6
+echo "configure:3165: checking for --${enablestring:-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:3083: checking for --enable-protocols" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-protocols""... $ac_c" 1>&6
+echo "configure:3206: checking for --${enablestring:-enable}-protocols" >&5
no_cache=0
# Check whether --enable-protocols or --disable-protocols was given.
if test "${enable_protocols+set}" = set; then
fi
- echo $ac_n "checking for --enable-ftp""... $ac_c" 1>&6
-echo "configure:3122: checking for --enable-ftp" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-ftp""... $ac_c" 1>&6
+echo "configure:3246: checking for --${enablestring:-enable}-ftp" >&5
no_cache=0
# Check whether --enable-ftp or --disable-ftp was given.
if test "${enable_ftp+set}" = set; then
fi
- echo $ac_n "checking for --enable-http""... $ac_c" 1>&6
-echo "configure:3161: checking for --enable-http" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-http""... $ac_c" 1>&6
+echo "configure:3286: checking for --${enablestring:-enable}-http" >&5
no_cache=0
# Check whether --enable-http or --disable-http was given.
if test "${enable_http+set}" = set; then
fi
- echo $ac_n "checking for --enable-fileproto""... $ac_c" 1>&6
-echo "configure:3200: checking for --enable-fileproto" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-fileproto""... $ac_c" 1>&6
+echo "configure:3326: checking for --${enablestring:-enable}-fileproto" >&5
no_cache=0
# Check whether --enable-fileproto or --disable-fileproto was given.
if test "${enable_fileproto+set}" = set; then
fi
- echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
-echo "configure:3239: checking for --enable-sockets" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-sockets""... $ac_c" 1>&6
+echo "configure:3366: checking for --${enablestring:-enable}-sockets" >&5
no_cache=0
# Check whether --enable-sockets or --disable-sockets was given.
if test "${enable_sockets+set}" = set; then
fi
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-ole""... $ac_c" 1>&6
+echo "configure:3406: checking for --${enablestring:-enable}-ole" >&5
+ no_cache=0
+ # Check whether --enable-ole or --disable-ole was given.
+if test "${enable_ole+set}" = set; then
+ enableval="$enable_ole"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_ole='wxUSE_OLE=yes'
+ else
+ ac_cv_use_ole='wxUSE_OLE=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_OLE" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_ole='wxUSE_OLE='$DEFAULT_wxUSE_OLE
+
+fi
+
+
+ eval "$ac_cv_use_ole"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_ole >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_OLE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-dataobj""... $ac_c" 1>&6
+echo "configure:3446: checking for --${enablestring:-enable}-dataobj" >&5
+ no_cache=0
+ # Check whether --enable-dataobj or --disable-dataobj was given.
+if test "${enable_dataobj+set}" = set; then
+ enableval="$enable_dataobj"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_dataobj='wxUSE_DATAOBJ=yes'
+ else
+ ac_cv_use_dataobj='wxUSE_DATAOBJ=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_DATAOBJ" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_dataobj='wxUSE_DATAOBJ='$DEFAULT_wxUSE_DATAOBJ
+
+fi
+
+
+ eval "$ac_cv_use_dataobj"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_dataobj >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_DATAOBJ" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
- echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
-echo "configure:3279: checking for --enable-ipc" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-ipc""... $ac_c" 1>&6
+echo "configure:3487: checking for --${enablestring:-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:3319: checking for --enable-cmdline" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-cmdline""... $ac_c" 1>&6
+echo "configure:3528: checking for --${enablestring:-enable}-cmdline" >&5
no_cache=0
# Check whether --enable-cmdline or --disable-cmdline was given.
if test "${enable_cmdline+set}" = set; then
fi
- echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
-echo "configure:3358: checking for --enable-datetime" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-datetime""... $ac_c" 1>&6
+echo "configure:3568: checking for --${enablestring:-enable}-datetime" >&5
no_cache=0
# Check whether --enable-datetime or --disable-datetime was given.
if test "${enable_datetime+set}" = set; then
fi
- echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6
-echo "configure:3397: checking for --enable-timedate" >&5
- no_cache=0
- # Check whether --enable-timedate or --disable-timedate was given.
-if test "${enable_timedate+set}" = set; then
- enableval="$enable_timedate"
-
- if test "$enableval" = yes; then
- ac_cv_use_timedate='wxUSE_TIMEDATE=yes'
- else
- ac_cv_use_timedate='wxUSE_TIMEDATE=no'
- fi
-
-else
-
- LINE=`grep "wxUSE_TIMEDATE" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_timedate='wxUSE_TIMEDATE='$DEFAULT_wxUSE_TIMEDATE
-
-fi
-
-
- eval "$ac_cv_use_timedate"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_timedate >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_TIMEDATE" = yes; then
- echo "$ac_t""yes" 1>&6
- else
- echo "$ac_t""no" 1>&6
- fi
-
-
- echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
-echo "configure:3436: checking for --enable-stopwatch" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-stopwatch""... $ac_c" 1>&6
+echo "configure:3608: checking for --${enablestring:-enable}-stopwatch" >&5
no_cache=0
# Check whether --enable-stopwatch or --disable-stopwatch was given.
if test "${enable_stopwatch+set}" = set; then
fi
- echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
-echo "configure:3475: checking for --enable-dialupman" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-dialupman""... $ac_c" 1>&6
+echo "configure:3648: checking for --${enablestring:-enable}-dialupman" >&5
no_cache=0
# Check whether --enable-dialupman or --disable-dialupman was given.
if test "${enable_dialupman+set}" = set; then
fi
- echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6
-echo "configure:3514: checking for --enable-apple_ieee" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-apple_ieee""... $ac_c" 1>&6
+echo "configure:3688: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6
-echo "configure:3553: checking for --enable-timer" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-timer""... $ac_c" 1>&6
+echo "configure:3728: checking for --${enablestring:-enable}-timer" >&5
no_cache=0
# Check whether --enable-timer or --disable-timer was given.
if test "${enable_timer+set}" = set; then
fi
- echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6
-echo "configure:3592: checking for --enable-wave" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-wave""... $ac_c" 1>&6
+echo "configure:3768: checking for --${enablestring:-enable}-wave" >&5
no_cache=0
# Check whether --enable-wave or --disable-wave was given.
if test "${enable_wave+set}" = set; then
fi
- echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6
-echo "configure:3631: checking for --enable-fraction" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-fraction""... $ac_c" 1>&6
+echo "configure:3808: checking for --${enablestring:-enable}-fraction" >&5
no_cache=0
# Check whether --enable-fraction or --disable-fraction was given.
if test "${enable_fraction+set}" = set; then
fi
- echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6
-echo "configure:3670: checking for --enable-dynlib" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-dynlib""... $ac_c" 1>&6
+echo "configure:3848: checking for --${enablestring:-enable}-dynlib" >&5
no_cache=0
# Check whether --enable-dynlib or --disable-dynlib was given.
if test "${enable_dynlib+set}" = set; then
fi
- echo $ac_n "checking for --enable-dynamicloader""... $ac_c" 1>&6
-echo "configure:3709: checking for --enable-dynamicloader" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-dynamicloader""... $ac_c" 1>&6
+echo "configure:3888: checking for --${enablestring:-enable}-dynamicloader" >&5
no_cache=0
# Check whether --enable-dynamicloader or --disable-dynamicloader was given.
if test "${enable_dynamicloader+set}" = set; then
fi
- echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
-echo "configure:3748: checking for --enable-longlong" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-longlong""... $ac_c" 1>&6
+echo "configure:3928: checking for --${enablestring:-enable}-longlong" >&5
no_cache=0
# Check whether --enable-longlong or --disable-longlong was given.
if test "${enable_longlong+set}" = set; then
fi
- echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
-echo "configure:3787: checking for --enable-geometry" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-geometry""... $ac_c" 1>&6
+echo "configure:3968: checking for --${enablestring:-enable}-geometry" >&5
no_cache=0
# Check whether --enable-geometry or --disable-geometry was given.
if test "${enable_geometry+set}" = set; then
fi
- echo $ac_n "checking for --enable-log""... $ac_c" 1>&6
-echo "configure:3826: checking for --enable-log" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-log""... $ac_c" 1>&6
+echo "configure:4008: checking for --${enablestring:-enable}-log" >&5
no_cache=0
# Check whether --enable-log or --disable-log was given.
if test "${enable_log+set}" = set; then
fi
- echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
-echo "configure:3865: checking for --enable-streams" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-streams""... $ac_c" 1>&6
+echo "configure:4048: checking for --${enablestring:-enable}-streams" >&5
no_cache=0
# Check whether --enable-streams or --disable-streams was given.
if test "${enable_streams+set}" = set; then
fi
- echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
-echo "configure:3904: checking for --enable-file" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-file""... $ac_c" 1>&6
+echo "configure:4088: checking for --${enablestring:-enable}-file" >&5
no_cache=0
# Check whether --enable-file or --disable-file was given.
if test "${enable_file+set}" = set; then
fi
- echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
-echo "configure:3943: checking for --enable-ffile" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-ffile""... $ac_c" 1>&6
+echo "configure:4128: checking for --${enablestring:-enable}-ffile" >&5
no_cache=0
# Check whether --enable-ffile or --disable-ffile was given.
if test "${enable_ffile+set}" = set; then
fi
- echo $ac_n "checking for --enable-textbuf""... $ac_c" 1>&6
-echo "configure:3982: checking for --enable-textbuf" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-textbuf""... $ac_c" 1>&6
+echo "configure:4168: checking for --${enablestring:-enable}-textbuf" >&5
no_cache=0
# Check whether --enable-textbuf or --disable-textbuf was given.
if test "${enable_textbuf+set}" = set; then
fi
- echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6
-echo "configure:4021: checking for --enable-textfile" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-textfile""... $ac_c" 1>&6
+echo "configure:4208: checking for --${enablestring:-enable}-textfile" >&5
no_cache=0
# Check whether --enable-textfile or --disable-textfile was given.
if test "${enable_textfile+set}" = set; then
fi
- echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
-echo "configure:4060: checking for --enable-fontmap" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-fontmap""... $ac_c" 1>&6
+echo "configure:4248: checking for --${enablestring:-enable}-fontmap" >&5
no_cache=0
# Check whether --enable-fontmap or --disable-fontmap was given.
if test "${enable_fontmap+set}" = set; then
fi
- echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6
-echo "configure:4099: checking for --enable-unicode" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-unicode""... $ac_c" 1>&6
+echo "configure:4288: checking for --${enablestring:-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:4138: checking for --enable-mslu" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-mslu""... $ac_c" 1>&6
+echo "configure:4328: checking for --${enablestring:-enable}-mslu" >&5
no_cache=0
# Check whether --enable-mslu or --disable-mslu was given.
if test "${enable_mslu+set}" = set; then
fi
- echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
-echo "configure:4177: checking for --enable-wxprintfv" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-wxprintfv""... $ac_c" 1>&6
+echo "configure:4368: checking for --${enablestring:-enable}-wxprintfv" >&5
no_cache=0
# Check whether --enable-wxprintfv or --disable-wxprintfv was given.
if test "${enable_wxprintfv+set}" = set; then
fi
- echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
-echo "configure:4216: checking for --enable-std_iostreams" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-std_iostreams""... $ac_c" 1>&6
+echo "configure:4408: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
-echo "configure:4255: checking for --enable-filesystem" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-filesystem""... $ac_c" 1>&6
+echo "configure:4448: checking for --${enablestring:-enable}-filesystem" >&5
no_cache=0
# Check whether --enable-filesystem or --disable-filesystem was given.
if test "${enable_filesystem+set}" = set; then
fi
- echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
-echo "configure:4294: checking for --enable-fs_inet" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-fs_inet""... $ac_c" 1>&6
+echo "configure:4488: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
-echo "configure:4333: checking for --enable-fs_zip" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-fs_zip""... $ac_c" 1>&6
+echo "configure:4528: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
-echo "configure:4372: checking for --enable-zipstream" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-zipstream""... $ac_c" 1>&6
+echo "configure:4568: checking for --${enablestring:-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:4412: checking for --enable-catch_segvs" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-catch_segvs""... $ac_c" 1>&6
+echo "configure:4609: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
-echo "configure:4451: checking for --enable-snglinst" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-snglinst""... $ac_c" 1>&6
+echo "configure:4649: checking for --${enablestring:-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:4491: checking for --enable-mimetype" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-mimetype""... $ac_c" 1>&6
+echo "configure:4690: checking for --${enablestring:-enable}-mimetype" >&5
no_cache=0
# Check whether --enable-mimetype or --disable-mimetype was given.
if test "${enable_mimetype+set}" = set; then
fi
- echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6
-echo "configure:4530: checking for --enable-system_options" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-system_options""... $ac_c" 1>&6
+echo "configure:4730: checking for --${enablestring:-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-url""... $ac_c" 1>&6
-echo "configure:4570: checking for --enable-url" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-url""... $ac_c" 1>&6
+echo "configure:4771: checking for --${enablestring:-enable}-url" >&5
no_cache=0
# Check whether --enable-url or --disable-url was given.
if test "${enable_url+set}" = set; then
fi
- echo $ac_n "checking for --enable-protocol""... $ac_c" 1>&6
-echo "configure:4609: checking for --enable-protocol" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-protocol""... $ac_c" 1>&6
+echo "configure:4811: checking for --${enablestring:-enable}-protocol" >&5
no_cache=0
# Check whether --enable-protocol or --disable-protocol was given.
if test "${enable_protocol+set}" = set; then
fi
- echo $ac_n "checking for --enable-protocol_http""... $ac_c" 1>&6
-echo "configure:4648: checking for --enable-protocol_http" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-protocol_http""... $ac_c" 1>&6
+echo "configure:4851: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-protocol_ftp""... $ac_c" 1>&6
-echo "configure:4687: checking for --enable-protocol_ftp" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-protocol_ftp""... $ac_c" 1>&6
+echo "configure:4891: checking for --${enablestring:-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
fi
- echo $ac_n "checking for --enable-protocol_file""... $ac_c" 1>&6
-echo "configure:4726: checking for --enable-protocol_file" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-protocol_file""... $ac_c" 1>&6
+echo "configure:4931: checking for --${enablestring:-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
- echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6
-echo "configure:4768: checking for --enable-threads" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-threads""... $ac_c" 1>&6
+echo "configure:4974: checking for --${enablestring:-enable}-threads" >&5
no_cache=0
# Check whether --enable-threads or --disable-threads was given.
if test "${enable_threads+set}" = set; then
- echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
-echo "configure:4811: checking for --enable-docview" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-docview""... $ac_c" 1>&6
+echo "configure:5018: checking for --${enablestring:-enable}-docview" >&5
no_cache=0
# Check whether --enable-docview or --disable-docview was given.
if test "${enable_docview+set}" = set; then
fi
- echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
-echo "configure:4850: checking for --enable-help" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-help""... $ac_c" 1>&6
+echo "configure:5058: checking for --${enablestring:-enable}-help" >&5
no_cache=0
# Check whether --enable-help or --disable-help was given.
if test "${enable_help+set}" = set; then
fi
- echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
-echo "configure:4889: checking for --enable-mshtmlhelp" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-mshtmlhelp""... $ac_c" 1>&6
+echo "configure:5098: checking for --${enablestring:-enable}-mshtmlhelp" >&5
no_cache=0
# Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
if test "${enable_mshtmlhelp+set}" = set; then
fi
- echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
-echo "configure:4928: checking for --enable-html" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-html""... $ac_c" 1>&6
+echo "configure:5138: checking for --${enablestring:-enable}-html" >&5
no_cache=0
# Check whether --enable-html or --disable-html was given.
if test "${enable_html+set}" = set; then
fi
- echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6
-echo "configure:4967: checking for --enable-htmlhelp" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-htmlhelp""... $ac_c" 1>&6
+echo "configure:5178: checking for --${enablestring:-enable}-htmlhelp" >&5
no_cache=0
# Check whether --enable-htmlhelp or --disable-htmlhelp was given.
if test "${enable_htmlhelp+set}" = set; then
fi
- echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6
-echo "configure:5006: checking for --enable-constraints" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-constraints""... $ac_c" 1>&6
+echo "configure:5218: checking for --${enablestring:-enable}-constraints" >&5
no_cache=0
# Check whether --enable-constraints or --disable-constraints was given.
if test "${enable_constraints+set}" = set; then
fi
- echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
-echo "configure:5045: checking for --enable-printarch" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-printarch""... $ac_c" 1>&6
+echo "configure:5258: checking for --${enablestring:-enable}-printarch" >&5
no_cache=0
# Check whether --enable-printarch or --disable-printarch was given.
if test "${enable_printarch+set}" = set; then
fi
- echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
-echo "configure:5084: checking for --enable-mdi" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-mdi""... $ac_c" 1>&6
+echo "configure:5298: checking for --${enablestring:-enable}-mdi" >&5
no_cache=0
# Check whether --enable-mdi or --disable-mdi was given.
if test "${enable_mdi+set}" = set; then
fi
- echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
-echo "configure:5123: checking for --enable-loggui" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-loggui""... $ac_c" 1>&6
+echo "configure:5338: checking for --${enablestring:-enable}-loggui" >&5
no_cache=0
# Check whether --enable-loggui or --disable-loggui was given.
if test "${enable_loggui+set}" = set; then
fi
- echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6
-echo "configure:5162: checking for --enable-logwin" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-logwin""... $ac_c" 1>&6
+echo "configure:5378: checking for --${enablestring:-enable}-logwin" >&5
no_cache=0
# Check whether --enable-logwin or --disable-logwin was given.
if test "${enable_logwin+set}" = set; then
fi
- echo $ac_n "checking for --enable-logdialog""... $ac_c" 1>&6
-echo "configure:5201: checking for --enable-logdialog" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-logdialog""... $ac_c" 1>&6
+echo "configure:5418: checking for --${enablestring:-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:5241: checking for --enable-postscript" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-postscript""... $ac_c" 1>&6
+echo "configure:5459: checking for --${enablestring:-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:5283: checking for --enable-prologio" >&5
- no_cache=0
- # Check whether --enable-prologio or --disable-prologio was given.
-if test "${enable_prologio+set}" = set; then
- enableval="$enable_prologio"
-
- if test "$enableval" = yes; then
- ac_cv_use_prologio='wxUSE_PROLOGIO=yes'
- else
- ac_cv_use_prologio='wxUSE_PROLOGIO=no'
- fi
-
-else
-
- LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
-
-fi
-
-
- eval "$ac_cv_use_prologio"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_PROLOGIO" = yes; then
- echo "$ac_t""yes" 1>&6
- else
- echo "$ac_t""no" 1>&6
- fi
-
-
- echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
-echo "configure:5322: checking for --enable-resources" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-resources""... $ac_c" 1>&6
+echo "configure:5502: checking for --${enablestring:-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:5362: checking for --enable-xresources" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-xresources""... $ac_c" 1>&6
+echo "configure:5543: checking for --${enablestring:-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:5403: checking for --enable-clipboard" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-clipboard""... $ac_c" 1>&6
+echo "configure:5585: checking for --${enablestring:-enable}-clipboard" >&5
no_cache=0
# Check whether --enable-clipboard or --disable-clipboard was given.
if test "${enable_clipboard+set}" = set; then
fi
- echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
-echo "configure:5442: checking for --enable-dnd" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-dnd""... $ac_c" 1>&6
+echo "configure:5625: checking for --${enablestring:-enable}-dnd" >&5
no_cache=0
# Check whether --enable-dnd or --disable-dnd was given.
if test "${enable_dnd+set}" = set; then
fi
- echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
-echo "configure:5481: checking for --enable-metafile" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
+echo "configure:5665: checking for --${enablestring:-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:5521: checking for --enable-treelayout" >&5
- no_cache=0
- # Check whether --enable-treelayout or --disable-treelayout was given.
-if test "${enable_treelayout+set}" = set; then
- enableval="$enable_treelayout"
-
- if test "$enableval" = yes; then
- ac_cv_use_treelayout='wxUSE_TREELAYOUT=yes'
- else
- ac_cv_use_treelayout='wxUSE_TREELAYOUT=no'
- fi
-
-else
-
- LINE=`grep "wxUSE_TREELAYOUT" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_treelayout='wxUSE_TREELAYOUT='$DEFAULT_wxUSE_TREELAYOUT
-
-fi
- eval "$ac_cv_use_treelayout"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_treelayout >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_TREELAYOUT" = yes; then
- echo "$ac_t""yes" 1>&6
- else
- echo "$ac_t""no" 1>&6
- fi
-
-
-
-
- echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
-echo "configure:5562: checking for --enable-controls" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-controls""... $ac_c" 1>&6
+echo "configure:5708: checking for --${enablestring:-enable}-controls" >&5
no_cache=0
# Check whether --enable-controls or --disable-controls was given.
if test "${enable_controls+set}" = set; then
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
- DEFAULT_wxUSE_NEW_GRID=yes
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_NOTEBOOK=yes
- DEFAULT_wxUSE_PROPSHEET=yes
DEFAULT_wxUSE_RADIOBOX=yes
DEFAULT_wxUSE_RADIOBTN=yes
DEFAULT_wxUSE_SASH=yes
DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
- DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_IMAGLIST=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_LISTCTRL=no
DEFAULT_wxUSE_NOTEBOOK=no
- DEFAULT_wxUSE_PROPSHEET=no
DEFAULT_wxUSE_RADIOBOX=no
DEFAULT_wxUSE_RADIOBTN=no
DEFAULT_wxUSE_SASH=no
DEFAULT_wxUSE_TIPWINDOW=no
fi
-
- echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
-echo "configure:5682: checking for --enable-accel" >&5
- no_cache=0
- # Check whether --enable-accel or --disable-accel was given.
-if test "${enable_accel+set}" = set; then
- enableval="$enable_accel"
+## FIXME: This is a blatant hack
+if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
+ wxUSE_PRINTING_ARCHITECTURE=no
+ wxUSE_HELP=no
+ wxUSE_CLIPBOARD=no
+ wxUSE_DRAG_AND_DROP=no
+ wxUSE_DATAOBJ=no
+ DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+ DEFAULT_wxUSE_GAUGE=no
+ DEFAULT_wxUSE_SCROLLBAR=no
+ DEFAULT_wxUSE_SLIDER=no
+ DEFAULT_wxUSE_COMBOBOX=no
+ DEFAULT_wxUSE_CALCTRL=no
+ DEFAULT_wxUSE_SPINBTN=no
+ DEFAULT_wxUSE_SPINCTRL=no
+ DEFAULT_wxUSE_TOOLTIPS=no
+ DEFAULT_wxUSE_COLOURDLG=no
+ DEFAULT_wxUSE_DRAGIMAGE=no
+ DEFAULT_wxUSE_FINDREPLDLG=no
+ DEFAULT_wxUSE_FONTDLG=no
+ DEFAULT_wxUSE_GRID=no
+ DEFAULT_wxUSE_NUMBERDLG=no
+ DEFAULT_wxUSE_PROGRESSDLG=no
+ DEFAULT_wxUSE_SASH=no
+ DEFAULT_wxUSE_SPLITTER=no
+ DEFAULT_wxUSE_WIZARDDLG=no
+ DEFAULT_wxUSE_SPLITTER=no
+ DEFAULT_wxUSE_STARTUP_TIPS=no
+fi
+
+
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-accel""... $ac_c" 1>&6
+echo "configure:5855: checking for --${enablestring:-enable}-accel" >&5
+ no_cache=0
+ # Check whether --enable-accel or --disable-accel was given.
+if test "${enable_accel+set}" = set; then
+ enableval="$enable_accel"
if test "$enableval" = yes; then
ac_cv_use_accel='wxUSE_ACCEL=yes'
fi
- echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
-echo "configure:5721: checking for --enable-button" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-button""... $ac_c" 1>&6
+echo "configure:5895: checking for --${enablestring:-enable}-button" >&5
no_cache=0
# Check whether --enable-button or --disable-button was given.
if test "${enable_button+set}" = set; then
fi
- echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6
-echo "configure:5760: checking for --enable-bmpbutton" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-bmpbutton""... $ac_c" 1>&6
+echo "configure:5935: checking for --${enablestring:-enable}-bmpbutton" >&5
no_cache=0
# Check whether --enable-bmpbutton or --disable-bmpbutton was given.
if test "${enable_bmpbutton+set}" = set; then
fi
- echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
-echo "configure:5799: checking for --enable-calendar" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-calendar""... $ac_c" 1>&6
+echo "configure:5975: checking for --${enablestring:-enable}-calendar" >&5
no_cache=0
# Check whether --enable-calendar or --disable-calendar was given.
if test "${enable_calendar+set}" = set; then
fi
- echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6
-echo "configure:5838: checking for --enable-caret" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-caret""... $ac_c" 1>&6
+echo "configure:6015: checking for --${enablestring:-enable}-caret" >&5
no_cache=0
# Check whether --enable-caret or --disable-caret was given.
if test "${enable_caret+set}" = set; then
fi
- echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6
-echo "configure:5877: checking for --enable-checkbox" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-checkbox""... $ac_c" 1>&6
+echo "configure:6055: checking for --${enablestring:-enable}-checkbox" >&5
no_cache=0
# Check whether --enable-checkbox or --disable-checkbox was given.
if test "${enable_checkbox+set}" = set; then
fi
- echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
-echo "configure:5916: checking for --enable-checklst" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-checklst""... $ac_c" 1>&6
+echo "configure:6095: checking for --${enablestring:-enable}-checklst" >&5
no_cache=0
# Check whether --enable-checklst or --disable-checklst was given.
if test "${enable_checklst+set}" = set; then
fi
- echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
-echo "configure:5955: checking for --enable-choice" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-choice""... $ac_c" 1>&6
+echo "configure:6135: checking for --${enablestring:-enable}-choice" >&5
no_cache=0
# Check whether --enable-choice or --disable-choice was given.
if test "${enable_choice+set}" = set; then
fi
- echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
-echo "configure:5994: checking for --enable-combobox" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-combobox""... $ac_c" 1>&6
+echo "configure:6175: checking for --${enablestring:-enable}-combobox" >&5
no_cache=0
# Check whether --enable-combobox or --disable-combobox was given.
if test "${enable_combobox+set}" = set; then
fi
- echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
-echo "configure:6033: checking for --enable-gauge" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-display""... $ac_c" 1>&6
+echo "configure:6215: checking for --${enablestring:-enable}-display" >&5
no_cache=0
- # Check whether --enable-gauge or --disable-gauge was given.
-if test "${enable_gauge+set}" = set; then
- enableval="$enable_gauge"
+ # Check whether --enable-display or --disable-display was given.
+if test "${enable_display+set}" = set; then
+ enableval="$enable_display"
if test "$enableval" = yes; then
- ac_cv_use_gauge='wxUSE_GAUGE=yes'
+ ac_cv_use_display='wxUSE_DISPLAY=yes'
else
- ac_cv_use_gauge='wxUSE_GAUGE=no'
+ ac_cv_use_display='wxUSE_DISPLAY=no'
fi
else
- LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_DISPLAY" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
+ ac_cv_use_display='wxUSE_DISPLAY='$DEFAULT_wxUSE_DISPLAY
fi
- eval "$ac_cv_use_gauge"
+ eval "$ac_cv_use_display"
if test "$no_cache" != 1; then
- echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_display >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_GAUGE" = yes; then
+ if test "$wxUSE_DISPLAY" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
-echo "configure:6072: checking for --enable-grid" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-gauge""... $ac_c" 1>&6
+echo "configure:6255: checking for --${enablestring:-enable}-gauge" >&5
no_cache=0
- # Check whether --enable-grid or --disable-grid was given.
-if test "${enable_grid+set}" = set; then
- enableval="$enable_grid"
+ # Check whether --enable-gauge or --disable-gauge was given.
+if test "${enable_gauge+set}" = set; then
+ enableval="$enable_gauge"
if test "$enableval" = yes; then
- ac_cv_use_grid='wxUSE_GRID=yes'
+ ac_cv_use_gauge='wxUSE_GAUGE=yes'
else
- ac_cv_use_grid='wxUSE_GRID=no'
+ ac_cv_use_gauge='wxUSE_GAUGE=no'
fi
else
- LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
+ ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
fi
- eval "$ac_cv_use_grid"
+ eval "$ac_cv_use_gauge"
if test "$no_cache" != 1; then
- echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_GRID" = yes; then
+ if test "$wxUSE_GAUGE" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
-echo "configure:6111: checking for --enable-newgrid" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-grid""... $ac_c" 1>&6
+echo "configure:6295: checking for --${enablestring:-enable}-grid" >&5
no_cache=0
- # Check whether --enable-newgrid or --disable-newgrid was given.
-if test "${enable_newgrid+set}" = set; then
- enableval="$enable_newgrid"
+ # Check whether --enable-grid or --disable-grid was given.
+if test "${enable_grid+set}" = set; then
+ enableval="$enable_grid"
if test "$enableval" = yes; then
- ac_cv_use_newgrid='wxUSE_NEW_GRID=yes'
+ ac_cv_use_grid='wxUSE_GRID=yes'
else
- ac_cv_use_newgrid='wxUSE_NEW_GRID=no'
+ ac_cv_use_grid='wxUSE_GRID=no'
fi
else
- LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID
+ ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
fi
- eval "$ac_cv_use_newgrid"
+ eval "$ac_cv_use_grid"
if test "$no_cache" != 1; then
- echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_NEW_GRID" = yes; then
+ if test "$wxUSE_GRID" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
-echo "configure:6150: checking for --enable-imaglist" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-imaglist""... $ac_c" 1>&6
+echo "configure:6335: checking for --${enablestring:-enable}-imaglist" >&5
no_cache=0
# Check whether --enable-imaglist or --disable-imaglist was given.
if test "${enable_imaglist+set}" = set; then
fi
- echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
-echo "configure:6189: checking for --enable-listbox" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-listbox""... $ac_c" 1>&6
+echo "configure:6375: checking for --${enablestring:-enable}-listbox" >&5
no_cache=0
# Check whether --enable-listbox or --disable-listbox was given.
if test "${enable_listbox+set}" = set; then
fi
- echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
-echo "configure:6228: checking for --enable-listctrl" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-listctrl""... $ac_c" 1>&6
+echo "configure:6415: checking for --${enablestring:-enable}-listctrl" >&5
no_cache=0
# Check whether --enable-listctrl or --disable-listctrl was given.
if test "${enable_listctrl+set}" = set; then
fi
- echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
-echo "configure:6267: checking for --enable-notebook" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-notebook""... $ac_c" 1>&6
+echo "configure:6455: checking for --${enablestring:-enable}-notebook" >&5
no_cache=0
# Check whether --enable-notebook or --disable-notebook was given.
if test "${enable_notebook+set}" = set; then
fi
- echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6
-echo "configure:6306: checking for --enable-propsheet" >&5
- no_cache=0
- # Check whether --enable-propsheet or --disable-propsheet was given.
-if test "${enable_propsheet+set}" = set; then
- enableval="$enable_propsheet"
-
- if test "$enableval" = yes; then
- ac_cv_use_propsheet='wxUSE_PROPSHEET=yes'
- else
- ac_cv_use_propsheet='wxUSE_PROPSHEET=no'
- fi
-
-else
-
- LINE=`grep "wxUSE_PROPSHEET" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_propsheet='wxUSE_PROPSHEET='$DEFAULT_wxUSE_PROPSHEET
-
-fi
-
-
- eval "$ac_cv_use_propsheet"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_propsheet >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_PROPSHEET" = yes; then
- echo "$ac_t""yes" 1>&6
- else
- echo "$ac_t""no" 1>&6
- fi
-
-
- echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
-echo "configure:6345: checking for --enable-radiobox" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-radiobox""... $ac_c" 1>&6
+echo "configure:6495: checking for --${enablestring:-enable}-radiobox" >&5
no_cache=0
# Check whether --enable-radiobox or --disable-radiobox was given.
if test "${enable_radiobox+set}" = set; then
fi
- echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
-echo "configure:6384: checking for --enable-radiobtn" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-radiobtn""... $ac_c" 1>&6
+echo "configure:6535: checking for --${enablestring:-enable}-radiobtn" >&5
no_cache=0
# Check whether --enable-radiobtn or --disable-radiobtn was given.
if test "${enable_radiobtn+set}" = set; then
fi
- echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
-echo "configure:6423: checking for --enable-sash" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-sash""... $ac_c" 1>&6
+echo "configure:6575: checking for --${enablestring:-enable}-sash" >&5
no_cache=0
# Check whether --enable-sash or --disable-sash was given.
if test "${enable_sash+set}" = set; then
fi
- echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
-echo "configure:6462: checking for --enable-scrollbar" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-scrollbar""... $ac_c" 1>&6
+echo "configure:6615: checking for --${enablestring:-enable}-scrollbar" >&5
no_cache=0
# Check whether --enable-scrollbar or --disable-scrollbar was given.
if test "${enable_scrollbar+set}" = set; then
fi
- echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
-echo "configure:6501: checking for --enable-slider" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-slider""... $ac_c" 1>&6
+echo "configure:6655: checking for --${enablestring:-enable}-slider" >&5
no_cache=0
# Check whether --enable-slider or --disable-slider was given.
if test "${enable_slider+set}" = set; then
fi
- echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
-echo "configure:6540: checking for --enable-spinbtn" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-spinbtn""... $ac_c" 1>&6
+echo "configure:6695: checking for --${enablestring:-enable}-spinbtn" >&5
no_cache=0
# Check whether --enable-spinbtn or --disable-spinbtn was given.
if test "${enable_spinbtn+set}" = set; then
fi
- echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
-echo "configure:6579: checking for --enable-spinctrl" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-spinctrl""... $ac_c" 1>&6
+echo "configure:6735: checking for --${enablestring:-enable}-spinctrl" >&5
no_cache=0
# Check whether --enable-spinctrl or --disable-spinctrl was given.
if test "${enable_spinctrl+set}" = set; then
fi
- echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
-echo "configure:6618: checking for --enable-splitter" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-splitter""... $ac_c" 1>&6
+echo "configure:6775: checking for --${enablestring:-enable}-splitter" >&5
no_cache=0
# Check whether --enable-splitter or --disable-splitter was given.
if test "${enable_splitter+set}" = set; then
fi
- echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
-echo "configure:6657: checking for --enable-statbmp" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-statbmp""... $ac_c" 1>&6
+echo "configure:6815: checking for --${enablestring:-enable}-statbmp" >&5
no_cache=0
# Check whether --enable-statbmp or --disable-statbmp was given.
if test "${enable_statbmp+set}" = set; then
fi
- echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
-echo "configure:6696: checking for --enable-statbox" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-statbox""... $ac_c" 1>&6
+echo "configure:6855: checking for --${enablestring:-enable}-statbox" >&5
no_cache=0
# Check whether --enable-statbox or --disable-statbox was given.
if test "${enable_statbox+set}" = set; then
fi
- echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6
-echo "configure:6735: checking for --enable-statline" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-statline""... $ac_c" 1>&6
+echo "configure:6895: checking for --${enablestring:-enable}-statline" >&5
no_cache=0
# Check whether --enable-statline or --disable-statline was given.
if test "${enable_statline+set}" = set; then
fi
- echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6
-echo "configure:6774: checking for --enable-stattext" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-stattext""... $ac_c" 1>&6
+echo "configure:6935: checking for --${enablestring:-enable}-stattext" >&5
no_cache=0
# Check whether --enable-stattext or --disable-stattext was given.
if test "${enable_stattext+set}" = set; then
fi
- echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6
-echo "configure:6813: checking for --enable-statusbar" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-statusbar""... $ac_c" 1>&6
+echo "configure:6975: checking for --${enablestring:-enable}-statusbar" >&5
no_cache=0
# Check whether --enable-statusbar or --disable-statusbar was given.
if test "${enable_statusbar+set}" = set; then
fi
- echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6
-echo "configure:6852: checking for --enable-tabdialog" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-tabdialog""... $ac_c" 1>&6
+echo "configure:7015: checking for --${enablestring:-enable}-tabdialog" >&5
no_cache=0
# Check whether --enable-tabdialog or --disable-tabdialog was given.
if test "${enable_tabdialog+set}" = set; then
fi
- echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6
-echo "configure:6891: checking for --enable-textctrl" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-textctrl""... $ac_c" 1>&6
+echo "configure:7055: checking for --${enablestring:-enable}-textctrl" >&5
no_cache=0
# Check whether --enable-textctrl or --disable-textctrl was given.
if test "${enable_textctrl+set}" = set; then
fi
- echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6
-echo "configure:6930: checking for --enable-togglebtn" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-togglebtn""... $ac_c" 1>&6
+echo "configure:7095: checking for --${enablestring:-enable}-togglebtn" >&5
no_cache=0
# Check whether --enable-togglebtn or --disable-togglebtn was given.
if test "${enable_togglebtn+set}" = set; then
fi
- echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6
-echo "configure:6969: checking for --enable-toolbar" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-toolbar""... $ac_c" 1>&6
+echo "configure:7135: checking for --${enablestring:-enable}-toolbar" >&5
no_cache=0
# Check whether --enable-toolbar or --disable-toolbar was given.
if test "${enable_toolbar+set}" = set; then
fi
- echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6
-echo "configure:7008: checking for --enable-tbarnative" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-tbarnative""... $ac_c" 1>&6
+echo "configure:7175: checking for --${enablestring:-enable}-tbarnative" >&5
no_cache=0
# Check whether --enable-tbarnative or --disable-tbarnative was given.
if test "${enable_tbarnative+set}" = set; then
fi
- echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6
-echo "configure:7047: checking for --enable-tbarsmpl" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-tbarsmpl""... $ac_c" 1>&6
+echo "configure:7215: checking for --${enablestring:-enable}-tbarsmpl" >&5
no_cache=0
# Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
if test "${enable_tbarsmpl+set}" = set; then
fi
- echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6
-echo "configure:7086: checking for --enable-treectrl" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-treectrl""... $ac_c" 1>&6
+echo "configure:7255: checking for --${enablestring:-enable}-treectrl" >&5
no_cache=0
# Check whether --enable-treectrl or --disable-treectrl was given.
if test "${enable_treectrl+set}" = set; then
fi
- echo $ac_n "checking for --enable-tipwindow""... $ac_c" 1>&6
-echo "configure:7125: checking for --enable-tipwindow" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-tipwindow""... $ac_c" 1>&6
+echo "configure:7295: checking for --${enablestring:-enable}-tipwindow" >&5
no_cache=0
# Check whether --enable-tipwindow or --disable-tipwindow was given.
if test "${enable_tipwindow+set}" = set; then
fi
- echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6
-echo "configure:7164: checking for --enable-popupwin" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-popupwin""... $ac_c" 1>&6
+echo "configure:7335: checking for --${enablestring:-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:7205: checking for --enable-commondlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-commondlg""... $ac_c" 1>&6
+echo "configure:7377: checking for --${enablestring:-enable}-commondlg" >&5
no_cache=0
# Check whether --enable-commondlg or --disable-commondlg was given.
if test "${enable_commondlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6
-echo "configure:7244: checking for --enable-choicedlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-choicedlg""... $ac_c" 1>&6
+echo "configure:7417: checking for --${enablestring:-enable}-choicedlg" >&5
no_cache=0
# Check whether --enable-choicedlg or --disable-choicedlg was given.
if test "${enable_choicedlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6
-echo "configure:7283: checking for --enable-coldlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-coldlg""... $ac_c" 1>&6
+echo "configure:7457: checking for --${enablestring:-enable}-coldlg" >&5
no_cache=0
# Check whether --enable-coldlg or --disable-coldlg was given.
if test "${enable_coldlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
-echo "configure:7322: checking for --enable-filedlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-filedlg""... $ac_c" 1>&6
+echo "configure:7497: checking for --${enablestring:-enable}-filedlg" >&5
no_cache=0
# Check whether --enable-filedlg or --disable-filedlg was given.
if test "${enable_filedlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-finddlg""... $ac_c" 1>&6
-echo "configure:7361: checking for --enable-finddlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-finddlg""... $ac_c" 1>&6
+echo "configure:7537: checking for --${enablestring:-enable}-finddlg" >&5
no_cache=0
# Check whether --enable-finddlg or --disable-finddlg was given.
if test "${enable_finddlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6
-echo "configure:7400: checking for --enable-fontdlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-fontdlg""... $ac_c" 1>&6
+echo "configure:7577: checking for --${enablestring:-enable}-fontdlg" >&5
no_cache=0
# Check whether --enable-fontdlg or --disable-fontdlg was given.
if test "${enable_fontdlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6
-echo "configure:7439: checking for --enable-dirdlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-dirdlg""... $ac_c" 1>&6
+echo "configure:7617: checking for --${enablestring:-enable}-dirdlg" >&5
no_cache=0
# Check whether --enable-dirdlg or --disable-dirdlg was given.
if test "${enable_dirdlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
-echo "configure:7478: checking for --enable-msgdlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-msgdlg""... $ac_c" 1>&6
+echo "configure:7657: checking for --${enablestring:-enable}-msgdlg" >&5
no_cache=0
# Check whether --enable-msgdlg or --disable-msgdlg was given.
if test "${enable_msgdlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
-echo "configure:7517: checking for --enable-numberdlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-numberdlg""... $ac_c" 1>&6
+echo "configure:7697: checking for --${enablestring:-enable}-numberdlg" >&5
no_cache=0
# Check whether --enable-numberdlg or --disable-numberdlg was given.
if test "${enable_numberdlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6
-echo "configure:7556: checking for --enable-splash" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-splash""... $ac_c" 1>&6
+echo "configure:7737: checking for --${enablestring:-enable}-splash" >&5
no_cache=0
# Check whether --enable-splash or --disable-splash was given.
if test "${enable_splash+set}" = set; then
fi
- echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6
-echo "configure:7595: checking for --enable-textdlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-textdlg""... $ac_c" 1>&6
+echo "configure:7777: checking for --${enablestring:-enable}-textdlg" >&5
no_cache=0
# Check whether --enable-textdlg or --disable-textdlg was given.
if test "${enable_textdlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
-echo "configure:7634: checking for --enable-tipdlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-tipdlg""... $ac_c" 1>&6
+echo "configure:7817: checking for --${enablestring:-enable}-tipdlg" >&5
no_cache=0
# Check whether --enable-tipdlg or --disable-tipdlg was given.
if test "${enable_tipdlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
-echo "configure:7673: checking for --enable-progressdlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-progressdlg""... $ac_c" 1>&6
+echo "configure:7857: checking for --${enablestring:-enable}-progressdlg" >&5
no_cache=0
# Check whether --enable-progressdlg or --disable-progressdlg was given.
if test "${enable_progressdlg+set}" = set; then
fi
- echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6
-echo "configure:7712: checking for --enable-wizarddlg" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-wizarddlg""... $ac_c" 1>&6
+echo "configure:7897: checking for --${enablestring:-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:7753: checking for --enable-menus" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-menus""... $ac_c" 1>&6
+echo "configure:7939: checking for --${enablestring:-enable}-menus" >&5
no_cache=0
# Check whether --enable-menus or --disable-menus was given.
if test "${enable_menus+set}" = set; then
fi
- echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6
-echo "configure:7792: checking for --enable-miniframe" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-miniframe""... $ac_c" 1>&6
+echo "configure:7979: checking for --${enablestring:-enable}-miniframe" >&5
no_cache=0
# Check whether --enable-miniframe or --disable-miniframe was given.
if test "${enable_miniframe+set}" = set; then
fi
- echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6
-echo "configure:7831: checking for --enable-tooltips" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-tooltips""... $ac_c" 1>&6
+echo "configure:8019: checking for --${enablestring:-enable}-tooltips" >&5
no_cache=0
# Check whether --enable-tooltips or --disable-tooltips was given.
if test "${enable_tooltips+set}" = set; then
fi
- echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
-echo "configure:7870: checking for --enable-splines" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-splines""... $ac_c" 1>&6
+echo "configure:8059: checking for --${enablestring:-enable}-splines" >&5
no_cache=0
# Check whether --enable-splines or --disable-splines was given.
if test "${enable_splines+set}" = set; then
fi
- echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
-echo "configure:7909: checking for --enable-validators" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-validators""... $ac_c" 1>&6
+echo "configure:8099: checking for --${enablestring:-enable}-validators" >&5
no_cache=0
# Check whether --enable-validators or --disable-validators was given.
if test "${enable_validators+set}" = set; then
fi
- echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
-echo "configure:7948: checking for --enable-busyinfo" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-busyinfo""... $ac_c" 1>&6
+echo "configure:8139: checking for --${enablestring:-enable}-busyinfo" >&5
no_cache=0
# Check whether --enable-busyinfo or --disable-busyinfo was given.
if test "${enable_busyinfo+set}" = set; then
fi
- echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
-echo "configure:7987: checking for --enable-joystick" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-joystick""... $ac_c" 1>&6
+echo "configure:8179: checking for --${enablestring:-enable}-joystick" >&5
no_cache=0
# Check whether --enable-joystick or --disable-joystick was given.
if test "${enable_joystick+set}" = set; then
fi
- echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
-echo "configure:8026: checking for --enable-metafile" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
+echo "configure:8219: checking for --${enablestring:-enable}-metafile" >&5
no_cache=0
# Check whether --enable-metafile or --disable-metafile was given.
if test "${enable_metafile+set}" = set; then
fi
- echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6
-echo "configure:8065: checking for --enable-dragimage" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-dragimage""... $ac_c" 1>&6
+echo "configure:8259: checking for --${enablestring:-enable}-dragimage" >&5
no_cache=0
# Check whether --enable-dragimage or --disable-dragimage was given.
if test "${enable_dragimage+set}" = set; then
fi
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-accessibility""... $ac_c" 1>&6
+echo "configure:8299: checking for --${enablestring:-enable}-accessibility" >&5
+ no_cache=0
+ # Check whether --enable-accessibility or --disable-accessibility was given.
+if test "${enable_accessibility+set}" = set; then
+ enableval="$enable_accessibility"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'
+ else
+ ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_ACCESSIBILITY" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_accessibility='wxUSE_ACCESSIBILITY='$DEFAULT_wxUSE_ACCESSIBILITY
+
+fi
+
+
+ eval "$ac_cv_use_accessibility"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_accessibility >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_ACCESSIBILITY" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
- echo $ac_n "checking for --enable-palette""... $ac_c" 1>&6
-echo "configure:8106: checking for --enable-palette" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-palette""... $ac_c" 1>&6
+echo "configure:8341: checking for --${enablestring:-enable}-palette" >&5
no_cache=0
# Check whether --enable-palette or --disable-palette was given.
if test "${enable_palette+set}" = set; then
fi
- echo $ac_n "checking for --enable-image""... $ac_c" 1>&6
-echo "configure:8145: checking for --enable-image" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-image""... $ac_c" 1>&6
+echo "configure:8381: checking for --${enablestring:-enable}-image" >&5
no_cache=0
# Check whether --enable-image or --disable-image was given.
if test "${enable_image+set}" = set; then
fi
- echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
-echo "configure:8184: checking for --enable-gif" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-gif""... $ac_c" 1>&6
+echo "configure:8421: checking for --${enablestring:-enable}-gif" >&5
no_cache=0
# Check whether --enable-gif or --disable-gif was given.
if test "${enable_gif+set}" = set; then
fi
- echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
-echo "configure:8223: checking for --enable-pcx" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-pcx""... $ac_c" 1>&6
+echo "configure:8461: checking for --${enablestring:-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:8262: checking for --enable-iff" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-iff""... $ac_c" 1>&6
+echo "configure:8501: checking for --${enablestring:-enable}-iff" >&5
no_cache=0
# Check whether --enable-iff or --disable-iff was given.
if test "${enable_iff+set}" = set; then
fi
- echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
-echo "configure:8301: checking for --enable-pnm" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-pnm""... $ac_c" 1>&6
+echo "configure:8541: checking for --${enablestring:-enable}-pnm" >&5
no_cache=0
# Check whether --enable-pnm or --disable-pnm was given.
if test "${enable_pnm+set}" = set; then
fi
- echo $ac_n "checking for --enable-xpm""... $ac_c" 1>&6
-echo "configure:8340: checking for --enable-xpm" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-xpm""... $ac_c" 1>&6
+echo "configure:8581: checking for --${enablestring:-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:8379: checking for --enable-ico_cur" >&5
+ enablestring=
+ echo $ac_n "checking for --${enablestring:-enable}-ico_cur""... $ac_c" 1>&6
+echo "configure:8621: checking for --${enablestring:-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
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
- LEX_STEM="lexyy"
+ PATH_IFS=';'
+ LEX_STEM="lexyy"
;;
*)
PATH_IFS=':'
echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:8437: checking for toolkit" >&5
+echo "configure:8680: checking for toolkit" >&5
+
+# In Wine, we need to default to MSW, not GTK or MOTIF
+if test "$wxUSE_WINE" = "yes"; then
+ DEFAULT_DEFAULT_wxUSE_GTK=0
+ DEFAULT_DEFAULT_wxUSE_MOTIF=0
+ DEFAULT_DEFAULT_wxUSE_MSW=1
+fi
if test "$wxUSE_GUI" = "yes"; then
done
fi
- NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} \
- + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} + ${wxUSE_X11:-0}`
+ NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
+ + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} \
+ + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
1)
;;
0)
- { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; }
+ { echo "configure: error: Please specify a toolkit -- cannot determine the default for ${host}" 1>&2; exit 1; }
;;
*)
- { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; }
+ { echo "configure: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" 1>&2; exit 1; }
esac
for toolkit in `echo $ALL_TOOLKITS`; do
echo "$ac_t""base ($host_alias hosted) only" 1>&6
fi
-
wants_win32=0
doesnt_want_win32=0
case "${host}" in
;;
esac
+if test "$wxUSE_WINE" = "yes"; then
+ wants_win32=1
+ CC=winegcc
+ CXX=wineg++
+ RESCOMP=wrc
+fi
+
if test "$wants_win32" = 1 ; then
USE_UNIX=0
USE_WIN32=1
# 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:8625: checking for $ac_word" >&5
+echo "configure:8882: 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:8655: checking for $ac_word" >&5
+echo "configure:8912: 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:8706: checking for $ac_word" >&5
+echo "configure:8963: 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:8738: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:8995: 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 8749 "configure"
+#line 9006 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:8754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9011: \"$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:8780: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:9037: 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:8785: checking whether we are using GNU C" >&5
+echo "configure:9042: 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:8794: \"$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:9051: \"$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:8813: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:9070: 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
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:8846: checking how to run the C preprocessor" >&5
+echo "configure:9103: 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 8861 "configure"
+#line 9118 "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:8867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9124: \"$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 8878 "configure"
+#line 9135 "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:8884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9141: \"$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 8895 "configure"
+#line 9152 "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:8901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9158: \"$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:8927: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:9184: 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 8933 "configure"
+#line 9190 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 8951 "configure"
+#line 9208 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8988: checking for $ac_word" >&5
+echo "configure:9245: 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:9020: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:9277: 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 9031 "configure"
+#line 9288 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:9036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9293: \"$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:9062: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:9319: 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:9067: checking whether we are using GNU C++" >&5
+echo "configure:9324: 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:9076: \"$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:9333: \"$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:9095: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:9352: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9138: checking for $ac_word" >&5
+echo "configure:9395: 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:9169: checking for $ac_word" >&5
+echo "configure:9426: 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:9209: checking for a BSD compatible install" >&5
+echo "configure:9466: 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
case ${INSTALL} in
/* ) # Absolute
;;
+ ?:* ) # Drive letter, considered as absolute.
+ ;;
*)
INSTALL=`pwd`/${INSTALL} ;;
esac
+case ${host} in
+ *-hp-hpux* )
+ INSTALL_DIR="mkdir"
+ ;;
+
+ *) INSTALL_DIR="$INSTALL -d"
+ ;;
+esac
+
case "${host}" in
# 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:9283: checking for $ac_word" >&5
+echo "configure:9551: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6
-echo "configure:9312: checking if make is GNU make" >&5
+echo "configure:9580: 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 test "x$wx_cv_prog_makeisgnu" != "xyes"; then
echo $ac_n "checking if make supports VPATH""... $ac_c" 1>&6
-echo "configure:9338: checking if make supports VPATH" >&5
+echo "configure:9606: 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
# 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:9385: checking for $ac_word" >&5
+echo "configure:9653: 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:9419: checking for $ac_word" >&5
+echo "configure:9687: 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:9453: checking for yywrap in -l$ac_lib" >&5
+echo "configure:9721: 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 9461 "configure"
+#line 9729 "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:9472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9740: \"$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:9496: checking whether ln -s works" >&5
+echo "configure:9764: 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
fi
+case "${host}" in
+ *-pc-os2_emx | *-pc-os2-emx )
+ LIBS="$LIBS -lstdcpp"
+ if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
+ echo $ac_n "checking for drand48 in -lcExt""... $ac_c" 1>&6
+echo "configure:9790: checking for drand48 in -lcExt" >&5
+ac_lib_var=`echo cExt'_'drand48 | 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="-lcExt $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9798 "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 drand48();
+
+int main() {
+drand48()
+; return 0; }
+EOF
+if { (eval echo configure:9809: \"$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
+ LIBS="$LIBS -lcExt"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ else
+ RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
+ fi
+ ;;
+esac
+
-if test "$wxUSE_MAC" != 1; then
+if test "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
for ac_hdr in strings.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9523: checking for $ac_hdr" >&5
+echo "configure:9841: 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 9528 "configure"
+#line 9846 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9851: \"$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:9565: checking for $ac_hdr" >&5
+echo "configure:9883: 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 9570 "configure"
+#line 9888 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9893: \"$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:9605: checking for $ac_hdr" >&5
+echo "configure:9923: 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 9610 "configure"
+#line 9928 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9933: \"$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:9645: checking for $ac_hdr" >&5
+echo "configure:9963: 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 9650 "configure"
+#line 9968 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9973: \"$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:9685: checking for $ac_hdr" >&5
+echo "configure:10003: 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 9690 "configure"
+#line 10008 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10013: \"$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:9727: checking for $ac_hdr" >&5
+echo "configure:10045: 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 9732 "configure"
+#line 10050 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10055: \"$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
-
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:9770: checking for $ac_hdr" >&5
+echo "configure:10087: 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 9775 "configure"
+#line 10092 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10097: \"$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 fnmatch
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9811: checking for $ac_func" >&5
+echo "configure:10128: 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 9816 "configure"
+#line 10133 "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:9839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9869: checking for $ac_hdr" >&5
+echo "configure:10186: 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 9874 "configure"
+#line 10191 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10196: \"$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*
done
+case "${host}" in
+ *-pc-os2_emx | *-pc-os2-emx )
+ if test $ac_cv_header_langinfo_h = "yes"; then
+ LIBS="$LIBS -lintl"
+ fi
+ ;;
+esac
+
if test "$wxUSE_GUI" = "yes"; then
if test "$wxUSE_UNIX" = "yes"; then
for ac_hdr in X11/XKBlib.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9912: checking for $ac_hdr" >&5
+echo "configure:10237: 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 9917 "configure"
+#line 10242 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10247: \"$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 working const""... $ac_c" 1>&6
-echo "configure:9953: checking for working const" >&5
+echo "configure:10278: 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 9958 "configure"
+#line 10283 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:10007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10332: \"$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:10028: checking for inline" >&5
+echo "configure:10353: 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 10035 "configure"
+#line 10360 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:10042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10367: \"$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:10069: checking size of char" >&5
+echo "configure:10394: 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 10077 "configure"
+#line 10402 "configure"
#include "confdefs.h"
#include <stdio.h>
+#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10414: \"$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:10108: checking size of short" >&5
+echo "configure:10434: 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 10116 "configure"
+#line 10442 "configure"
#include "confdefs.h"
#include <stdio.h>
+#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:10147: checking size of void *" >&5
+echo "configure:10474: 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
ac_cv_sizeof_void_p=4
else
cat > conftest.$ac_ext <<EOF
-#line 10155 "configure"
+#line 10482 "configure"
#include "confdefs.h"
#include <stdio.h>
+#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_void_p=`cat conftestval`
else
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:10186: checking size of int" >&5
+echo "configure:10514: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 10194 "configure"
+#line 10522 "configure"
#include "confdefs.h"
#include <stdio.h>
+#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10205: \"$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
ac_cv_sizeof_int=`cat conftestval`
else
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:10225: checking size of long" >&5
+echo "configure:10554: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 10233 "configure"
+#line 10562 "configure"
#include "confdefs.h"
#include <stdio.h>
+#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
case "${host}" in
arm-*-linux* )
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10267: checking size of long long" >&5
+echo "configure:10597: 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=8
else
cat > conftest.$ac_ext <<EOF
-#line 10275 "configure"
+#line 10605 "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 long));
+ exit(0);
+}
+EOF
+if { (eval echo configure:10617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ ac_cv_sizeof_long_long=`cat conftestval`
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ac_cv_sizeof_long_long=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+EOF
+
+
+ ;;
+ *-hp-hpux* )
+ echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:10639: 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_long=0
+else
+ cat > conftest.$ac_ext <<EOF
+#line 10647 "configure"
#include "confdefs.h"
#include <stdio.h>
+#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10659: \"$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
+ if test "$ac_cv_sizeof_long_long" != "0"; then
+ CPPFLAGS="$CPPFLAGS -D_INCLUDE_LONGLONG"
+ fi
;;
* )
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10308: checking size of long long" >&5
+echo "configure:10684: 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 10316 "configure"
+#line 10692 "configure"
#include "confdefs.h"
#include <stdio.h>
+#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10704: \"$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
esac
echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
-echo "configure:10349: checking size of wchar_t" >&5
+echo "configure:10726: 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
if test "$cross_compiling" = yes; then
- wx_cv_sizeof_wchar_t=4
+
+ case "${host}" in
+ *-pc-msdosdjgpp )
+ wx_cv_sizeof_wchar_t=0
+ ;;
+ * )
+ wx_cv_sizeof_wchar_t=4
+ ;;
+ esac
+
else
cat > conftest.$ac_ext <<EOF
-#line 10359 "configure"
+#line 10745 "configure"
#include "confdefs.h"
+ /* DJGPP only has fake wchar_t: */
+ #ifdef __DJGPP__
+ # error "fake wchar_t"
+ #endif
#ifdef HAVE_WCHAR_H
# ifdef __CYGWIN__
# include <stddef.h>
}
EOF
-if { (eval echo configure:10381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10771: \"$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
wx_largefile=no
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:10413: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:10803: checking for _FILE_OFFSET_BITS value needed for large files" >&5
if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10419 "configure"
+#line 10809 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:10430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
if test "x$wx_largefile" != "xyes"; then
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:10457: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:10847: checking for _LARGE_FILES value needed for large files" >&5
if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10463 "configure"
+#line 10853 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:10474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
fi
echo $ac_n "checking if large file support is available""... $ac_c" 1>&6
-echo "configure:10501: checking if large file support is available" >&5
+echo "configure:10891: checking if large file support is available" >&5
if test "x$wx_largefile" = "xyes"; then
cat >> confdefs.h <<\EOF
#define HAVE_LARGEFILE_SUPPORT 1
fi
+if test "x$wx_largefile" = "xyes"; then
+ if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
+ WX_LARGEFILE_FLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
+ else
+ WX_LARGEFILE_FLAGS="-D_LARGE_FILES"
+ fi
+ CPPFLAGS="$CPPFLAGS $WX_LARGEFILE_FLAGS"
+fi
+
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:10513: checking whether byte ordering is bigendian" >&5
+echo "configure:10912: 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 10520 "configure"
+#line 10919 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:10531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10930: \"$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 10535 "configure"
+#line 10934 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:10546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10945: \"$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 10566 "configure"
+#line 10965 "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:10579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10978: \"$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:10607: checking how to run the C++ preprocessor" >&5
+echo "configure:11006: 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 10620 "configure"
+#line 11019 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11024: \"$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:10669: checking for $ac_hdr" >&5
+echo "configure:11068: 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 10674 "configure"
+#line 11073 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11078: \"$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:10727: checking if C++ compiler supports bool" >&5
+echo "configure:11126: 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 10742 "configure"
+#line 11141 "configure"
#include "confdefs.h"
; return 0; }
EOF
-if { (eval echo configure:10754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_cpp_bool=yes
echo $ac_n "checking if C++ compiler supports the explicit keyword""... $ac_c" 1>&6
-echo "configure:10792: checking if C++ compiler supports the explicit keyword" >&5
+echo "configure:11191: checking if C++ compiler supports the explicit keyword" >&5
if eval "test \"`echo '$''{'wx_cv_explicit'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10807 "configure"
+#line 11206 "configure"
#include "confdefs.h"
class Foo { public: explicit Foo(int) {} };
; return 0; }
EOF
-if { (eval echo configure:10818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 10822 "configure"
+#line 11221 "configure"
#include "confdefs.h"
class Foo { public: explicit Foo(int) {} };
; return 0; }
EOF
-if { (eval echo configure:10835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_explicit=no
else
fi
+echo $ac_n "checking whether the compiler supports const_cast<>""... $ac_c" 1>&6
+echo "configure:11276: checking whether the compiler supports const_cast<>" >&5
+if eval "test \"`echo '$''{'ac_cv_cxx_const_cast'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
-SEARCH_INCLUDE="\
- /usr/local/include \
- \
- /usr/Motif-1.2/include \
- /usr/Motif-2.1/include \
- \
- /usr/include/Motif1.2 \
- /opt/xpm/include/X11 \
- /opt/GBxpm/include/ \
- /opt/GBxpm/X11/include/ \
- \
- /usr/Motif1.2/include \
- /usr/dt/include \
- /usr/openwin/include \
+ cat > conftest.$ac_ext <<EOF
+#line 11289 "configure"
+#include "confdefs.h"
+
+int main() {
+int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;
+; return 0; }
+EOF
+if { (eval echo configure:11296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_cxx_const_cast=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_cxx_const_cast=no
+fi
+rm -f conftest*
+ ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+fi
+
+echo "$ac_t""$ac_cv_cxx_const_cast" 1>&6
+if test "$ac_cv_cxx_const_cast" = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_CONST_CAST
+EOF
+
+fi
+
+
+
+SEARCH_INCLUDE="\
+ /usr/local/include \
+ \
+ /usr/Motif-1.2/include \
+ /usr/Motif-2.1/include \
+ \
+ /usr/include/Motif1.2 \
+ /opt/xpm/include/X11 \
+ /opt/GBxpm/include/ \
+ /opt/GBxpm/X11/include/ \
+ \
+ /usr/Motif1.2/include \
+ /usr/dt/include \
+ /usr/openwin/include \
\
/usr/include/Xm \
\
/usr/local/x11r5/include \
/usr/lpp/Xamples/include \
\
- /usr/openwin/share/include \
- \
- /usr/include"
+ /usr/openwin/share/include"
SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
if test "$USE_LINUX" = 1; then
echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6
-echo "configure:10997: checking for glibc 2.1 or later" >&5
+echo "configure:11444: checking for glibc 2.1 or later" >&5
if eval "test \"`echo '$''{'wx_cv_lib_glibc21'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11003 "configure"
+#line 11450 "configure"
#include "confdefs.h"
#include <features.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_lib_glibc21=yes
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:11062: checking for regex.h" >&5
+echo "configure:11509: 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 11067 "configure"
+#line 11514 "configure"
#include "confdefs.h"
#include <regex.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11519: \"$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:11091: checking for $ac_func" >&5
+echo "configure:11538: 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 11096 "configure"
+#line 11543 "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:11119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11566: \"$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_%'`
+ if test "$USE_DARWIN" = 1; then
+ system_zlib_h_ok="yes"
+ else
+ echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6
+echo "configure:11626: checking for zlib.h >= 1.1.4" >&5
+if eval "test \"`echo '$''{'ac_cv_header_zlib_h'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ unset ac_cv_header_zlib_h
+
+else
+ cat > conftest.$ac_ext <<EOF
+#line 11635 "configure"
+#include "confdefs.h"
+
+ #include <zlib.h>
+ #include <stdio.h>
+
+ int main()
+ {
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+ fprintf(f, "%s",
+ ZLIB_VERSION[0] == '1' &&
+ (ZLIB_VERSION[2] > '1' ||
+ (ZLIB_VERSION[2] == '1' &&
+ ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
+ exit(0);
+ }
+
+EOF
+if { (eval echo configure:11654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ ac_cv_header_zlib_h=`cat conftestval`
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ac_cv_header_zlib_h=no
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+echo "$ac_t""$ac_cv_header_zlib_h" 1>&6
+ ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:11177: checking for zlib.h" >&5
+echo "configure:11672: 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 11182 "configure"
+#line 11677 "configure"
#include "confdefs.h"
#include <zlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11682: \"$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
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:11204: checking for deflate in -lz" >&5
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+ system_zlib_h_ok=$ac_cv_header_zlib_h
+ fi
+
+ if test "$system_zlib_h_ok" = "yes"; then
+ echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
+echo "configure:11709: 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 11212 "configure"
+#line 11717 "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:11223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11728: \"$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
-
+ fi
if test "x$ZLIB_LINK" = "x" ; then
if test "$wxUSE_ZLIB" = "sys" ; then
- { echo "configure: error: system zlib compression library not found! Use --with-zlib=builtin to use built-in version" 1>&2; exit 1; }
+ { echo "configure: error: zlib library not found or too old! Use --with-zlib=builtin to use built-in version" 1>&2; exit 1; }
else
- echo "configure: warning: system zlib compression library not found, will use built-in instead" 1>&2
+ echo "configure: warning: zlib library not found or too old, will use built-in instead" 1>&2
wxUSE_ZLIB=builtin
fi
else
if test "$wxUSE_MGL" != 1 ; then
if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+ echo $ac_n "checking for png.h > 0.90""... $ac_c" 1>&6
+echo "configure:11789: checking for png.h > 0.90" >&5
+if eval "test \"`echo '$''{'ac_cv_header_png_h'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ unset ac_cv_header_png_h
+
+else
+ cat > conftest.$ac_ext <<EOF
+#line 11798 "configure"
+#include "confdefs.h"
+
+ #include <png.h>
+ #include <stdio.h>
+
+ int main()
+ {
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+ fprintf(f, "%s",
+ PNG_LIBPNG_VER > 90 ? "yes" : "no");
+ exit(0);
+ }
+
+EOF
+if { (eval echo configure:11814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ ac_cv_header_png_h=`cat conftestval`
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ ac_cv_header_png_h=no
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+echo "$ac_t""$ac_cv_header_png_h" 1>&6
ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:11288: checking for png.h" >&5
+echo "configure:11832: 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 11293 "configure"
+#line 11837 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11842: \"$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
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:11315: checking for png_check_sig in -lpng" >&5
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+ if test "$ac_cv_header_png_h" = "yes"; then
+ echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
+echo "configure:11866: 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 11323 "configure"
+#line 11874 "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:11334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11885: \"$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
-
+ 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; }
+ { echo "configure: error: system png library not found or too old! 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
+ echo "configure: warning: system png library not found or too old, will use built-in instead" 1>&2
wxUSE_LIBPNG=builtin
fi
else
- wxUSE_LIBPNG=yes
+ wxUSE_LIBPNG=sys
fi
fi
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:11397: checking for jpeglib.h" >&5
+echo "configure:11944: 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 11402 "configure"
+#line 11949 "configure"
#include "confdefs.h"
#undef HAVE_STDLIB_H
; return 0; }
EOF
-if { (eval echo configure:11414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_jpeglib_h=yes
else
if test "$ac_cv_header_jpeglib_h" = "yes"; then
echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:11432: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:11979: 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 11440 "configure"
+#line 11987 "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:11451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11998: \"$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
TIFF_INCLUDE=
TIFF_LINK=
+TIFF_PREREQ_LINKS=-lm
if test "$wxUSE_LIBTIFF" != "no" ; then
cat >> confdefs.h <<\EOF
#define wxUSE_LIBTIFF 1
if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
+ if test "$wxUSE_LIBJPEG" = "sys"; then
+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
+ fi
+ if test "$wxUSE_ZLIB" = "sys"; then
+ TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
+ fi
ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:11503: checking for tiffio.h" >&5
+echo "configure:12057: 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 11508 "configure"
+#line 12062 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12067: \"$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:11530: checking for TIFFError in -ltiff" >&5
+echo "configure:12084: 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
else
ac_save_LIBS="$LIBS"
-LIBS="-ltiff -lm $LIBS"
+LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11538 "configure"
+#line 12092 "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:11549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12103: \"$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
AFMINSTALL=
+WIN32INSTALL=
TOOLKIT=
TOOLKIT_INCLUDE=
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11604: checking for $ac_hdr" >&5
+echo "configure:12159: 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 11609 "configure"
+#line 12164 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12169: \"$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:11642: checking for windows.h" >&5
+echo "configure:12197: 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 11647 "configure"
+#line 12202 "configure"
#include "confdefs.h"
#include <windows.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12207: \"$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:11678: checking if w32api has good enough MSIE support" >&5
+echo "configure:12233: 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 11684 "configure"
+#line 12239 "configure"
#include "confdefs.h"
#include <w32api.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_w32api_win32_ie=yes
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
+ if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
+ LIBS="$LIBS -loleacc"
+ fi
+
case "${host}" in
*-*-cygwin* )
LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
+
+ WIN32INSTALL=win32install
+fi
+
+if test "$USE_DARWIN" = 1; then
+ if test "$wxUSE_PRECOMP" = "yes"; then
+ CPPFLAGS="$CPPFLAGS -cpp-precomp"
+ else
+ CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
+ fi
fi
if test "$wxUSE_GUI" = "yes"; then
TOOLKIT=MSW
GUIDIST=MSW_DIST
- case "${host}" in
- *-*-mingw32* )
- LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
- esac
+ LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
fi
if test "$wxUSE_GTK" = 1; then
echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
-echo "configure:11759: checking for GTK+ version" >&5
+echo "configure:12325: checking for GTK+ version" >&5
gtk_version_cached=1
if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
GTK_MODULES=gthread
fi
- wx_cv_lib_gtk=
+ wx_cv_lib_gtk=
if test "x$wxUSE_GTK2" = "xyes"; then
# Check whether --enable-gtktest or --disable-gtktest was given.
if test "${enable_gtktest+set}" = set; then
# 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:11800: checking for $ac_word" >&5
+echo "configure:12366: 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
min_gtk_version=2.0.0
echo $ac_n "checking for GTK+ - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:11848: checking for GTK+ - version >= $min_gtk_version" >&5
+echo "configure:12414: 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
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 11883 "configure"
+#line 12449 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:11958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12524: \"$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 11992 "configure"
+#line 12558 "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:12002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12568: \"$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"
rm -f conf.gtktest
- fi
-
- if test -z "$wx_cv_lib_gtk"; then
+ else
# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
if test "${with_gtk_prefix+set}" = set; then
withval="$with_gtk_prefix"
# 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:12086: checking for $ac_word" >&5
+echo "configure:12650: 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:12121: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:12685: 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 12144 "configure"
+#line 12708 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:12222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12786: \"$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 12256 "configure"
+#line 12820 "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:12266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12830: \"$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"
rm -f conf.gtktest
- fi
- if test -z "$wx_cv_lib_gtk"; then
- # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+ if test -z "$wx_cv_lib_gtk"; then
+ # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
if test "${with_gtk_prefix+set}" = set; then
withval="$with_gtk_prefix"
gtk_config_prefix="$withval"
# 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:12357: checking for $ac_word" >&5
+echo "configure:12920: 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:12392: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:12955: 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 12415 "configure"
+#line 12978 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:12493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13056: \"$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 12527 "configure"
+#line 13090 "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:12537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13100: \"$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"
rm -f conf.gtktest
+ fi
fi
if test -z "$wx_cv_lib_gtk"; then
case "$wx_cv_lib_gtk" in
2.0) WXGTK20=1
+ TOOLKIT_VERSION=2
;;
1.2.7) WXGTK127=1
WXGTK12=1
# 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:12618: checking for $ac_word" >&5
+echo "configure:13183: 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
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for pangoft2""... $ac_c" 1>&6
-echo "configure:12662: checking for pangoft2" >&5
+echo "configure:13227: checking for pangoft2" >&5
if $PKG_CONFIG --exists "pangoft2" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6
-echo "configure:12669: checking PANGOFT2_CFLAGS" >&5
+echo "configure:13234: checking PANGOFT2_CFLAGS" >&5
PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
echo "$ac_t""$PANGOFT2_CFLAGS" 1>&6
echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6
-echo "configure:12674: checking PANGOFT2_LIBS" >&5
+echo "configure:13239: checking PANGOFT2_LIBS" >&5
PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
echo "$ac_t""$PANGOFT2_LIBS" 1>&6
else
fi
fi
+ else
+ if test "$wxUSE_UNICODE" = "yes"; then
+ echo "configure: warning: Unicode configuration not supported with GTK+ 1.x" 1>&2
+ wxUSE_UNICODE=no
+ fi
+ fi
+
+ if test "$USE_DARWIN" != 1; then
+ for ac_func in poll
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13284: 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 13289 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:13312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
fi
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
GUIDIST=GTK_DIST
echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:12718: checking for gdk_im_open in -lgdk" >&5
+echo "configure:13346: 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 12726 "configure"
+#line 13354 "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:12737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
if test "$wxUSE_MGL" = 1; then
- echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
-echo "configure:12764: checking for SciTech MGL library" >&5
+ echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
+echo "configure:13392: checking for SciTech MGL library" >&5
if test "x$MGL_ROOT" = x ; then
echo "$ac_t""not found" 1>&6
{ echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; }
echo "$ac_t""$MGL_ROOT" 1>&6
fi
+ echo $ac_n "checking for libmgl location""... $ac_c" 1>&6
+echo "configure:13401: checking for libmgl location" >&5
case "${host}" in
*-*-linux* )
- mgl_os=linux/gcc/glibc
+ if test "x$wxUSE_SHARED" = xyes ; then
+ mgl_os_candidates="linux/gcc/glibc.so linux/gcc/glibc"
+ else
+ mgl_os_candidates="linux/gcc/glibc linux/gcc/glibc.so"
+ fi
;;
*-pc-msdosdjgpp )
- mgl_os=dos32/dj2
+ mgl_os_candidates="dos32/dj2"
;;
*)
{ echo "configure: error: This system type ${host} is not yet supported by wxMGL." 1>&2; exit 1; }
esac
mgl_lib_type=""
-
- if test "$wxUSE_DEBUG_FLAG" = yes ; then
- if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \
- -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then
- mgl_lib_type=debug
- fi
- fi
- if test "x$mgl_lib_type" = x ; then
- if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \
- -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then
- mgl_lib_type=release
- else
- { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; }
+ mgl_os=""
+
+ for mgl_os_i in $mgl_os_candidates ; do
+ if test "x$mgl_os" = x ; then
+ if test "$wxUSE_DEBUG_FLAG" = yes ; then
+ if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
+ -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
+ mgl_lib_type=debug
+ mgl_os=$mgl_os_i
+ fi
+ fi
+ if test "x$mgl_lib_type" = x ; then
+ if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
+ -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
+ mgl_lib_type=release
+ mgl_os=$mgl_os_i
+ fi
+ fi
fi
+ done
+
+ if test "x$mgl_os" = x ; then
+ echo "$ac_t""not found" 1>&6
+ { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; }
fi
+ echo "$ac_t"""$MGL_ROOT/lib/$mgl_lib_type/$mgl_os"" 1>&6
wxUSE_UNIVERSAL="yes"
if test "$wxUSE_MICROWIN" = 1; then
echo $ac_n "checking for MicroWindows""... $ac_c" 1>&6
-echo "configure:12812: checking for MicroWindows" >&5
+echo "configure:13457: 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; }
# 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:12844: checking for X" >&5
+echo "configure:13489: 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 12906 "configure"
+#line 13551 "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:12911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13556: \"$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 12980 "configure"
+#line 13625 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:12987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:13093: checking whether -R must be followed by a space" >&5
+echo "configure:13738: 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 13096 "configure"
+#line 13741 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:13103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13748: \"$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 13119 "configure"
+#line 13764 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:13126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13771: \"$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:13158: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:13803: 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 13166 "configure"
+#line 13811 "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:13177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13822: \"$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:13199: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:13844: 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 13207 "configure"
+#line 13852 "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:13218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13863: \"$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:13247: checking for gethostbyname" >&5
+echo "configure:13892: 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 13252 "configure"
+#line 13897 "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:13275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13920: \"$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:13296: checking for gethostbyname in -lnsl" >&5
+echo "configure:13941: 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 13304 "configure"
+#line 13949 "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:13315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13960: \"$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:13345: checking for connect" >&5
+echo "configure:13990: 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 13350 "configure"
+#line 13995 "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:13373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14018: \"$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:13394: checking for connect in -lsocket" >&5
+echo "configure:14039: 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 13402 "configure"
+#line 14047 "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:13413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14058: \"$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:13437: checking for remove" >&5
+echo "configure:14082: 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 13442 "configure"
+#line 14087 "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:13465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14110: \"$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:13486: checking for remove in -lposix" >&5
+echo "configure:14131: 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 13494 "configure"
+#line 14139 "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:13505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14150: \"$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:13529: checking for shmat" >&5
+echo "configure:14174: 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 13534 "configure"
+#line 14179 "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:13557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14202: \"$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:13578: checking for shmat in -lipc" >&5
+echo "configure:14223: 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 13586 "configure"
+#line 14231 "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:13597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14242: \"$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:13630: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:14275: 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 13638 "configure"
+#line 14283 "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:13649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14294: \"$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_NANOX" = "yes"; then
echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6
-echo "configure:13685: checking for MicroWindows/NanoX distribution" >&5
+echo "configure:14330: 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; }
xpm_link=
echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:13700: checking for Xpm library" >&5
+echo "configure:14345: checking for Xpm library" >&5
ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;
do
for ac_extension in a so sl dylib; do
if test -f "$ac_dir/libXpm.$ac_extension"; then
echo "$ac_t""found at $ac_find_libraries" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13732 "configure"
+#line 14377 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
; return 0; }
EOF
-if { (eval echo configure:13744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
xpm_link=" -lXpm"
rm -f conftest*
fi
- wxUSE_UNIVERSAL="yes"
-
- 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:13786: checking for windows.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6
+echo "configure:14414: checking for XShapeQueryExtension in -lXext" >&5
+ac_lib_var=`echo Xext'_'XShapeQueryExtension | 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
- cat > conftest.$ac_ext <<EOF
-#line 13791 "configure"
+ ac_save_LIBS="$LIBS"
+LIBS="-lXext $GUI_TK_LIBRARY -lX11 $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14422 "configure"
#include "confdefs.h"
-#include <windows.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 XShapeQueryExtension();
+
+int main() {
+XShapeQueryExtension()
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13796: \"$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:14433: \"$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"
+ eval "ac_cv_lib_$ac_lib_var=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"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
+LIBS="$ac_save_LIBS"
+
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- :
+
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
+ wxHAVE_XEXT_LIB=1
+
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:13823: 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
+ if test "$wxUSE_UNICODE" = "yes"; then
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # 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:14465: 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 "$PKG_CONFIG" in
+ /*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a 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=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+ break
+ fi
done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+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
- 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
+ fi
- echo "$ac_t""found at $ac_find_libraries" 1>&6
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ echo $ac_n "checking for pangox""... $ac_c" 1>&6
+echo "configure:14509: checking for pangox" >&5
+
+ if $PKG_CONFIG --exists "pangox" ; then
+ echo "$ac_t""yes" 1>&6
+ succeeded=yes
+
+ echo $ac_n "checking PANGOX_CFLAGS""... $ac_c" 1>&6
+echo "configure:14516: checking PANGOX_CFLAGS" >&5
+ PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox"`
+ echo "$ac_t""$PANGOX_CFLAGS" 1>&6
+
+ echo $ac_n "checking PANGOX_LIBS""... $ac_c" 1>&6
+echo "configure:14521: checking PANGOX_LIBS" >&5
+ PANGOX_LIBS=`$PKG_CONFIG --libs "pangox"`
+ echo "$ac_t""$PANGOX_LIBS" 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
+ PANGOX_CFLAGS=""
+ PANGOX_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ PANGOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangox"`
+
fi
- mesa_link=
- echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:13851: 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
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+
+ CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
+ LIBS="$LIBS $PANGOX_LIBS"
+
+ else
+
+ { echo "configure: error: pangox library not found, library cannot be compiled in Unicode mode" 1>&2; exit 1; }
+
+
+ fi
+
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # 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:14560: 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 "$PKG_CONFIG" in
+ /*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a 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=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+ break
+ fi
done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+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
- 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
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ echo $ac_n "checking for pangoft2""... $ac_c" 1>&6
+echo "configure:14604: checking for pangoft2" >&5
+
+ if $PKG_CONFIG --exists "pangoft2" ; then
+ echo "$ac_t""yes" 1>&6
+ succeeded=yes
+
+ echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6
+echo "configure:14611: checking PANGOFT2_CFLAGS" >&5
+ PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
+ echo "$ac_t""$PANGOFT2_CFLAGS" 1>&6
+
+ echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6
+echo "configure:14616: checking PANGOFT2_LIBS" >&5
+ PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
+ echo "$ac_t""$PANGOFT2_LIBS" 1>&6
else
- { echo "configure: error: no" 1>&2; exit 1; }
+ PANGOFT2_CFLAGS=""
+ PANGOFT2_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"`
+
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__"
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+
+ CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
+ LIBS="$LIBS $PANGOFT2_LIBS"
+
+ else
+
+ echo "configure: warning: pangoft2 library not found, library will be compiled without printing support" 1>&2
+ wxUSE_PRINTING_ARCHITECTURE="no"
+
+
+ fi
+
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # 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:14656: 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 "$PKG_CONFIG" in
+ /*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a 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=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+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
+
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ echo $ac_n "checking for pangoxft""... $ac_c" 1>&6
+echo "configure:14700: checking for pangoxft" >&5
+
+ if $PKG_CONFIG --exists "pangoxft" ; then
+ echo "$ac_t""yes" 1>&6
+ succeeded=yes
+
+ echo $ac_n "checking PANGOXFT_CFLAGS""... $ac_c" 1>&6
+echo "configure:14707: checking PANGOXFT_CFLAGS" >&5
+ PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft"`
+ echo "$ac_t""$PANGOXFT_CFLAGS" 1>&6
+
+ echo $ac_n "checking PANGOXFT_LIBS""... $ac_c" 1>&6
+echo "configure:14712: checking PANGOXFT_LIBS" >&5
+ PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft"`
+ echo "$ac_t""$PANGOXFT_LIBS" 1>&6
+ else
+ PANGOXFT_CFLAGS=""
+ PANGOXFT_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ PANGOXFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft"`
+
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+
+ CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
+ LIBS="$LIBS $PANGOXFT_LIBS"
+
+ else
+
+ echo "configure: warning: pangoxft library not found, library will be compiled without anti-aliasing support" 1>&2
+
+
+ fi
+
+ fi
+
+ wxUSE_UNIVERSAL="yes"
+
+ 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_MOTIF" = 1; then
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:13899: checking whether -R must be followed by a space" >&5
+echo "configure:14782: 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 13902 "configure"
+#line 14785 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:13909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14792: \"$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 13925 "configure"
+#line 14808 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:13932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14815: \"$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:13964: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:14847: 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 13972 "configure"
+#line 14855 "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:13983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14866: \"$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:14005: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:14888: 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 14013 "configure"
+#line 14896 "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:14024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14907: \"$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:14053: checking for gethostbyname" >&5
+echo "configure:14936: 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 14058 "configure"
+#line 14941 "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:14081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14964: \"$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:14102: checking for gethostbyname in -lnsl" >&5
+echo "configure:14985: 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 14110 "configure"
+#line 14993 "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:14121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15004: \"$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:14151: checking for connect" >&5
+echo "configure:15034: 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 14156 "configure"
+#line 15039 "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:14179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15062: \"$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:14200: checking for connect in -lsocket" >&5
+echo "configure:15083: 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 14208 "configure"
+#line 15091 "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:14219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_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:14243: checking for remove" >&5
+echo "configure:15126: 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 14248 "configure"
+#line 15131 "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:14271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15154: \"$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:14292: checking for remove in -lposix" >&5
+echo "configure:15175: 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 14300 "configure"
+#line 15183 "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:14311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15194: \"$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:14335: checking for shmat" >&5
+echo "configure:15218: 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 14340 "configure"
+#line 15223 "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:14363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15246: \"$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:14384: checking for shmat in -lipc" >&5
+echo "configure:15267: 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 14392 "configure"
+#line 15275 "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:14403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15286: \"$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:14436: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:15319: 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 14444 "configure"
+#line 15327 "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:14455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15338: \"$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: error: X11 not found" 1>&2; exit 1; }
fi
- GUI_TK_LIBRARY="$X_LIBS"
- TOOLKIT_INCLUDE="$X_CFLAGS"
+ GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`
+ TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
AFMINSTALL=afminstall
COMPILED_X_PROGRAM=0
echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:14490: checking for Motif/Lesstif headers" >&5
+echo "configure:15373: checking for Motif/Lesstif headers" >&5
ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE;
+for ac_dir in $SEARCH_INCLUDE /usr/include;
do
if test -f "$ac_dir/Xm/Xm.h"; then
ac_find_includes=$ac_dir
if test "$ac_find_includes" != "" ; then
echo "$ac_t""found in $ac_find_includes" 1>&6
- ac_path_to_include=$ac_find_includes
- echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
- result=$?
- if test $result = 0; then
+ if test "x$ac_find_includes" = "x/usr/include"; then
ac_path_to_include=""
else
- ac_path_to_include=" -I$ac_find_includes"
+ echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
+ result=$?
+ if test $result = 0; then
+ ac_path_to_include=""
+ else
+ ac_path_to_include=" -I$ac_find_includes"
+ fi
fi
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
else
cat > conftest.$ac_ext <<EOF
-#line 14516 "configure"
+#line 15402 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:14528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15414: \"$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:14549: checking for Motif/Lesstif library" >&5
+echo "configure:15435: checking for Motif/Lesstif library" >&5
ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;
do
for ac_extension in a so sl dylib; do
if test -f "$ac_dir/libXm.$ac_extension"; then
CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
cat > conftest.$ac_ext <<EOF
-#line 14580 "configure"
+#line 15466 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:14592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15478: \"$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:14616: checking for Xpm library" >&5
+echo "configure:15502: checking for Xpm library" >&5
ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;
do
for ac_extension in a so sl dylib; do
if test -f "$ac_dir/libXpm.$ac_extension"; then
CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
cat > conftest.$ac_ext <<EOF
-#line 14652 "configure"
+#line 15538 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
; return 0; }
EOF
-if { (eval echo configure:14664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
xpm_link=" -lXpm"
fi
echo $ac_n "checking if we need -lXp and/or -lSM -lICE""... $ac_c" 1>&6
-echo "configure:14691: checking if we need -lXp and/or -lSM -lICE" >&5
+echo "configure:15577: checking if we need -lXp and/or -lSM -lICE" >&5
libp_link=""
libsm_ice_link=""
libs_found=0
for libp in "" " -lXp"; do
if test "$libs_found" = "0"; then
for libsm_ice in " -lSM -lICE"; do
- if test "$libs_found" = "0"; then
+ if test "$libs_found" = "0"; then
save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
cat > conftest.$ac_ext <<EOF
-#line 14705 "configure"
+#line 15591 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:14720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
libp_link="$libp"
{ echo "configure: error: can't link a simple motif program" 1>&2; exit 1; }
fi
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+ echo $ac_n "checking for Motif 2""... $ac_c" 1>&6
+echo "configure:15638: checking for Motif 2" >&5
+ cat > conftest.$ac_ext <<EOF
+#line 15640 "configure"
+#include "confdefs.h"
+
+ #include <Xm/Xm.h>
+
+int main() {
+
+ #if XmVersion < 2000
+ #error "Not Motif 2"
+ #endif
+
+; return 0; }
+EOF
+if { (eval echo configure:15653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ cat >> confdefs.h <<\EOF
+#define __WXMOTIF20__ 1
+EOF
+
+ echo "$ac_t""found" 1>&6
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ cat >> confdefs.h <<\EOF
+#define __WXMOTIF20__ 0
+EOF
+
+ echo "$ac_t""not found" 1>&6
+
+fi
+rm -f conftest*
+ CFLAGS=$save_CFLAGS
+
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
- TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
+ TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11"
TOOLKIT=MOTIF
GUIDIST=MOTIF_DIST
+ wxHAVE_XEXT_LIB=1
+ fi
+
+ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1 &&
+ test "$wxHAVE_XEXT_LIB" = 1; then
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+ echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
+echo "configure:15690: checking for X11/extensions/shape.h" >&5
+ cat > conftest.$ac_ext <<EOF
+#line 15692 "configure"
+#include "confdefs.h"
+
+ #include <X11/Xlib.h>
+ #include <X11/extensions/shape.h>
+
+int main() {
+
+ int dummy1, dummy2;
+ XShapeQueryExtension((Display*)NULL,
+ (int*)NULL, (int*)NULL);
+
+; return 0; }
+EOF
+if { (eval echo configure:15706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ cat >> confdefs.h <<\EOF
+#define HAVE_XSHAPE 1
+EOF
+
+ echo "$ac_t""found" 1>&6
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ echo "$ac_t""not found" 1>&6
+
+fi
+rm -f conftest*
+ CFLAGS="$save_CFLAGS"
fi
if test "$wxUSE_MAC" = 1; then
- if test "$wxUSE_PRECOMP" = "yes"; then
- CPPFLAGS="$CPPFLAGS -cpp-precomp"
- else
- CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
- fi
- CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
- CFLAGS="$CFLAGS -fpascal-strings"
- CXXFLAGS="$CXXFLAGS -fpascal-strings"
+ CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon"
- TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
+ TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
TOOLKIT=MAC
GUIDIST=MACX_DIST
fi
+ if test "$wxUSE_COCOA" = 1; then
+ TOOLKIT_VPATH="\${top_srcdir}/src/cocoa"
+ TOOLKIT=COCOA
+ GUIDIST=COCOA_DIST
+ fi
+
if test "$wxUSE_PM" = 1; then
TOOLKIT=PM
GUIDIST=GTK_DIST
+ echo "configure: warning: OS/2 threads are not yet supported... disabled" 1>&2
+ wxUSE_THREADS="no"
fi
if test "$TOOLKIT" = "PM" ; then
if test "$wxUSE_OPENGL" = "yes"; then
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
else
ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
-echo "configure:14870: checking for GL/gl.h" >&5
+echo "configure:15843: 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 14875 "configure"
+#line 15848 "configure"
#include "confdefs.h"
#include <GL/gl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15853: \"$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
+ found_gl=0
+
echo $ac_n "checking for -lGL""... $ac_c" 1>&6
-echo "configure:14898: checking for -lGL" >&5
+echo "configure:15873: checking for -lGL" >&5
ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;
do
for ac_extension in a so sl dylib; do
if test -f "$ac_dir/libGL.$ac_extension"; then
ac_path_to_link=" -L$ac_find_libraries"
fi
- if test "$ac_path_to_link" = " -L/usr/lib" ; then
- LDFLAGS_GL="$LDFLAGS"
- else
- LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+ if test "$ac_path_to_link" != " -L/usr/lib" ; then
+ LDFLAGS_GL="$ac_path_to_link"
fi
- OPENGL_LIBS="-lGL -lGLU"
- echo "$ac_t""yes" 1>&6
- else
+
+
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB /usr/lib;
+ do
+ for ac_extension in a so sl dylib; do
+ if test -f "$ac_dir/libGLU.$ac_extension"; then
+ ac_find_libraries=$ac_dir
+ break 2
+ fi
+ done
+ done
+
+ if test "$ac_find_libraries" != "" ; then
+
+ echo "$LDFLAGS" | 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
+
+ if test "$ac_path_to_link" != " -L/usr/lib" -a \
+ "$ac_path_to_link" != "$LDFLAGS_GL"; then
+ LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+ fi
+
+ found_gl=1
+ OPENGL_LIBS="-lGL -lGLU"
+ echo "$ac_t""yes" 1>&6
+ fi
+ fi
+
+ if "$found_gl" != 1; then
echo "$ac_t""no" 1>&6
echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6
-echo "configure:14931: checking for -lMesaGL" >&5
+echo "configure:15936: checking for -lMesaGL" >&5
ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;
do
for ac_extension in a so sl dylib; do
if test -f "$ac_dir/libMesaGL.$ac_extension"; then
lib_debug_suffix=d
fi
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
-TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
+WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
+
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
if test "$cross_compiling" = "yes"; then
TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
+WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
;;
*-*-darwin* )
+
+ WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+ WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+
+ WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+
if test "$wxUSE_MAC" = 1; then
- WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r"
- WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
+ WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r"
+ WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc"
fi
;;
esac
PIC_FLAG="-fPIC"
fi
+
+
+ found_versioning=no
+
+
+ if test $found_versioning = no ; then
+ echo $ac_n "checking if the linker accepts --version-script""... $ac_c" 1>&6
+echo "configure:16107: checking if the linker accepts --version-script" >&5
+if eval "test \"`echo '$''{'wx_cv_version_script'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ echo "VER_1 { *; };" >conftest.sym
+ echo "int main() { return 0; }" >conftest.cpp
+
+ if { ac_try='
+ $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
+ -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'; { (eval echo configure:16117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then
+ if test -s conftest.stderr ; then
+ wx_cv_version_script=no
+ else
+ wx_cv_version_script=yes
+ fi
+ else
+ wx_cv_version_script=no
+ fi
+ rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
+
+fi
+
+echo "$ac_t""$wx_cv_version_script" 1>&6
+ if test $wx_cv_version_script = yes ; then
+ LDFLAGS_VERSIONING="-Wl,--version-script,\$(top_builddir)/version-script"
+ fi
+ fi
+
+
SHARED_LD="${CXX} -shared -o"
case "${host}" in
*-hp-hpux* )
- if test "$GCC" == "yes"; then
- SHARED_LD="${SHARED_LD} ${PIC_FLAG}"
+ if test "$GCC" = "yes"; then
+ SHARED_LD="${CXX} -shared ${PIC_FLAG} -o"
else
LDFLAGS="$LDFLAGS -L/usr/lib"
*-*-linux* )
if test "$GCC" != "yes"; then
echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6
-echo "configure:15107: checking for Intel compiler" >&5
+echo "configure:16161: 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 15113 "configure"
+#line 16167 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:15124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_prog_icc=yes
else
;;
*-*-darwin* )
- CFLAGS="$CFLAGS -fno-common -DWXMAKINGDLL"
- CXXFLAGS="$CXXFLAGS -fno-common -DWXMAKINGDLL"
+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXMAKINGDLL"
+ CFLAGS="$CFLAGS -fno-common"
+ CXXFLAGS="$CXXFLAGS -fno-common"
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
PIC_FLAG="-dynamic -fPIC"
- SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
- SONAME_FLAGS_GL=${SONAME_FLAGS}
+ SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
+ SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
;;
*-*-aix* )
- # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
+ if test "$GCC" != "yes"; then
+ # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
set dummy makeC++SharedLib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15175: checking for $ac_word" >&5
+echo "configure:16231: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AIX_CXX_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
- SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
+ SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
+ fi
;;
*-*-cygwin* | *-*-mingw32* )
-
WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
- if test "$wxUSE_OPENGL" = "yes"; then
- WX_ALL_INSTALLED="preinstall_gl"
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
- else
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
+ WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+
+ if test "$wxUSE_OPENGL" = "yes"; then
+ LIBS="${LIBS} ${OPENGL_LIBS}"
fi
;;
SHARED_LD="${LD} -shared -o"
;;
+ *-*-irix* )
+ if test "$GCC" != "yes"; then
+ PIC_FLAG="-KPIC"
+ fi
+ ;;
+
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
*-*-sunos4* | \
- *-*-irix5* | *-*-irix6* | \
*-*-osf* | \
*-*-dgux5* | \
*-*-sysv5* )
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
fi
- if test "$wxUSE_MAC" = 1; then
- WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
+ WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
+ fi
+
+ if test "$wxUSE_OPENGL" = "yes"; then
+ WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl"
+ WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}"
+ else
+ WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}"
+ fi
+
+ WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+ WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
+
+ WX_TARGET_LIBRARY_TYPE="a"
+ INSTALL_LIBRARY='$(INSTALL_DATA)'
+
+ STATIC_FLAG="yes"
+else
+ STATIC_FLAG="no"
+fi
+
+MACRESCOMP="@#"
+MACSETFILE="@#"
+MACRESWXCONFIG="#"
+if test "$wxUSE_MAC" = 1; then
+ LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
+ WX_ALL="${WX_ALL} ${LIBWXMACRES}"
+ WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
+ # 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:16347: 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
+ if test -n "$RESCOMP"; then
+ ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_RESCOMP="Rez"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez"
+fi
+fi
+RESCOMP="$ac_cv_prog_RESCOMP"
+if test -n "$RESCOMP"; then
+ echo "$ac_t""$RESCOMP" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ # Extract the first word of "DeRez", so it can be a program name with args.
+set dummy DeRez; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16377: 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
+ if test -n "$DEREZ"; then
+ ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_DEREZ="DeRez"
+ break
fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
+fi
+fi
+DEREZ="$ac_cv_prog_DEREZ"
+if test -n "$DEREZ"; then
+ echo "$ac_t""$DEREZ" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
- if test "$wxUSE_OPENGL" = "yes"; then
- WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl"
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}"
- else
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}"
+ # Extract the first word of "SetFile", so it can be a program name with args.
+set dummy SetFile; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16407: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_SETFILE'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$SETFILE"; then
+ ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_SETFILE="SetFile"
+ break
fi
-
- WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
- WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
-
- WX_TARGET_LIBRARY_TYPE="a"
- INSTALL_LIBRARY='$(INSTALL_DATA)'
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
+fi
+fi
+SETFILE="$ac_cv_prog_SETFILE"
+if test -n "$SETFILE"; then
+ echo "$ac_t""$SETFILE" 1>&6
+else
+ echo "$ac_t""no" 1>&6
fi
-if test "$wxUSE_MAC" = 1; then
- LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
- WX_ALL="${WX_ALL} ${LIBWXMACRES}"
- WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
+ MACOSX_BUNDLE="bundle"
+ MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o"
+ MACSETFILE="\$(SETFILE)"
+ MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}} -o"
+elif test "$wxUSE_COCOA" = 1; then
# 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:15279: checking for $ac_word" >&5
+echo "configure:16442: 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:15309: checking for $ac_word" >&5
+echo "configure:16472: 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"
- if test "$wxUSE_SHARED" = "yes"; then
- LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r -o \$(BIN_PROGRAM)"
- LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r -o"
- else
- LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
- LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+ # Extract the first word of "SetFile", so it can be a program name with args.
+set dummy SetFile; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16502: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_SETFILE'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$SETFILE"; then
+ ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_SETFILE="SetFile"
+ break
fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
+fi
+fi
+SETFILE="$ac_cv_prog_SETFILE"
+if test -n "$SETFILE"; then
+ echo "$ac_t""$SETFILE" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
+ MACSETFILE="\$(SETFILE)"
+ MACRESWXCONFIG="echo -n | ${RESCOMP} -d __DARWIN__ -t APPL \$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}} -o"
else
if test "$wxUSE_PM" = 1; then
- LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
+ MACRESCOMP="emxbind -ep"
fi
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:15352: checking for ANSI C header files" >&5
+echo "configure:16540: 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 15357 "configure"
+#line 16545 "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:15365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16553: \"$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 15382 "configure"
+#line 16570 "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 15400 "configure"
+#line 16588 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 15421 "configure"
+#line 16609 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:15432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:16620: \"$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:15456: checking for mode_t" >&5
+echo "configure:16644: 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 15461 "configure"
+#line 16649 "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:15489: checking for off_t" >&5
+echo "configure:16677: 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 15494 "configure"
+#line 16682 "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:15522: checking for pid_t" >&5
+echo "configure:16710: 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 15527 "configure"
+#line 16715 "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:15555: checking for size_t" >&5
+echo "configure:16743: 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 15560 "configure"
+#line 16748 "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:15588: checking for uid_t in sys/types.h" >&5
+echo "configure:16776: 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 15593 "configure"
+#line 16781 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6
-echo "configure:15631: checking if size_t is unsigned int" >&5
+echo "configure:16819: 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 15636 "configure"
+
+ cat > conftest.$ac_ext <<EOF
+#line 16825 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:15649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_size_t_is_uint=no
else
fi
rm -f conftest*
+
fi
else
echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
-echo "configure:15672: checking if size_t is unsigned long" >&5
+echo "configure:16862: 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 15677 "configure"
+#line 16867 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:15690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16880: \"$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:15724: checking for pw_gecos in struct passwd" >&5
+echo "configure:16914: 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 15730 "configure"
+#line 16920 "configure"
#include "confdefs.h"
#include <pwd.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:15741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_struct_pw_gecos=yes
fi
-WCHAR_OK=0
if test "$wx_cv_sizeof_wchar_t" != "0"; then
- WCHAR_LINK=
+ cat >> confdefs.h <<\EOF
+#define wxUSE_WCHAR_T 1
+EOF
+
+
+ WCSLEN_FOUND=0
+ WCHAR_LINK=
for ac_func in wcslen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15776: checking for $ac_func" >&5
+echo "configure:16971: 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 15781 "configure"
+#line 16976 "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:15804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16999: \"$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
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
-
- cat >> confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
-EOF
-
- WCHAR_OK=1
-
+ WCSLEN_FOUND=1
else
echo "$ac_t""no" 1>&6
fi
done
- if test "$WCHAR_OK" = 0; then
+ if test "$WCSLEN_FOUND" = 0; then
if test "$TOOLKIT" = "MSW"; then
echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
-echo "configure:15838: checking for wcslen in -lmsvcrt" >&5
+echo "configure:17027: 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 15846 "configure"
+#line 17035 "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:15857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17046: \"$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
-
- cat >> confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
-EOF
-
- WCHAR_OK=1
-
+ WCHAR_OK=1
else
echo "$ac_t""no" 1>&6
fi
else
echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:15885: checking for wcslen in -lw" >&5
+echo "configure:17068: 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 15893 "configure"
+#line 17076 "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:15904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17087: \"$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
- cat >> confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
-EOF
-
WCHAR_LINK=" -lw"
- WCHAR_OK=1
+ WCSLEN_FOUND=1
else
echo "$ac_t""no" 1>&6
fi
fi
-fi
-if test "$WCHAR_OK" = 1; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_WCHAR_T 1
+ if test "$WCSLEN_FOUND" = 1; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_WCSLEN 1
EOF
+ fi
for ac_func in wcsrtombs
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15944: checking for $ac_func" >&5
+echo "configure:17123: 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 15949 "configure"
+#line 17128 "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:15972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17151: \"$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
else
- if test "$USE_DARWIN" = 1; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_WCHAR_T 1
-EOF
-
- else
- echo "configure: warning: Wide character support is unavailable" 1>&2
- fi
+ echo "configure: warning: Wide character support is unavailable" 1>&2
fi
-echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:16008: checking for vprintf" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+for ac_func in vsnprintf
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17191: 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 16013 "configure"
+#line 17196 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char vprintf(); below. */
+ which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char vprintf();
+char $ac_func();
int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_vprintf) || defined (__stub___vprintf)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-vprintf();
+$ac_func();
#endif
; return 0; }
EOF
-if { (eval echo configure:16036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_func_vprintf=yes"
+ eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_func_vprintf=no"
+ eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
-if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_VPRINTF 1
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
EOF
-
+
else
echo "$ac_t""no" 1>&6
fi
+done
+
-if test "$ac_cv_func_vprintf" != yes; then
-echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:16060: checking for _doprnt" >&5
-if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+if test "$ac_cv_func_vsnprintf" = "yes"; then
+ echo $ac_n "checking for vsnprintf declaration""... $ac_c" 1>&6
+echo "configure:17249: checking for vsnprintf declaration" >&5
+if eval "test \"`echo '$''{'wx_cv_func_vsnprintf_decl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- cat > conftest.$ac_ext <<EOF
-#line 16065 "configure"
+
+ cat > conftest.$ac_ext <<EOF
+#line 17255 "configure"
#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char _doprnt(); 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 _doprnt();
+ #include <stdio.h>
+ #include <stdarg.h>
+
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__doprnt) || defined (__stub____doprnt)
-choke me
-#else
-_doprnt();
-#endif
-
+ char *buf;
+ va_list ap;
+ vsnprintf(buf, 10u, "%s", ap);
+
; return 0; }
EOF
-if { (eval echo configure:16088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_func__doprnt=yes"
+ wx_cv_func_vsnprintf_decl=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_func__doprnt=no"
+ wx_cv_func_vsnprintf_decl=no
+
fi
rm -f conftest*
+
+
fi
-if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_DOPRNT 1
-EOF
+echo "$ac_t""$wx_cv_func_vsnprintf_decl" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
+ if test "$wx_cv_func_vsnprintf_decl" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_VSNPRINTF_DECL 1
+EOF
+ fi
fi
-
-
-
-
-
-echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
-echo "configure:16118: checking for vsnprintf" >&5
-if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then
+if test "$wxUSE_UNICODE" = yes; then
+ for ac_func in fputwc wprintf vswprintf
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17298: 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 16124 "configure"
-#include "confdefs.h"
-
- #include <stdio.h>
- #include <stdarg.h>
-
-int main() {
-
- int wx_test_vsnprintf(const char *, ...);
-
- wx_test_vsnprintf("%s");
- return 0;
- }
-
- int wx_test_vsnprintf(const char *fmt, ...)
- {
- char *s;
-
- va_list argp;
- va_start(argp, fmt);
- vsnprintf(s, 42, fmt, argp);
- va_end(argp);
-
-; return 0; }
-EOF
-if { (eval echo configure:16149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
-
- wx_cv_func_vsnprintf=yes
-
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
-
- cat > conftest.$ac_ext <<EOF
-#line 16160 "configure"
+#line 17303 "configure"
#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
- #include <stdio.h>
- #include <stdarg.h>
-
int main() {
- int wx_test_vsnprintf(const char *, ...);
-
- wx_test_vsnprintf("%s");
- return 0;
- }
-
- int wx_test_vsnprintf(const char *fmt, ...)
- {
- char *s;
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
- va_list argp;
- va_start(argp, fmt);
- _vsnprintf(s, 42, fmt, argp);
- va_end(argp);
-
; return 0; }
EOF
-if { (eval echo configure:16185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
-
- wx_cv_func_vsnprintf=yes
-
+ eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
-
- wx_cv_func_vsnprintf=no
-
-fi
-rm -f conftest*
-
+ eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
-
fi
-echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6
-
-if test "$wx_cv_func_vsnprintf" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_VSNPRINTF 1
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
EOF
-
+
else
- echo "configure: warning: unsafe function vsprintf will be used instead of vsnprintf" 1>&2
+ echo "$ac_t""no" 1>&6
fi
+done
-echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
-echo "configure:16217: 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 16223 "configure"
-#include "confdefs.h"
-
- #include <stdio.h>
- #include <stdarg.h>
-
-int main() {
-
- int wx_test_vsscanf(const char *, ...);
-
- wx_test_vsscanf("%d");
- return 0;
- }
- int wx_test_vsscanf(const char *fmt, ...)
- {
- va_list argp;
- va_start(argp, fmt);
- vsscanf("42", fmt, argp);
- va_end(argp);
-
+ echo $ac_n "checking for _vsnwprintf""... $ac_c" 1>&6
+echo "configure:17355: checking for _vsnwprintf" >&5
+ cat > conftest.$ac_ext <<EOF
+#line 17357 "configure"
+#include "confdefs.h"
+#include <wchar.h>
+int main() {
+&_vsnwprintf;
; return 0; }
EOF
-if { (eval echo configure:16246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
-
- wx_cv_func_vsscanf=yes
-
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE__VSNWPRINTF 1
+EOF
+
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
-
- wx_cv_func_vsscanf=no
-
+ echo "$ac_t""no" 1>&6
fi
-rm -f conftest*
-
+rm -f conftest*;
fi
-echo "$ac_t""$wx_cv_func_vsscanf" 1>&6
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+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_func_vsscanf" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_VSSCANF 1
-EOF
-fi
if test "$TOOLKIT" != "MSW"; then
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:16298: checking for iconv" >&5
+echo "configure:17416: 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 16306 "configure"
+#line 17424 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <iconv.h>
iconv_close(cd);
; return 0; }
EOF
-if { (eval echo configure:16316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_func_iconv=yes
else
am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv"
cat > conftest.$ac_ext <<EOF
-#line 16328 "configure"
+#line 17446 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <iconv.h>
iconv_close(cd);
; return 0; }
EOF
-if { (eval echo configure:16338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_lib_iconv=yes
am_cv_func_iconv=yes
EOF
echo $ac_n "checking if iconv needs const""... $ac_c" 1>&6
-echo "configure:16359: checking if iconv needs const" >&5
+echo "configure:17477: 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 16364 "configure"
+#line 17482 "configure"
#include "confdefs.h"
#include <stdlib.h>
; return 0; }
EOF
-if { (eval echo configure:16383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_iconv_const="no"
else
for ac_func in sigaction
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16428: checking for $ac_func" >&5
+echo "configure:17546: 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 16433 "configure"
+#line 17551 "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:16456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17574: \"$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:16497: checking for sa_handler type" >&5
+echo "configure:17615: 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 16503 "configure"
+#line 17621 "configure"
#include "confdefs.h"
#include <signal.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:16515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_sa_handler=int
fi
fi
-for ac_func in vfork
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16552: 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 16557 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:16580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-
for ac_func in mkstemp mktemp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16608: checking for $ac_func" >&5
+echo "configure:17670: 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 16613 "configure"
+#line 17675 "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:16636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17698: \"$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:16662: checking for statfs" >&5
+echo "configure:17724: 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 16667 "configure"
+#line 17729 "configure"
#include "confdefs.h"
#if defined(__BSD__)
; return 0; }
EOF
-if { (eval echo configure:16688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_statfs=yes
echo "$ac_t""$wx_cv_func_statfs" 1>&6
if test "$wx_cv_func_statfs" = "yes"; then
+ wx_cv_type_statvfs_t="struct statfs"
cat >> confdefs.h <<\EOF
#define HAVE_STATFS 1
EOF
else
echo $ac_n "checking for statvfs""... $ac_c" 1>&6
-echo "configure:16715: checking for statvfs" >&5
+echo "configure:17778: 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 16720 "configure"
+#line 17783 "configure"
#include "confdefs.h"
- #include <sys/statvfs.h>
+ #include <stddef.h>
+ #include <sys/statvfs.h>
int main() {
- long l;
- struct statvfs fs;
- statvfs("/", &fs);
- l = fs.f_bsize;
- l += fs.f_blocks;
- l += fs.f_bavail;
+ statvfs("/", NULL);
; return 0; }
EOF
-if { (eval echo configure:16736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
-
- wx_cv_func_statvfs=yes
-
+ wx_cv_func_statvfs=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
-
- wx_cv_func_statvfs=no
-
+ wx_cv_func_statvfs=no
fi
rm -f conftest*
echo "$ac_t""$wx_cv_func_statvfs" 1>&6
if test "$wx_cv_func_statvfs" = "yes"; then
- cat >> confdefs.h <<\EOF
+
+ ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+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 for statvfs argument type""... $ac_c" 1>&6
+echo "configure:17822: checking for statvfs argument type" >&5
+if eval "test \"`echo '$''{'wx_cv_type_statvfs_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 17827 "configure"
+#include "confdefs.h"
+
+ #include <sys/statvfs.h>
+
+int main() {
+
+ long l;
+ statvfs_t fs;
+ statvfs("/", &fs);
+ l = fs.f_bsize;
+ l += fs.f_blocks;
+ l += fs.f_bavail;
+
+; return 0; }
+EOF
+if { (eval echo configure:17843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_type_statvfs_t=statvfs_t
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ cat > conftest.$ac_ext <<EOF
+#line 17852 "configure"
+#include "confdefs.h"
+
+ #include <sys/statvfs.h>
+
+int main() {
+
+ long l;
+ struct statvfs fs;
+ statvfs("/", &fs);
+ l = fs.f_bsize;
+ l += fs.f_blocks;
+ l += fs.f_bavail;
+
+; return 0; }
+EOF
+if { (eval echo configure:17868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_type_statvfs_t="struct statvfs"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ wx_cv_type_statvfs_t="unknown"
+
+fi
+rm -f conftest*
+
+
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$wx_cv_type_statvfs_t" 1>&6
+
+ ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+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_type_statvfs_t" != "unknown"; then
+ cat >> confdefs.h <<\EOF
#define HAVE_STATVFS 1
EOF
+ fi
else
- echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2
+ wx_cv_type_statvfs_t="unknown"
fi
fi
+if test "$wx_cv_type_statvfs_t" != "unknown"; then
+ cat >> confdefs.h <<EOF
+#define WX_STATFS_T $wx_cv_type_statvfs_t
+EOF
+
+else
+ echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2
+fi
+
if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
for ac_func in fcntl flock
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16770: checking for $ac_func" >&5
+echo "configure:17920: 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 16775 "configure"
+#line 17925 "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:16798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17948: \"$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:16832: checking for $ac_func" >&5
+echo "configure:17982: 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 16837 "configure"
+#line 17987 "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:16860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18010: \"$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:16888: checking for $ac_func" >&5
+echo "configure:18038: 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 16893 "configure"
+#line 18043 "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:16916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18066: \"$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:16963: checking for $ac_func" >&5
+echo "configure:18113: 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 16968 "configure"
+#line 18118 "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:16991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18141: \"$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:17016: checking for nanosleep in -lposix4" >&5
+echo "configure:18166: 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 17024 "configure"
+#line 18174 "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:17035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18185: \"$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:17063: checking for $ac_func" >&5
+echo "configure:18213: 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 17068 "configure"
+#line 18218 "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:17091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18241: \"$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:17134: checking for $ac_func" >&5
+echo "configure:18284: 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 17139 "configure"
+#line 18289 "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:17162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18312: \"$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:17199: checking for $ac_func" >&5
+echo "configure:18349: 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 17204 "configure"
+#line 18354 "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:17230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18380: \"$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:17267: checking for $ac_func" >&5
+echo "configure:18417: 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 17272 "configure"
+#line 18422 "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:17295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18445: \"$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:17320: checking for inet_addr in -lnsl" >&5
+echo "configure:18470: 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 17328 "configure"
+#line 18478 "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:17339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18489: \"$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:17358: checking for inet_addr in -lresolv" >&5
+echo "configure:18508: 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 17366 "configure"
+#line 18516 "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:17377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18527: \"$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 -lsocket""... $ac_c" 1>&6
-echo "configure:17396: checking for inet_addr in -lsocket" >&5
+echo "configure:18546: 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
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 17404 "configure"
+#line 18554 "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:17415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in inet_aton
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17451: checking for $ac_func" >&5
+echo "configure:18601: 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 17456 "configure"
+#line 18606 "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:17479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18629: \"$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:17504: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:18654: 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 17512 "configure"
+#line 18662 "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:17523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18673: \"$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
THREADS_CFLAGS=
if test "$wxUSE_THREADS" = "yes" ; then
- if test "$wxUSE_WINE" = 1 ; then
- echo "configure: warning: Threads are not supported under WINE... disabled" 1>&2
- wxUSE_THREADS="no"
- elif test "$USE_BEOS" = 1; then
+ if test "$USE_BEOS" = 1; then
echo "configure: warning: BeOS threads are not yet supported... disabled" 1>&2
wxUSE_THREADS="no"
fi
*-*-aix*)
THREAD_OPTS="pthreads"
;;
+ *-hp-hpux* )
+ if test "x$GCC" != "xyes"; then
+ THREAD_OPTS=""
+ fi
+ ;;
+
+ *-*-irix* )
+ if test "x$GCC" = "xyes"; then
+ THREAD_OPTS=""
+ fi
+ ;;
+
+ *-*-*UnixWare*)
+ if test "x$GCC" != "xyes"; then
+ THREAD_OPTS="-Ethread"
+ fi
+ ;;
esac
THREAD_OPTS="$THREAD_OPTS pthread none"
case $flag in
none)
echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6
-echo "configure:17658: checking whether pthreads work without any flags" >&5
+echo "configure:18822: checking whether pthreads work without any flags" >&5
;;
-*)
echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6
-echo "configure:17663: checking whether pthreads work with $flag" >&5
+echo "configure:18827: checking whether pthreads work with $flag" >&5
THREADS_CFLAGS="$flag"
;;
*)
echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6
-echo "configure:17669: checking for the pthreads library -l$flag" >&5
+echo "configure:18833: checking for the pthreads library -l$flag" >&5
THREADS_LINK="-l$flag"
;;
esac
CFLAGS="$THREADS_CFLAGS $CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 17680 "configure"
+#line 18844 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
pthread_create(0,0,0,0);
; return 0; }
EOF
-if { (eval echo configure:17687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
THREADS_OK=yes
else
wxUSE_THREADS=no
echo "configure: warning: No thread support on this system... disabled" 1>&2
else
- LIBS="$THREADS_LINK $THREADS_CFLAGS $LIBS"
+ LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
+ LIBS="$THREADS_LINK $LIBS"
echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6
-echo "configure:17715: checking if more special flags are required for pthreads" >&5
+echo "configure:18880: checking if more special flags are required for pthreads" >&5
flag=no
case "${host}" in
- *-aix* | *-freebsd*)
+ *-aix*)
+ LDFLAGS="-L/usr/lib/threads $LDFLAGS"
+ flag="-D_THREAD_SAFE"
+ ;;
+ *-freebsd*)
flag="-D_THREAD_SAFE"
;;
+ *-hp-hpux* )
+ flag="-D_REENTRANT"
+ if test "x$GCC" != "xyes"; then
+ flag="$flag -D_RWSTD_MULTI_THREAD"
+ fi
+ ;;
*solaris* | alpha*-osf*)
flag="-D_REENTRANT"
;;
for ac_func in thr_setconcurrency
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17741: checking for $ac_func" >&5
+echo "configure:18916: 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 17746 "configure"
+#line 18921 "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:17769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:17798: checking for $ac_hdr" >&5
+echo "configure:18973: 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 17803 "configure"
+#line 18978 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:18983: \"$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_sched_h" = "yes"; then
echo $ac_n "checking for sched_yield""... $ac_c" 1>&6
-echo "configure:17836: checking for sched_yield" >&5
+echo "configure:19011: 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
cat > conftest.$ac_ext <<EOF
-#line 17841 "configure"
+#line 19016 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sched_yield(); below. */
; return 0; }
EOF
-if { (eval echo configure:17864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_sched_yield=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
-echo "configure:17886: checking for sched_yield in -lposix4" >&5
+echo "configure:19061: 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 17894 "configure"
+#line 19069 "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:17905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
HAVE_PRIOR_FUNCS=0
echo $ac_n "checking for pthread_attr_getschedpolicy""... $ac_c" 1>&6
-echo "configure:17938: checking for pthread_attr_getschedpolicy" >&5
+echo "configure:19113: 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
cat > conftest.$ac_ext <<EOF
-#line 17943 "configure"
+#line 19118 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_attr_getschedpolicy(); below. */
; return 0; }
EOF
-if { (eval echo configure:17966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pthread_attr_getschedpolicy=yes"
else
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""... $ac_c" 1>&6
-echo "configure:17981: checking for pthread_attr_setschedparam" >&5
+echo "configure:19156: 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
cat > conftest.$ac_ext <<EOF
-#line 17986 "configure"
+#line 19161 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_attr_setschedparam(); below. */
; return 0; }
EOF
-if { (eval echo configure:18009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pthread_attr_setschedparam=yes"
else
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""... $ac_c" 1>&6
-echo "configure:18024: checking for sched_get_priority_max" >&5
+echo "configure:19199: 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
cat > conftest.$ac_ext <<EOF
-#line 18029 "configure"
+#line 19204 "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. */
+/* System header to define __stub macros and hopefully few prototypes,
+ 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
; return 0; }
EOF
-if { (eval echo configure:18054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_sched_get_priority_max=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
-echo "configure:18072: checking for sched_get_priority_max in -lposix4" >&5
+echo "configure:19245: 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 18080 "configure"
+#line 19253 "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:18091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19264: \"$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
fi
echo $ac_n "checking for pthread_cancel""... $ac_c" 1>&6
-echo "configure:18136: checking for pthread_cancel" >&5
+echo "configure:19311: 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
cat > conftest.$ac_ext <<EOF
-#line 18141 "configure"
+#line 19316 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pthread_cancel(); below. */
; return 0; }
EOF
-if { (eval echo configure:18164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pthread_cancel=yes"
else
echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:18189: checking for pthread_cleanup_push/pop" >&5
+echo "configure:19364: 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 18195 "configure"
+#line 19370 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:18205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_pthread_cleanup_push=yes
echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
-echo "configure:18233: checking for pthread_mutexattr_t" >&5
+echo "configure:19408: 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 18239 "configure"
+#line 19414 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:18249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19424: \"$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:18276: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+echo "configure:19451: 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 18282 "configure"
+#line 19457 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:18291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_pthread_rec_mutex_init=yes
fi
fi
+else
+ if test "$wxUSE_THREADS" = "yes" ; then
+ case "${host}" in
+ *-*-mingw32* )
+ echo $ac_n "checking if compiler supports -mthreads""... $ac_c" 1>&6
+echo "configure:19501: checking if compiler supports -mthreads" >&5
+if eval "test \"`echo '$''{'wx_cv_cflags_mthread'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ CFLAGS_OLD="$CFLAGS"
+ CFLAGS="$CFLAGS -mthreads"
+ cat > conftest.$ac_ext <<EOF
+#line 19509 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:19516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_cflags_mthread=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ wx_cv_cflags_mthread=no
+
+fi
+rm -f conftest*
+
+
+fi
+
+echo "$ac_t""$wx_cv_cflags_mthread" 1>&6
+
+ if test "$wx_cv_cflags_mthread" = "yes"; then
+ CXXFLAGS="$CXXFLAGS -mthreads"
+ TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -mthreads"
+ LDFLAGS="$LDFLAGS -mthreads"
+ else
+ CFLAGS="$CFLAGS_OLD"
+ fi
+ ;;
+ esac
+ fi
fi
if test "$wxUSE_THREADS" = "yes"; then
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:18333: checking if -D_REENTRANT is needed" >&5
+echo "configure:19555: 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
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
fi
- case "${host}" in
+ case "${host}" in
powerpc*-*-aix* )
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -mminimal-toc"
;;
+ *-hppa* )
+ CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections"
+ ;;
esac
fi
+OPTIMISE=
if test "$wxUSE_OPTIMISE" = "no" ; then
- OPTIMISE=
+ if test "$GCC" = yes ; then
+ OPTIMISE="-O0"
+ fi
else
if test "$GCC" = yes ; then
OPTIMISE="-O2"
- case "${host}" in
+
+ case "${host}" in
i586-*-*|i686-*-* )
OPTIMISE="${OPTIMISE} "
;;
fi
fi
+
if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
cat >> confdefs.h <<\EOF
#define WXWIN_COMPATIBILITY_2 1
WXWIN_COMPATIBILITY_2_2="yes"
fi
-if test "x$WXWIN_COMPATIBILITY_2_2" != "xno"; then
+if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
cat >> confdefs.h <<\EOF
#define WXWIN_COMPATIBILITY_2_2 1
EOF
+
+ WXWIN_COMPATIBILITY_2_4="yes"
+fi
+
+if test "x$WXWIN_COMPATIBILITY_2_4" != "xno"; then
+ cat >> confdefs.h <<\EOF
+#define WXWIN_COMPATIBILITY_2_4 1
+EOF
+
fi
fi
-if test "$wxUSE_TIMEDATE" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_TIMEDATE 1
-EOF
-
-fi
-
if test "$wxUSE_FILE" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_FILE 1
for ac_func in strptime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18718: checking for $ac_func" >&5
+echo "configure:19950: 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 18723 "configure"
+#line 19955 "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:18746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19978: \"$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:18772: checking for timezone variable in <time.h>" >&5
+echo "configure:20004: 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 18778 "configure"
+#line 20010 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:18790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20022: \"$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 18801 "configure"
+#line 20033 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:18813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20045: \"$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 18824 "configure"
+#line 20056 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:18836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20068: \"$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:18877: checking for $ac_func" >&5
+echo "configure:20109: 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 18882 "configure"
+#line 20114 "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:18905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20137: \"$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:18932: checking for tm_gmtoff in struct tm" >&5
+echo "configure:20164: 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 18938 "configure"
+#line 20170 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:18950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20182: \"$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:18979: checking for $ac_func" >&5
+echo "configure:20211: 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 18984 "configure"
+#line 20216 "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:19007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20239: \"$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:19034: checking whether gettimeofday takes two arguments" >&5
+echo "configure:20266: 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 19049 "configure"
+#line 20281 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:19062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20294: \"$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 19070 "configure"
+#line 20302 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:19083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_gettimeofday_has_2_args=no
else
fi
fi
- cat >> confdefs.h <<\EOF
-#define wxUSE_TIMEDATE 1
-EOF
-
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
fi
if test "$wxUSE_SOCKETS" = "yes"; then
if test "$TOOLKIT" != "MSW"; then
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:19138: checking for socket" >&5
+echo "configure:20366: 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 19143 "configure"
+#line 20371 "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:19166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20394: \"$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:19184: checking for socket in -lsocket" >&5
+echo "configure:20412: 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 19192 "configure"
+#line 20420 "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:19203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$wxUSE_SOCKETS" = "yes" ; then
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:19239: checking what is the type of the third argument of getsockname" >&5
+echo "configure:20467: 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 19254 "configure"
+#line 20482 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:19267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20495: \"$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 19275 "configure"
+#line 20503 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:19288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20516: \"$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 19296 "configure"
+#line 20524 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:19309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=int
else
if test "$wxUSE_GUI" = "yes"; then
- if test "$TOOLKIT" = "MAC"; then
+ if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
echo "configure: warning: Joystick not yet supported under Mac OS X... disabled" 1>&2
wxUSE_JOYSTICK=no
fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:19381: checking for $ac_hdr" >&5
+echo "configure:20609: 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 19386 "configure"
+#line 20614 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:19391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:20619: \"$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:19445: checking for $ac_func" >&5
+echo "configure:20673: 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 19450 "configure"
+#line 20678 "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:19473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20701: \"$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:19501: checking for dlopen in -ldl" >&5
+echo "configure:20729: 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 19509 "configure"
+#line 20737 "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:19520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20748: \"$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:19549: checking for $ac_func" >&5
+echo "configure:20777: 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 19554 "configure"
+#line 20782 "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:19577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20805: \"$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:19605: checking for dld in -lshl_load" >&5
+echo "configure:20833: 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 19613 "configure"
+#line 20841 "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:19624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20852: \"$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:19663: checking for $ac_func" >&5
+echo "configure:20891: 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 19668 "configure"
+#line 20896 "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:19691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20919: \"$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:19716: checking for dlerror in -ldl" >&5
+echo "configure:20944: 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 19724 "configure"
+#line 20952 "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:19735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20963: \"$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_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
echo $ac_n "checking for main in -lunicows""... $ac_c" 1>&6
-echo "configure:19810: checking for main in -lunicows" >&5
+echo "configure:21038: 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
ac_save_LIBS="$LIBS"
LIBS="-lunicows $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 19818 "configure"
+#line 21046 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:19825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:21053: \"$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
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
fi
-if test "$wxUSE_PROLOGIO" = "yes" ; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_PROLOGIO 1
-EOF
-
-fi
-if test "$wxUSE_RESOURCES" = "yes" ; then
- 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"
- fi
-fi
if test "$wxUSE_X_RESOURCES" = "yes"; then
cat >> confdefs.h <<\EOF
if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
-o "$wxUSE_CLIPBOARD" = "yes" \
+ -o "$wxUSE_OLE" = "yes" \
-o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
for ac_hdr in ole2.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:20002: checking for $ac_hdr" >&5
+echo "configure:21214: 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 20007 "configure"
+#line 21219 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:20012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:21224: \"$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_ole2_h" = "yes" ; then
if test "$GCC" = yes ; then
+
+ ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+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 g++ requires -fvtable-thunks""... $ac_c" 1>&6
+echo "configure:21263: checking if g++ requires -fvtable-thunks" >&5
+ cat > conftest.$ac_ext <<EOF
+#line 21265 "configure"
+#include "confdefs.h"
+#include <windows.h>
+ #include <ole2.h>
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:21273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ echo "$ac_t""no" 1>&6
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ echo "$ac_t""yes" 1>&6
+ CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
+fi
+rm -f conftest*
+ ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
- CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
cat >> confdefs.h <<\EOF
#define wxUSE_OLE 1
wxUSE_CLIPBOARD=no
wxUSE_DRAG_AND_DROP=no
wxUSE_DATAOBJ=no
+ wxUSE_OLE=no
fi
if test "$wxUSE_METAFILE" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
fi
-if test "$wxUSE_GAUGE" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_GAUGE 1
+if test "$wxUSE_DISPLAY" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_DISPLAY 1
EOF
- USES_CONTROLS=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
fi
-if test "$wxUSE_NEW_GRID" = "yes"; then
- wxUSE_GRID="yes"
+if test "$wxUSE_GAUGE" = "yes"; then
cat >> confdefs.h <<\EOF
-#define wxUSE_NEW_GRID 1
+#define wxUSE_GAUGE 1
EOF
USES_CONTROLS=1
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
fi
if test "$wxUSE_GRID" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
fi
-if test "$wxUSE_PROPSHEET" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_PROPSHEET 1
-EOF
-
- USES_CONTROLS=1
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
-fi
if test "$wxUSE_RADIOBOX" = "yes"; then
cat >> confdefs.h <<\EOF
fi
if test "$wxUSE_STATLINE" = "yes"; then
- if test "$wxUSE_WINE" = 1 ; then
- echo "configure: warning: wxStaticLine is not supported under WINE" 1>&2
- else
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define wxUSE_STATLINE 1
EOF
- USES_CONTROLS=1
- fi
+ USES_CONTROLS=1
fi
if test "$wxUSE_STATUSBAR" = "yes"; then
fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
echo "configure: warning: Toggle button not yet supported under Mac OS X... disabled" 1>&2
wxUSE_TOGGLEBTN=no
fi
if test "$wxUSE_MOTIF" = 1; then
echo "configure: warning: wxTooltip not supported yet under Motif... disabled" 1>&2
else
- if test "$wxUSE_WINE" = 1; then
- echo "configure: warning: wxTooltip not supported under WINE... disabled" 1>&2
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ echo "configure: warning: wxTooltip not supported yet in wxUniversal... disabled" 1>&2
else
- if test "$wxUSE_UNIVERSAL" = "yes"; then
- echo "configure: warning: wxTooltip not supported yet in wxUniversal... disabled" 1>&2
- else
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define wxUSE_TOOLTIPS 1
EOF
- fi
fi
fi
fi
fi
if test "$wxUSE_POPUPWIN" = "yes"; then
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
echo "configure: warning: Popup window not yet supported under Mac OS X... disabled" 1>&2
else
if test "$wxUSE_MOTIF" = 1; then
fi
-if test "$wxUSE_TREELAYOUT" = "yes"; then
+
+if test "$wxUSE_DRAGIMAGE" = "yes"; then
cat >> confdefs.h <<\EOF
-#define wxUSE_TREELAYOUT 1
+#define wxUSE_DRAGIMAGE 1
EOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
fi
-if test "$wxUSE_DRAGIMAGE" = "yes"; then
+if test "$wxUSE_ACCESSIBILITY" = "yes"; then
cat >> confdefs.h <<\EOF
-#define wxUSE_DRAGIMAGE 1
+#define wxUSE_ACCESSIBILITY 1
EOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
fi
if test "$wxUSE_MENUS" = "yes"; then
EOF
+top_builddir=`pwd`
+
if test "$wxUSE_MAC" = 1 ; then
LDFLAGS="$LDFLAGS -framework Carbon -framework System"
fi
+if test "$wxUSE_COCOA" = 1 ; then
+ LDFLAGS="$LDFLAGS -framework Cocoa -framework System"
+fi
+
+
+LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
+
+have_cos=0
+have_floor=0
+for ac_func in cos
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22112: 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 22117 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:22140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ have_cos=1
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_func in floor
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22167: 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 22172 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:22195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ have_floor=1
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+echo $ac_n "checking if floating point functions link without -lm""... $ac_c" 1>&6
+echo "configure:22220: checking if floating point functions link without -lm" >&5
+if test "$have_cos" = 1 -a "$have_floor" = 1; then
+ echo "$ac_t""yes" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+ LIBS="$LIBS -lm"
+ # use different functions to avoid configure caching
+ have_sin=0
+ have_ceil=0
+ for ac_func in sin
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22232: 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 22237 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:22260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ have_sin=1
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+ for ac_func in ceil
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22287: 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 22292 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:22315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ have_ceil=1
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
-LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK -lm $LIBS"
+ echo $ac_n "checking if floating point functions link with -lm""... $ac_c" 1>&6
+echo "configure:22340: checking if floating point functions link with -lm" >&5
+ if test "$have_sin" = 1 -a "$have_ceil" = 1; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ # not sure we should warn the user, crash, etc.
+ fi
+fi
if test "$wxUSE_GUI" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
drawing dynamic erase event exec font image \
- minimal propsize rotate widgets"
+ minimal propsize rotate shaped widgets"
CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
else
fi
fi
-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
+CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
CFLAGS=`echo $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
CXXFLAGS=`echo $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
LIBS=`echo $LIBS | sed 's/ \+/ /g'`
+
+
+
+
+
+
+
+
+
+
+
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:21004: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:22496: 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
wx_cv_target_library=$WX_TARGET_LIBRARY
wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
+wx_cv_library_basename=${WX_LIBRARY_BASENAME}
+wx_cv_release=${WX_RELEASE}
+wx_cv_current=${WX_CURRENT}
+wx_cv_revision=${WX_REVISION}
+wx_cv_age=${WX_AGE}
+wx_cv_use_gui=${USE_GUI}
+wx_cv_use_resources=${wxUSE_RESOURCES}
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
+ wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
+ wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \
+ wx_cv_use_gui wx_cv_use_resources
subdirs="demos samples utils contrib"
trap 'rm -fr `echo "
wx-config
+ version-script
src/make.env
src/makeprog.env
src/makelib.env
s%@X_PRE_LIBS@%$X_PRE_LIBS%g
s%@X_LIBS@%$X_LIBS%g
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
+s%@PANGOX_CFLAGS@%$PANGOX_CFLAGS%g
+s%@PANGOX_LIBS@%$PANGOX_LIBS%g
+s%@PANGOXFT_CFLAGS@%$PANGOXFT_CFLAGS%g
+s%@PANGOXFT_LIBS@%$PANGOXFT_LIBS%g
s%@AIX_CXX_LD@%$AIX_CXX_LD%g
s%@RESCOMP@%$RESCOMP%g
s%@DEREZ@%$DEREZ%g
+s%@SETFILE@%$SETFILE%g
s%@LIBICONV@%$LIBICONV%g
s%@LEX_STEM@%$LEX_STEM%g
s%@PATH_IFS@%$PATH_IFS%g
s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER%g
s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g
s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g
+s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g
s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
s%@SONAME_FLAGS_GL@%$SONAME_FLAGS_GL%g
s%@WX_TARGET_LIBRARY_SONAME@%$WX_TARGET_LIBRARY_SONAME%g
s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g
+s%@STATIC_FLAG@%$STATIC_FLAG%g
s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
s%@USE_GUI@%$USE_GUI%g
s%@AFMINSTALL@%$AFMINSTALL%g
+s%@WIN32INSTALL@%$WIN32INSTALL%g
s%@TOOLKIT@%$TOOLKIT%g
s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g
s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g
s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g
s%@TOOLCHAIN_DLL_DEFS@%$TOOLCHAIN_DLL_DEFS%g
+s%@top_builddir@%$top_builddir%g
s%@cross_compiling@%$cross_compiling%g
s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g
s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g
s%@WXCONFIG_LIBS_STATIC_GL@%$WXCONFIG_LIBS_STATIC_GL%g
s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
s%@WXCONFIG_RPATH@%$WXCONFIG_RPATH%g
+s%@WX_LARGEFILE_FLAGS@%$WX_LARGEFILE_FLAGS%g
s%@ALL_OBJECTS@%$ALL_OBJECTS%g
s%@ALL_HEADERS@%$ALL_HEADERS%g
s%@ALL_SOURCES@%$ALL_SOURCES%g
s%@DISTDIR@%$DISTDIR%g
s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
s%@LDFLAGS_GL@%$LDFLAGS_GL%g
+s%@LDFLAGS_VERSIONING@%$LDFLAGS_VERSIONING%g
s%@LDFLAGS_EXE@%$LDFLAGS_EXE%g
s%@OPENGL_LIBS@%$OPENGL_LIBS%g
s%@DMALLOC_LIBS@%$DMALLOC_LIBS%g
s%@EXTRADEFS@%$EXTRADEFS%g
+s%@WX_VERSION_TAG@%$WX_VERSION_TAG%g
s%@RESFLAGS@%$RESFLAGS%g
s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g
s%@WX_RESOURCES_MACOSX_ASCII@%$WX_RESOURCES_MACOSX_ASCII%g
s%@WX_RESOURCES_MACOSX_DATA@%$WX_RESOURCES_MACOSX_DATA%g
s%@MACOSX_BUNDLE@%$MACOSX_BUNDLE%g
s%@LIBWXMACRES@%$LIBWXMACRES%g
-s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g
-s%@LIBWXMACRESWXCONFIG@%$LIBWXMACRESWXCONFIG%g
+s%@MACRESCOMP@%$MACRESCOMP%g
+s%@MACSETFILE@%$MACSETFILE%g
+s%@MACRESWXCONFIG@%$MACRESWXCONFIG%g
+s%@GCC@%$GCC%g
s%@DLLTOOL@%$DLLTOOL%g
s%@AS@%$AS%g
s%@NM@%$NM%g
s%@LD@%$LD%g
s%@MAKEINFO@%$MAKEINFO%g
s%@INSTALL_LIBRARY@%$INSTALL_LIBRARY%g
+s%@INSTALL_DIR@%$INSTALL_DIR%g
s%@SET_MAKE@%$SET_MAKE%g
s%@subdirs@%$subdirs%g
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"wx-config
+ version-script
src/make.env
src/makeprog.env
src/makelib.env
fi
+echo
+echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
+echo ""
+echo " Which GUI toolkit should wxWindows use? ${TOOLKIT:-base only}"
+
+echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-no}"
+echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}"
+echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
+
+echo " What level of wxWindows compatibility should be enabled?"
+echo " wxWindows 2.0 ${WXWIN_COMPATIBILITY_2:-no}"
+echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}"
+echo " wxWindows 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}"
+
+echo " Which libraries should wxWindows use?"
+echo " jpeg ${wxUSE_LIBJPEG-none}"
+echo " png ${wxUSE_LIBPNG-none}"
+echo " regex ${wxUSE_REGEX}"
+echo " tiff ${wxUSE_LIBTIFF-none}"
+echo " zlib ${wxUSE_ZLIB}"
+
+echo ""
+
projects / wxWidgets.git / blobdiff