+
+
+
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-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-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
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"
+ --enable-treelayout use wxTreeLayout class"
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
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1021: checking host system type" >&5
+echo "configure:1026: 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:1042: checking target system type" >&5
+echo "configure:1047: 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:1060: checking build system type" >&5
+echo "configure:1065: 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=4
+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
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=
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_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_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_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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-gui""... $ac_c" 1>&6
-echo "configure:1766: checking for --${enablestring:-enable}-gui" >&5
+echo "configure:1773: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-universal""... $ac_c" 1>&6
-echo "configure:1809: checking for --${enablestring:-enable}-universal" >&5
+echo "configure:1816: 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.
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-nanox""... $ac_c" 1>&6
-echo "configure:1903: checking for --${enablestring:-enable}-nanox" >&5
+echo "configure:1916: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-gtk2""... $ac_c" 1>&6
-echo "configure:1944: checking for --${enablestring:-enable}-gtk2" >&5
+echo "configure:1957: 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
echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
-echo "configure:1984: checking for --with-libpng" >&5
+echo "configure:1997: 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:2035: checking for --with-libjpeg" >&5
+echo "configure:2048: 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:2086: checking for --with-libtiff" >&5
+echo "configure:2099: 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:2137: checking for --with-opengl" >&5
+echo "configure:2150: 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:2179: checking for --with-dmalloc" >&5
+echo "configure:2192: 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:2218: checking for --with-regex" >&5
+echo "configure:2231: 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:2269: checking for --with-zlib" >&5
+echo "configure:2282: 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:2320: checking for --with-odbc" >&5
+echo "configure:2333: checking for --with-odbc" >&5
no_cache=0
# Check whether --with-odbc or --without-odbc was given.
if test "${with_odbc+set}" = set; then
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-shared""... $ac_c" 1>&6
-echo "configure:2362: checking for --${enablestring:-enable}-shared" >&5
+echo "configure:2375: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-soname""... $ac_c" 1>&6
-echo "configure:2402: checking for --${enablestring:-enable}-soname" >&5
+echo "configure:2415: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-optimise""... $ac_c" 1>&6
-echo "configure:2442: checking for --${enablestring:-enable}-optimise" >&5
+echo "configure:2455: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-debug""... $ac_c" 1>&6
-echo "configure:2482: checking for --${enablestring:-enable}-debug" >&5
+echo "configure:2495: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-precomp""... $ac_c" 1>&6
-echo "configure:2523: checking for --${enablestring:-enable}-precomp" >&5
+echo "configure:2536: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-debug_flag""... $ac_c" 1>&6
-echo "configure:2572: checking for --${enablestring:-enable}-debug_flag" >&5
+echo "configure:2585: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-debug_info""... $ac_c" 1>&6
-echo "configure:2612: checking for --${enablestring:-enable}-debug_info" >&5
+echo "configure:2625: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-debug_gdb""... $ac_c" 1>&6
-echo "configure:2652: checking for --${enablestring:-enable}-debug_gdb" >&5
+echo "configure:2665: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-debug_cntxt""... $ac_c" 1>&6
-echo "configure:2692: checking for --${enablestring:-enable}-debug_cntxt" >&5
+echo "configure:2705: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-mem_tracing""... $ac_c" 1>&6
-echo "configure:2732: checking for --${enablestring:-enable}-mem_tracing" >&5
+echo "configure:2745: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-profile""... $ac_c" 1>&6
-echo "configure:2772: checking for --${enablestring:-enable}-profile" >&5
+echo "configure:2785: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-no_rtti""... $ac_c" 1>&6
-echo "configure:2812: checking for --${enablestring:-enable}-no_rtti" >&5
+echo "configure:2825: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-no_exceptions""... $ac_c" 1>&6
-echo "configure:2852: checking for --${enablestring:-enable}-no_exceptions" >&5
+echo "configure:2865: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-permissive""... $ac_c" 1>&6
-echo "configure:2892: checking for --${enablestring:-enable}-permissive" >&5
+echo "configure:2905: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-no_deps""... $ac_c" 1>&6
-echo "configure:2932: checking for --${enablestring:-enable}-no_deps" >&5
+echo "configure:2945: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-compat20""... $ac_c" 1>&6
-echo "configure:2973: checking for --${enablestring:-enable}-compat20" >&5
+echo "configure:2986: 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
- enablestring=disable
+ enablestring=
echo $ac_n "checking for --${enablestring:-enable}-compat22""... $ac_c" 1>&6
-echo "configure:3013: checking for --${enablestring:-enable}-compat22" >&5
+echo "configure:3026: 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:3066: 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"
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-intl""... $ac_c" 1>&6
-echo "configure:3067: checking for --${enablestring:-enable}-intl" >&5
+echo "configure:3120: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-config""... $ac_c" 1>&6
-echo "configure:3107: checking for --${enablestring:-enable}-config" >&5
+echo "configure:3160: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-protocols""... $ac_c" 1>&6
-echo "configure:3148: checking for --${enablestring:-enable}-protocols" >&5
+echo "configure:3201: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-ftp""... $ac_c" 1>&6
-echo "configure:3188: checking for --${enablestring:-enable}-ftp" >&5
+echo "configure:3241: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-http""... $ac_c" 1>&6
-echo "configure:3228: checking for --${enablestring:-enable}-http" >&5
+echo "configure:3281: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-fileproto""... $ac_c" 1>&6
-echo "configure:3268: checking for --${enablestring:-enable}-fileproto" >&5
+echo "configure:3321: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-sockets""... $ac_c" 1>&6
-echo "configure:3308: checking for --${enablestring:-enable}-sockets" >&5
+echo "configure:3361: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-ole""... $ac_c" 1>&6
-echo "configure:3348: checking for --${enablestring:-enable}-ole" >&5
+echo "configure:3401: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-dataobj""... $ac_c" 1>&6
-echo "configure:3388: checking for --${enablestring:-enable}-dataobj" >&5
+echo "configure:3441: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-ipc""... $ac_c" 1>&6
-echo "configure:3429: checking for --${enablestring:-enable}-ipc" >&5
+echo "configure:3482: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-cmdline""... $ac_c" 1>&6
-echo "configure:3470: checking for --${enablestring:-enable}-cmdline" >&5
+echo "configure:3523: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-datetime""... $ac_c" 1>&6
-echo "configure:3510: checking for --${enablestring:-enable}-datetime" >&5
+echo "configure:3563: 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
- enablestring=
- echo $ac_n "checking for --${enablestring:-enable}-timedate""... $ac_c" 1>&6
-echo "configure:3550: checking for --${enablestring:-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
-
-
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-stopwatch""... $ac_c" 1>&6
-echo "configure:3590: checking for --${enablestring:-enable}-stopwatch" >&5
+echo "configure:3603: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-dialupman""... $ac_c" 1>&6
-echo "configure:3630: checking for --${enablestring:-enable}-dialupman" >&5
+echo "configure:3643: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-apple_ieee""... $ac_c" 1>&6
-echo "configure:3670: checking for --${enablestring:-enable}-apple_ieee" >&5
+echo "configure:3683: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-timer""... $ac_c" 1>&6
-echo "configure:3710: checking for --${enablestring:-enable}-timer" >&5
+echo "configure:3723: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-wave""... $ac_c" 1>&6
-echo "configure:3750: checking for --${enablestring:-enable}-wave" >&5
+echo "configure:3763: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-fraction""... $ac_c" 1>&6
-echo "configure:3790: checking for --${enablestring:-enable}-fraction" >&5
+echo "configure:3803: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-dynlib""... $ac_c" 1>&6
-echo "configure:3830: checking for --${enablestring:-enable}-dynlib" >&5
+echo "configure:3843: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-dynamicloader""... $ac_c" 1>&6
-echo "configure:3870: checking for --${enablestring:-enable}-dynamicloader" >&5
+echo "configure:3883: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-longlong""... $ac_c" 1>&6
-echo "configure:3910: checking for --${enablestring:-enable}-longlong" >&5
+echo "configure:3923: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-geometry""... $ac_c" 1>&6
-echo "configure:3950: checking for --${enablestring:-enable}-geometry" >&5
+echo "configure:3963: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-log""... $ac_c" 1>&6
-echo "configure:3990: checking for --${enablestring:-enable}-log" >&5
+echo "configure:4003: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-streams""... $ac_c" 1>&6
-echo "configure:4030: checking for --${enablestring:-enable}-streams" >&5
+echo "configure:4043: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-file""... $ac_c" 1>&6
-echo "configure:4070: checking for --${enablestring:-enable}-file" >&5
+echo "configure:4083: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-ffile""... $ac_c" 1>&6
-echo "configure:4110: checking for --${enablestring:-enable}-ffile" >&5
+echo "configure:4123: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-textbuf""... $ac_c" 1>&6
-echo "configure:4150: checking for --${enablestring:-enable}-textbuf" >&5
+echo "configure:4163: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-textfile""... $ac_c" 1>&6
-echo "configure:4190: checking for --${enablestring:-enable}-textfile" >&5
+echo "configure:4203: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-fontmap""... $ac_c" 1>&6
-echo "configure:4230: checking for --${enablestring:-enable}-fontmap" >&5
+echo "configure:4243: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-unicode""... $ac_c" 1>&6
-echo "configure:4270: checking for --${enablestring:-enable}-unicode" >&5
+echo "configure:4283: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-mslu""... $ac_c" 1>&6
-echo "configure:4310: checking for --${enablestring:-enable}-mslu" >&5
+echo "configure:4323: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-wxprintfv""... $ac_c" 1>&6
-echo "configure:4350: checking for --${enablestring:-enable}-wxprintfv" >&5
+echo "configure:4363: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-std_iostreams""... $ac_c" 1>&6
-echo "configure:4390: checking for --${enablestring:-enable}-std_iostreams" >&5
+echo "configure:4403: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-filesystem""... $ac_c" 1>&6
-echo "configure:4430: checking for --${enablestring:-enable}-filesystem" >&5
+echo "configure:4443: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-fs_inet""... $ac_c" 1>&6
-echo "configure:4470: checking for --${enablestring:-enable}-fs_inet" >&5
+echo "configure:4483: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-fs_zip""... $ac_c" 1>&6
-echo "configure:4510: checking for --${enablestring:-enable}-fs_zip" >&5
+echo "configure:4523: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-zipstream""... $ac_c" 1>&6
-echo "configure:4550: checking for --${enablestring:-enable}-zipstream" >&5
+echo "configure:4563: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-catch_segvs""... $ac_c" 1>&6
-echo "configure:4591: checking for --${enablestring:-enable}-catch_segvs" >&5
+echo "configure:4604: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-snglinst""... $ac_c" 1>&6
-echo "configure:4631: checking for --${enablestring:-enable}-snglinst" >&5
+echo "configure:4644: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-mimetype""... $ac_c" 1>&6
-echo "configure:4672: checking for --${enablestring:-enable}-mimetype" >&5
+echo "configure:4685: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-system_options""... $ac_c" 1>&6
-echo "configure:4712: checking for --${enablestring:-enable}-system_options" >&5
+echo "configure:4725: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-url""... $ac_c" 1>&6
-echo "configure:4753: checking for --${enablestring:-enable}-url" >&5
+echo "configure:4766: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-protocol""... $ac_c" 1>&6
-echo "configure:4793: checking for --${enablestring:-enable}-protocol" >&5
+echo "configure:4806: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-protocol_http""... $ac_c" 1>&6
-echo "configure:4833: checking for --${enablestring:-enable}-protocol_http" >&5
+echo "configure:4846: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-protocol_ftp""... $ac_c" 1>&6
-echo "configure:4873: checking for --${enablestring:-enable}-protocol_ftp" >&5
+echo "configure:4886: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-protocol_file""... $ac_c" 1>&6
-echo "configure:4913: checking for --${enablestring:-enable}-protocol_file" >&5
+echo "configure:4926: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-threads""... $ac_c" 1>&6
-echo "configure:4956: checking for --${enablestring:-enable}-threads" >&5
+echo "configure:4969: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-docview""... $ac_c" 1>&6
-echo "configure:5000: checking for --${enablestring:-enable}-docview" >&5
+echo "configure:5013: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-help""... $ac_c" 1>&6
-echo "configure:5040: checking for --${enablestring:-enable}-help" >&5
+echo "configure:5053: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-mshtmlhelp""... $ac_c" 1>&6
-echo "configure:5080: checking for --${enablestring:-enable}-mshtmlhelp" >&5
+echo "configure:5093: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-html""... $ac_c" 1>&6
-echo "configure:5120: checking for --${enablestring:-enable}-html" >&5
+echo "configure:5133: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-htmlhelp""... $ac_c" 1>&6
-echo "configure:5160: checking for --${enablestring:-enable}-htmlhelp" >&5
+echo "configure:5173: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-constraints""... $ac_c" 1>&6
-echo "configure:5200: checking for --${enablestring:-enable}-constraints" >&5
+echo "configure:5213: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-printarch""... $ac_c" 1>&6
-echo "configure:5240: checking for --${enablestring:-enable}-printarch" >&5
+echo "configure:5253: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-mdi""... $ac_c" 1>&6
-echo "configure:5280: checking for --${enablestring:-enable}-mdi" >&5
+echo "configure:5293: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-loggui""... $ac_c" 1>&6
-echo "configure:5320: checking for --${enablestring:-enable}-loggui" >&5
+echo "configure:5333: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-logwin""... $ac_c" 1>&6
-echo "configure:5360: checking for --${enablestring:-enable}-logwin" >&5
+echo "configure:5373: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-logdialog""... $ac_c" 1>&6
-echo "configure:5400: checking for --${enablestring:-enable}-logdialog" >&5
+echo "configure:5413: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-postscript""... $ac_c" 1>&6
-echo "configure:5441: checking for --${enablestring:-enable}-postscript" >&5
+echo "configure:5454: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-prologio""... $ac_c" 1>&6
-echo "configure:5484: checking for --${enablestring:-enable}-prologio" >&5
+echo "configure:5497: checking for --${enablestring:-enable}-prologio" >&5
no_cache=0
# Check whether --enable-prologio or --disable-prologio was given.
if test "${enable_prologio+set}" = set; then
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-resources""... $ac_c" 1>&6
-echo "configure:5524: checking for --${enablestring:-enable}-resources" >&5
+echo "configure:5537: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-xresources""... $ac_c" 1>&6
-echo "configure:5565: checking for --${enablestring:-enable}-xresources" >&5
+echo "configure:5578: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-clipboard""... $ac_c" 1>&6
-echo "configure:5607: checking for --${enablestring:-enable}-clipboard" >&5
+echo "configure:5620: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-dnd""... $ac_c" 1>&6
-echo "configure:5647: checking for --${enablestring:-enable}-dnd" >&5
+echo "configure:5660: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
-echo "configure:5687: checking for --${enablestring:-enable}-metafile" >&5
+echo "configure:5700: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-treelayout""... $ac_c" 1>&6
-echo "configure:5728: checking for --${enablestring:-enable}-treelayout" >&5
+echo "configure:5741: checking for --${enablestring:-enable}-treelayout" >&5
no_cache=0
# Check whether --enable-treelayout or --disable-treelayout was given.
if test "${enable_treelayout+set}" = set; then
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-controls""... $ac_c" 1>&6
-echo "configure:5770: checking for --${enablestring:-enable}-controls" >&5
+echo "configure:5783: 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_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_TIPWINDOW=no
fi
+## 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_TEXTDLG=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_DIRDLG=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_PROPSHEET=no
+ DEFAULT_wxUSE_SASH=no
+ DEFAULT_wxUSE_SPLITTER=no
+ DEFAULT_wxUSE_WIZARDDLG=no
+ DEFAULT_wxUSE_SPLITTER=no
+ DEFAULT_wxUSE_STARTUP_TIPS=no
+ DEFAULT_wxUSE_TREECTRL=no
+fi
+
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-accel""... $ac_c" 1>&6
-echo "configure:5891: checking for --${enablestring:-enable}-accel" >&5
+echo "configure:5936: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-button""... $ac_c" 1>&6
-echo "configure:5931: checking for --${enablestring:-enable}-button" >&5
+echo "configure:5976: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-bmpbutton""... $ac_c" 1>&6
-echo "configure:5971: checking for --${enablestring:-enable}-bmpbutton" >&5
+echo "configure:6016: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-calendar""... $ac_c" 1>&6
-echo "configure:6011: checking for --${enablestring:-enable}-calendar" >&5
+echo "configure:6056: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-caret""... $ac_c" 1>&6
-echo "configure:6051: checking for --${enablestring:-enable}-caret" >&5
+echo "configure:6096: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-checkbox""... $ac_c" 1>&6
-echo "configure:6091: checking for --${enablestring:-enable}-checkbox" >&5
+echo "configure:6136: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-checklst""... $ac_c" 1>&6
-echo "configure:6131: checking for --${enablestring:-enable}-checklst" >&5
+echo "configure:6176: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-choice""... $ac_c" 1>&6
-echo "configure:6171: checking for --${enablestring:-enable}-choice" >&5
+echo "configure:6216: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-combobox""... $ac_c" 1>&6
-echo "configure:6211: checking for --${enablestring:-enable}-combobox" >&5
+echo "configure:6256: 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
enablestring=
- echo $ac_n "checking for --${enablestring:-enable}-gauge""... $ac_c" 1>&6
-echo "configure:6251: checking for --${enablestring:-enable}-gauge" >&5
+ echo $ac_n "checking for --${enablestring:-enable}-display""... $ac_c" 1>&6
+echo "configure:6296: 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
enablestring=
- echo $ac_n "checking for --${enablestring:-enable}-grid""... $ac_c" 1>&6
-echo "configure:6291: checking for --${enablestring:-enable}-grid" >&5
+ echo $ac_n "checking for --${enablestring:-enable}-gauge""... $ac_c" 1>&6
+echo "configure:6336: 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
enablestring=
- echo $ac_n "checking for --${enablestring:-enable}-newgrid""... $ac_c" 1>&6
-echo "configure:6331: checking for --${enablestring:-enable}-newgrid" >&5
+ echo $ac_n "checking for --${enablestring:-enable}-grid""... $ac_c" 1>&6
+echo "configure:6376: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-imaglist""... $ac_c" 1>&6
-echo "configure:6371: checking for --${enablestring:-enable}-imaglist" >&5
+echo "configure:6416: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-listbox""... $ac_c" 1>&6
-echo "configure:6411: checking for --${enablestring:-enable}-listbox" >&5
+echo "configure:6456: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-listctrl""... $ac_c" 1>&6
-echo "configure:6451: checking for --${enablestring:-enable}-listctrl" >&5
+echo "configure:6496: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-notebook""... $ac_c" 1>&6
-echo "configure:6491: checking for --${enablestring:-enable}-notebook" >&5
+echo "configure:6536: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-propsheet""... $ac_c" 1>&6
-echo "configure:6531: checking for --${enablestring:-enable}-propsheet" >&5
+echo "configure:6576: checking for --${enablestring:-enable}-propsheet" >&5
no_cache=0
# Check whether --enable-propsheet or --disable-propsheet was given.
if test "${enable_propsheet+set}" = set; then
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-radiobox""... $ac_c" 1>&6
-echo "configure:6571: checking for --${enablestring:-enable}-radiobox" >&5
+echo "configure:6616: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-radiobtn""... $ac_c" 1>&6
-echo "configure:6611: checking for --${enablestring:-enable}-radiobtn" >&5
+echo "configure:6656: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-sash""... $ac_c" 1>&6
-echo "configure:6651: checking for --${enablestring:-enable}-sash" >&5
+echo "configure:6696: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-scrollbar""... $ac_c" 1>&6
-echo "configure:6691: checking for --${enablestring:-enable}-scrollbar" >&5
+echo "configure:6736: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-slider""... $ac_c" 1>&6
-echo "configure:6731: checking for --${enablestring:-enable}-slider" >&5
+echo "configure:6776: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-spinbtn""... $ac_c" 1>&6
-echo "configure:6771: checking for --${enablestring:-enable}-spinbtn" >&5
+echo "configure:6816: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-spinctrl""... $ac_c" 1>&6
-echo "configure:6811: checking for --${enablestring:-enable}-spinctrl" >&5
+echo "configure:6856: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-splitter""... $ac_c" 1>&6
-echo "configure:6851: checking for --${enablestring:-enable}-splitter" >&5
+echo "configure:6896: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-statbmp""... $ac_c" 1>&6
-echo "configure:6891: checking for --${enablestring:-enable}-statbmp" >&5
+echo "configure:6936: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-statbox""... $ac_c" 1>&6
-echo "configure:6931: checking for --${enablestring:-enable}-statbox" >&5
+echo "configure:6976: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-statline""... $ac_c" 1>&6
-echo "configure:6971: checking for --${enablestring:-enable}-statline" >&5
+echo "configure:7016: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-stattext""... $ac_c" 1>&6
-echo "configure:7011: checking for --${enablestring:-enable}-stattext" >&5
+echo "configure:7056: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-statusbar""... $ac_c" 1>&6
-echo "configure:7051: checking for --${enablestring:-enable}-statusbar" >&5
+echo "configure:7096: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-tabdialog""... $ac_c" 1>&6
-echo "configure:7091: checking for --${enablestring:-enable}-tabdialog" >&5
+echo "configure:7136: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-textctrl""... $ac_c" 1>&6
-echo "configure:7131: checking for --${enablestring:-enable}-textctrl" >&5
+echo "configure:7176: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-togglebtn""... $ac_c" 1>&6
-echo "configure:7171: checking for --${enablestring:-enable}-togglebtn" >&5
+echo "configure:7216: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-toolbar""... $ac_c" 1>&6
-echo "configure:7211: checking for --${enablestring:-enable}-toolbar" >&5
+echo "configure:7256: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-tbarnative""... $ac_c" 1>&6
-echo "configure:7251: checking for --${enablestring:-enable}-tbarnative" >&5
+echo "configure:7296: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-tbarsmpl""... $ac_c" 1>&6
-echo "configure:7291: checking for --${enablestring:-enable}-tbarsmpl" >&5
+echo "configure:7336: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-treectrl""... $ac_c" 1>&6
-echo "configure:7331: checking for --${enablestring:-enable}-treectrl" >&5
+echo "configure:7376: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-tipwindow""... $ac_c" 1>&6
-echo "configure:7371: checking for --${enablestring:-enable}-tipwindow" >&5
+echo "configure:7416: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-popupwin""... $ac_c" 1>&6
-echo "configure:7411: checking for --${enablestring:-enable}-popupwin" >&5
+echo "configure:7456: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-commondlg""... $ac_c" 1>&6
-echo "configure:7453: checking for --${enablestring:-enable}-commondlg" >&5
+echo "configure:7498: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-choicedlg""... $ac_c" 1>&6
-echo "configure:7493: checking for --${enablestring:-enable}-choicedlg" >&5
+echo "configure:7538: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-coldlg""... $ac_c" 1>&6
-echo "configure:7533: checking for --${enablestring:-enable}-coldlg" >&5
+echo "configure:7578: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-filedlg""... $ac_c" 1>&6
-echo "configure:7573: checking for --${enablestring:-enable}-filedlg" >&5
+echo "configure:7618: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-finddlg""... $ac_c" 1>&6
-echo "configure:7613: checking for --${enablestring:-enable}-finddlg" >&5
+echo "configure:7658: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-fontdlg""... $ac_c" 1>&6
-echo "configure:7653: checking for --${enablestring:-enable}-fontdlg" >&5
+echo "configure:7698: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-dirdlg""... $ac_c" 1>&6
-echo "configure:7693: checking for --${enablestring:-enable}-dirdlg" >&5
+echo "configure:7738: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-msgdlg""... $ac_c" 1>&6
-echo "configure:7733: checking for --${enablestring:-enable}-msgdlg" >&5
+echo "configure:7778: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-numberdlg""... $ac_c" 1>&6
-echo "configure:7773: checking for --${enablestring:-enable}-numberdlg" >&5
+echo "configure:7818: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-splash""... $ac_c" 1>&6
-echo "configure:7813: checking for --${enablestring:-enable}-splash" >&5
+echo "configure:7858: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-textdlg""... $ac_c" 1>&6
-echo "configure:7853: checking for --${enablestring:-enable}-textdlg" >&5
+echo "configure:7898: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-tipdlg""... $ac_c" 1>&6
-echo "configure:7893: checking for --${enablestring:-enable}-tipdlg" >&5
+echo "configure:7938: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-progressdlg""... $ac_c" 1>&6
-echo "configure:7933: checking for --${enablestring:-enable}-progressdlg" >&5
+echo "configure:7978: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-wizarddlg""... $ac_c" 1>&6
-echo "configure:7973: checking for --${enablestring:-enable}-wizarddlg" >&5
+echo "configure:8018: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-menus""... $ac_c" 1>&6
-echo "configure:8015: checking for --${enablestring:-enable}-menus" >&5
+echo "configure:8060: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-miniframe""... $ac_c" 1>&6
-echo "configure:8055: checking for --${enablestring:-enable}-miniframe" >&5
+echo "configure:8100: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-tooltips""... $ac_c" 1>&6
-echo "configure:8095: checking for --${enablestring:-enable}-tooltips" >&5
+echo "configure:8140: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-splines""... $ac_c" 1>&6
-echo "configure:8135: checking for --${enablestring:-enable}-splines" >&5
+echo "configure:8180: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-validators""... $ac_c" 1>&6
-echo "configure:8175: checking for --${enablestring:-enable}-validators" >&5
+echo "configure:8220: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-busyinfo""... $ac_c" 1>&6
-echo "configure:8215: checking for --${enablestring:-enable}-busyinfo" >&5
+echo "configure:8260: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-joystick""... $ac_c" 1>&6
-echo "configure:8255: checking for --${enablestring:-enable}-joystick" >&5
+echo "configure:8300: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
-echo "configure:8295: checking for --${enablestring:-enable}-metafile" >&5
+echo "configure:8340: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-dragimage""... $ac_c" 1>&6
-echo "configure:8335: checking for --${enablestring:-enable}-dragimage" >&5
+echo "configure:8380: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-palette""... $ac_c" 1>&6
-echo "configure:8377: checking for --${enablestring:-enable}-palette" >&5
+echo "configure:8422: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-image""... $ac_c" 1>&6
-echo "configure:8417: checking for --${enablestring:-enable}-image" >&5
+echo "configure:8462: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-gif""... $ac_c" 1>&6
-echo "configure:8457: checking for --${enablestring:-enable}-gif" >&5
+echo "configure:8502: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-pcx""... $ac_c" 1>&6
-echo "configure:8497: checking for --${enablestring:-enable}-pcx" >&5
+echo "configure:8542: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-iff""... $ac_c" 1>&6
-echo "configure:8537: checking for --${enablestring:-enable}-iff" >&5
+echo "configure:8582: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-pnm""... $ac_c" 1>&6
-echo "configure:8577: checking for --${enablestring:-enable}-pnm" >&5
+echo "configure:8622: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-xpm""... $ac_c" 1>&6
-echo "configure:8617: checking for --${enablestring:-enable}-xpm" >&5
+echo "configure:8662: 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
enablestring=
echo $ac_n "checking for --${enablestring:-enable}-ico_cur""... $ac_c" 1>&6
-echo "configure:8657: checking for --${enablestring:-enable}-ico_cur" >&5
+echo "configure:8702: 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
echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:8716: checking for toolkit" >&5
+echo "configure:8761: 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 )
;;
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:8903: 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
# 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:8933: checking for $ac_word" >&5
+echo "configure:8993: 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:8984: checking for $ac_word" >&5
+echo "configure:9044: 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:9016: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:9076: 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 9027 "configure"
+#line 9087 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:9032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9092: \"$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:9058: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:9118: 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:9063: checking whether we are using GNU C" >&5
+echo "configure:9123: 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:9072: \"$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:9132: \"$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:9091: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:9151: 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:9124: checking how to run the C preprocessor" >&5
+echo "configure:9184: 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 9139 "configure"
+#line 9199 "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:9145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9205: \"$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 9156 "configure"
+#line 9216 "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:9162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9222: \"$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 9173 "configure"
+#line 9233 "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:9179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9239: \"$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:9205: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:9265: 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 9211 "configure"
+#line 9271 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 9229 "configure"
+#line 9289 "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:9266: checking for $ac_word" >&5
+echo "configure:9326: 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:9298: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:9358: 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 9309 "configure"
+#line 9369 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:9314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9374: \"$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:9340: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:9400: 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:9345: checking whether we are using GNU C++" >&5
+echo "configure:9405: 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:9354: \"$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:9414: \"$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:9373: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:9433: 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:9416: checking for $ac_word" >&5
+echo "configure:9476: 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:9447: checking for $ac_word" >&5
+echo "configure:9507: 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:9487: checking for a BSD compatible install" >&5
+echo "configure:9547: 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:9561: checking for $ac_word" >&5
+echo "configure:9632: 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:9590: checking if make is GNU make" >&5
+echo "configure:9661: 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:9616: checking if make supports VPATH" >&5
+echo "configure:9687: 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:9663: checking for $ac_word" >&5
+echo "configure:9734: 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:9697: checking for $ac_word" >&5
+echo "configure:9768: 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:9731: checking for yywrap in -l$ac_lib" >&5
+echo "configure:9802: 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 9739 "configure"
+#line 9810 "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:9750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9821: \"$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:9774: checking whether ln -s works" >&5
+echo "configure:9845: 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
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:9800: checking for drand48 in -lcExt" >&5
+echo "configure:9871: 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
ac_save_LIBS="$LIBS"
LIBS="-lcExt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9808 "configure"
+#line 9879 "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
drand48()
; return 0; }
EOF
-if { (eval echo configure:9819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9890: \"$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
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:9851: checking for $ac_hdr" >&5
+echo "configure:9922: 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 9856 "configure"
+#line 9927 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9932: \"$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:9893: checking for $ac_hdr" >&5
+echo "configure:9964: 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 9898 "configure"
+#line 9969 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9974: \"$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:9933: checking for $ac_hdr" >&5
+echo "configure:10004: 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 9938 "configure"
+#line 10009 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10014: \"$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:9973: checking for $ac_hdr" >&5
+echo "configure:10044: 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 9978 "configure"
+#line 10049 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10054: \"$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:10013: checking for $ac_hdr" >&5
+echo "configure:10084: 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 10018 "configure"
+#line 10089 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10094: \"$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:10055: checking for $ac_hdr" >&5
+echo "configure:10126: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10060 "configure"
+#line 10131 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10097: checking for $ac_hdr" >&5
+echo "configure:10168: 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 10102 "configure"
+#line 10173 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10178: \"$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:10138: checking for $ac_func" >&5
+echo "configure:10209: 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 10143 "configure"
+#line 10214 "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:10166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10237: \"$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:10196: checking for $ac_hdr" >&5
+echo "configure:10267: 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 10201 "configure"
+#line 10272 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10277: \"$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:10239: checking for $ac_hdr" >&5
+echo "configure:10318: 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 10244 "configure"
+#line 10323 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10328: \"$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:10280: checking for working const" >&5
+echo "configure:10359: 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 10285 "configure"
+#line 10364 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:10334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10413: \"$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:10355: checking for inline" >&5
+echo "configure:10434: 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 10362 "configure"
+#line 10441 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:10369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10448: \"$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:10396: checking size of char" >&5
+echo "configure:10475: 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 10404 "configure"
+#line 10483 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10416: \"$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_char=`cat conftestval`
else
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:10436: checking size of short" >&5
+echo "configure:10514: 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 10444 "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:10456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10533: \"$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:10476: checking size of void *" >&5
+echo "configure:10553: 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 10484 "configure"
+#line 10561 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10572: \"$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:10516: checking size of int" >&5
+echo "configure:10592: 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 10524 "configure"
+#line 10600 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10611: \"$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:10556: checking size of long" >&5
+echo "configure:10631: 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 10564 "configure"
+#line 10639 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10650: \"$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:10599: checking size of long long" >&5
+echo "configure:10673: 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 10607 "configure"
+#line 10681 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10692: \"$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
;;
*-hp-hpux* )
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10641: checking size of long long" >&5
+echo "configure:10714: 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 10649 "configure"
+#line 10722 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
;;
* )
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10686: checking size of long long" >&5
+echo "configure:10758: 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 10694 "configure"
+#line 10766 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
exit(0);
}
EOF
-if { (eval echo configure:10706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10777: \"$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:10728: checking size of wchar_t" >&5
+echo "configure:10799: checking size of wchar_t" >&5
if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
else
cat > conftest.$ac_ext <<EOF
-#line 10747 "configure"
+#line 10818 "configure"
#include "confdefs.h"
/* DJGPP only has fake wchar_t: */
}
EOF
-if { (eval echo configure:10773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10844: \"$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:10805: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:10876: 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 10811 "configure"
+#line 10882 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:10822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10893: \"$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:10849: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:10920: 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 10855 "configure"
+#line 10926 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:10866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10937: \"$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:10893: checking if large file support is available" >&5
+echo "configure:10964: 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
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:10914: checking whether byte ordering is bigendian" >&5
+echo "configure:10985: 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 10921 "configure"
+#line 10992 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:10932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11003: \"$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 10936 "configure"
+#line 11007 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:10947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11018: \"$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 10967 "configure"
+#line 11038 "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:10980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11051: \"$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:11008: checking how to run the C++ preprocessor" >&5
+echo "configure:11079: 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 11021 "configure"
+#line 11092 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11097: \"$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:11070: checking for $ac_hdr" >&5
+echo "configure:11141: 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 11075 "configure"
+#line 11146 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11151: \"$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:11128: checking if C++ compiler supports bool" >&5
+echo "configure:11199: 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 11143 "configure"
+#line 11214 "configure"
#include "confdefs.h"
; return 0; }
EOF
-if { (eval echo configure:11155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11226: \"$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:11193: checking if C++ compiler supports the explicit keyword" >&5
+echo "configure:11264: 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 11208 "configure"
+#line 11279 "configure"
#include "confdefs.h"
class Foo { public: explicit Foo(int) {} };
; return 0; }
EOF
-if { (eval echo configure:11219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 11223 "configure"
+#line 11294 "configure"
#include "confdefs.h"
class Foo { public: explicit Foo(int) {} };
; return 0; }
EOF
-if { (eval echo configure:11236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11307: \"$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:11349: 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
+
+ cat > conftest.$ac_ext <<EOF
+#line 11362 "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:11369: \"$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 \
if test "$USE_LINUX" = 1; then
echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6
-echo "configure:11396: checking for glibc 2.1 or later" >&5
+echo "configure:11517: 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 11402 "configure"
+#line 11523 "configure"
#include "confdefs.h"
#include <features.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11534: \"$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:11461: checking for regex.h" >&5
+echo "configure:11582: 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 11466 "configure"
+#line 11587 "configure"
#include "confdefs.h"
#include <regex.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11592: \"$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:11490: checking for $ac_func" >&5
+echo "configure:11611: 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 11495 "configure"
+#line 11616 "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:11518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11639: \"$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:11699: 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 11708 "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:11729: \"$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:11576: checking for zlib.h" >&5
+echo "configure:11747: 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 11581 "configure"
+#line 11752 "configure"
#include "confdefs.h"
#include <zlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11757: \"$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:11603: 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:11784: 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 11611 "configure"
+#line 11792 "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:11622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11803: \"$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
- ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:11687: checking for png.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "checking for png.h > 0.90""... $ac_c" 1>&6
+echo "configure:11864: 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 11692 "configure"
+#line 11873 "configure"
#include "confdefs.h"
-#include <png.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
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+if { (eval echo configure:11889: \"$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:11907: 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 11912 "configure"
+#include "confdefs.h"
+#include <png.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11917: \"$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:11714: 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:11941: 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 11722 "configure"
+#line 11949 "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:11733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11960: \"$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
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:11796: checking for jpeglib.h" >&5
+echo "configure:12019: 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 11801 "configure"
+#line 12024 "configure"
#include "confdefs.h"
#undef HAVE_STDLIB_H
; return 0; }
EOF
-if { (eval echo configure:11813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12036: \"$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:11831: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:12054: 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 11839 "configure"
+#line 12062 "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:11850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12073: \"$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
ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:11909: checking for tiffio.h" >&5
+echo "configure:12132: 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 11914 "configure"
+#line 12137 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12142: \"$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:11936: checking for TIFFError in -ltiff" >&5
+echo "configure:12159: checking for TIFFError in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11944 "configure"
+#line 12167 "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:11955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12011: checking for $ac_hdr" >&5
+echo "configure:12234: 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 12016 "configure"
+#line 12239 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12244: \"$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:12049: checking for windows.h" >&5
+echo "configure:12272: 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 12054 "configure"
+#line 12277 "configure"
#include "confdefs.h"
#include <windows.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12282: \"$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:12085: checking if w32api has good enough MSIE support" >&5
+echo "configure:12308: 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 12091 "configure"
+#line 12314 "configure"
#include "confdefs.h"
#include <w32api.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:12107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_w32api_win32_ie=yes
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:12176: checking for GTK+ version" >&5
+echo "configure:12396: checking for GTK+ version" >&5
gtk_version_cached=1
if eval "test \"`echo '$''{'wx_cv_lib_gtk'+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:12217: checking for $ac_word" >&5
+echo "configure:12437: 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:12265: checking for GTK+ - version >= $min_gtk_version" >&5
+echo "configure:12485: 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 12300 "configure"
+#line 12520 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:12375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12595: \"$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 12409 "configure"
+#line 12629 "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:12419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12501: checking for $ac_word" >&5
+echo "configure:12721: 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:12536: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:12756: 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 12559 "configure"
+#line 12779 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:12637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12857: \"$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 12671 "configure"
+#line 12891 "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:12681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12771: checking for $ac_word" >&5
+echo "configure:12991: 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:12806: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:13026: 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 12829 "configure"
+#line 13049 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:12907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13127: \"$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 12941 "configure"
+#line 13161 "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:12951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK or finding the wrong"
# Extract the first word of "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:13034: checking for $ac_word" >&5
+echo "configure:13254: 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:13078: checking for pangoft2" >&5
+echo "configure:13298: 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:13085: checking PANGOFT2_CFLAGS" >&5
+echo "configure:13305: 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:13090: checking PANGOFT2_LIBS" >&5
+echo "configure:13310: checking PANGOFT2_LIBS" >&5
PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
echo "$ac_t""$PANGOFT2_LIBS" 1>&6
else
for ac_func in poll
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13135: checking for $ac_func" >&5
+echo "configure:13355: 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 13140 "configure"
+#line 13360 "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:13163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13383: \"$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
GUIDIST=GTK_DIST
echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:13197: checking for gdk_im_open in -lgdk" >&5
+echo "configure:13417: 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 13205 "configure"
+#line 13425 "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:13216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13436: \"$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:13243: checking for SciTech MGL library" >&5
+ echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
+echo "configure:13463: 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:13472: 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:13291: checking for MicroWindows" >&5
+echo "configure:13528: 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:13323: checking for X" >&5
+echo "configure:13560: 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 13385 "configure"
+#line 13622 "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:13390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13627: \"$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 13459 "configure"
+#line 13696 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:13466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13703: \"$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:13572: checking whether -R must be followed by a space" >&5
+echo "configure:13809: 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 13575 "configure"
+#line 13812 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:13582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13819: \"$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 13598 "configure"
+#line 13835 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:13605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13842: \"$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:13637: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:13874: 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 13645 "configure"
+#line 13882 "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:13656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13893: \"$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:13678: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:13915: 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 13686 "configure"
+#line 13923 "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:13697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13934: \"$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:13726: checking for gethostbyname" >&5
+echo "configure:13963: 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 13731 "configure"
+#line 13968 "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:13754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13991: \"$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:13775: checking for gethostbyname in -lnsl" >&5
+echo "configure:14012: 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 13783 "configure"
+#line 14020 "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:13794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14031: \"$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:13824: checking for connect" >&5
+echo "configure:14061: 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 13829 "configure"
+#line 14066 "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:13852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14089: \"$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:13873: checking for connect in -lsocket" >&5
+echo "configure:14110: 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 13881 "configure"
+#line 14118 "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:13892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14129: \"$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:13916: checking for remove" >&5
+echo "configure:14153: 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 13921 "configure"
+#line 14158 "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:13944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14181: \"$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:13965: checking for remove in -lposix" >&5
+echo "configure:14202: 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 13973 "configure"
+#line 14210 "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:13984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14221: \"$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:14008: checking for shmat" >&5
+echo "configure:14245: 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 14013 "configure"
+#line 14250 "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:14036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14273: \"$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:14057: checking for shmat in -lipc" >&5
+echo "configure:14294: 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 14065 "configure"
+#line 14302 "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:14076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14313: \"$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:14109: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:14346: 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 14117 "configure"
+#line 14354 "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:14128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14365: \"$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:14164: checking for MicroWindows/NanoX distribution" >&5
+echo "configure:14401: 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:14179: checking for Xpm library" >&5
+echo "configure:14416: checking for Xpm library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB /usr/lib;
echo "$ac_t""found at $ac_find_libraries" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14211 "configure"
+#line 14448 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
; return 0; }
EOF
-if { (eval echo configure:14223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
xpm_link=" -lXpm"
# 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:14255: checking for $ac_word" >&5
+echo "configure:14492: 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 pangox""... $ac_c" 1>&6
-echo "configure:14299: checking for pangox" >&5
+echo "configure:14536: 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:14306: checking PANGOX_CFLAGS" >&5
+echo "configure:14543: 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:14311: checking PANGOX_LIBS" >&5
+echo "configure:14548: checking PANGOX_LIBS" >&5
PANGOX_LIBS=`$PKG_CONFIG --libs "pangox"`
echo "$ac_t""$PANGOX_LIBS" 1>&6
else
# 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:14350: checking for $ac_word" >&5
+echo "configure:14587: 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:14394: checking for pangoft2" >&5
+echo "configure:14631: 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:14401: checking PANGOFT2_CFLAGS" >&5
+echo "configure:14638: 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:14406: checking PANGOFT2_LIBS" >&5
+echo "configure:14643: checking PANGOFT2_LIBS" >&5
PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
echo "$ac_t""$PANGOFT2_LIBS" 1>&6
else
# 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:14446: checking for $ac_word" >&5
+echo "configure:14683: 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 pangoxft""... $ac_c" 1>&6
-echo "configure:14490: checking for pangoxft" >&5
+echo "configure:14727: 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:14497: checking PANGOXFT_CFLAGS" >&5
+echo "configure:14734: 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:14502: checking PANGOXFT_LIBS" >&5
+echo "configure:14739: checking PANGOXFT_LIBS" >&5
PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft"`
echo "$ac_t""$PANGOXFT_LIBS" 1>&6
else
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:14554: 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 14559 "configure"
-#include "confdefs.h"
-#include <windows.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-
- { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
-
-fi
-
-
- xpm_link=
- echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:14591: checking for Xpm library" >&5
-
-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/libXpm.$ac_extension"; then
- ac_find_libraries=$ac_dir
- break 2
- fi
- done
- done
-
- if test "$ac_find_libraries" != "" ; then
- GUI_TK_LIBRARY="-L$ac_find_libraries"
- xpm_link=" -lXpm"
- cat >> confdefs.h <<\EOF
-#define wxHAVE_LIB_XPM 1
-EOF
-
- echo "$ac_t""found at $ac_find_libraries" 1>&6
- else
- echo "$ac_t""no" 1>&6
- echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
- fi
-
- mesa_link=
- echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:14619: checking for Mesa library" >&5
-
-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/libMesaGL.$ac_extension"; then
- ac_find_libraries=$ac_dir
- break 2
- fi
- done
- done
-
- if test "$ac_find_libraries" != "" ; then
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
- mesa_link=" -lMesaGL"
- echo "$ac_t""found at $ac_find_libraries" 1>&6
- else
- mesa_link=""
- echo "$ac_t""no" 1>&6
- echo "configure: warning: library will be compiled without Mesa support" 1>&2
- fi
-
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
- TOOLKIT=MSW
- GUIDIST=MSW_DIST
- TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__"
- fi
-
if test "$wxUSE_MOTIF" = 1; then
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
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:14669: checking whether -R must be followed by a space" >&5
+echo "configure:14809: 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 14672 "configure"
+#line 14812 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:14679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14819: \"$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 14695 "configure"
+#line 14835 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:14702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14842: \"$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:14734: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:14874: 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 14742 "configure"
+#line 14882 "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:14753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14893: \"$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:14775: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:14915: 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 14783 "configure"
+#line 14923 "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:14794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14934: \"$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:14823: checking for gethostbyname" >&5
+echo "configure:14963: 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 14828 "configure"
+#line 14968 "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:14851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14991: \"$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:14872: checking for gethostbyname in -lnsl" >&5
+echo "configure:15012: 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 14880 "configure"
+#line 15020 "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:14891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15031: \"$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:14921: checking for connect" >&5
+echo "configure:15061: 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 14926 "configure"
+#line 15066 "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:14949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15089: \"$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:14970: checking for connect in -lsocket" >&5
+echo "configure:15110: 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 14978 "configure"
+#line 15118 "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:14989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15129: \"$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:15013: checking for remove" >&5
+echo "configure:15153: 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 15018 "configure"
+#line 15158 "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:15041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15181: \"$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:15062: checking for remove in -lposix" >&5
+echo "configure:15202: 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 15070 "configure"
+#line 15210 "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:15081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15221: \"$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:15105: checking for shmat" >&5
+echo "configure:15245: 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 15110 "configure"
+#line 15250 "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:15133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15273: \"$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:15154: checking for shmat in -lipc" >&5
+echo "configure:15294: 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 15162 "configure"
+#line 15302 "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:15173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15313: \"$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:15206: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:15346: 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 15214 "configure"
+#line 15354 "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:15225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
COMPILED_X_PROGRAM=0
echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:15260: checking for Motif/Lesstif headers" >&5
+echo "configure:15400: checking for Motif/Lesstif headers" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE /usr/include;
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
else
cat > conftest.$ac_ext <<EOF
-#line 15289 "configure"
+#line 15429 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:15301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15441: \"$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:15322: checking for Motif/Lesstif library" >&5
+echo "configure:15462: checking for Motif/Lesstif library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB /usr/lib;
CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
cat > conftest.$ac_ext <<EOF
-#line 15353 "configure"
+#line 15493 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:15365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15505: \"$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:15389: checking for Xpm library" >&5
+echo "configure:15529: checking for Xpm library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB /usr/lib;
CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
cat > conftest.$ac_ext <<EOF
-#line 15425 "configure"
+#line 15565 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
; return 0; }
EOF
-if { (eval echo configure:15437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15577: \"$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:15464: checking if we need -lXp and/or -lSM -lICE" >&5
+echo "configure:15604: checking if we need -lXp and/or -lSM -lICE" >&5
libp_link=""
libsm_ice_link=""
libs_found=0
CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
cat > conftest.$ac_ext <<EOF
-#line 15478 "configure"
+#line 15618 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:15493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15633: \"$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:15665: checking for Motif 2" >&5
+ cat > conftest.$ac_ext <<EOF
+#line 15667 "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:15680: \"$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
fi
if test "$wxUSE_MAC" = 1; then
- CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefile -I/Developer/Headers/FlatCarbon"
+ 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 PM requires old resource format, re-enabled" 1>&2
- wxUSE_PROLOGIO="yes"
- wxUSE_RESOURCES="yes"
+ wxUSE_PROLOGIO="yes"
+ wxUSE_RESOURCES="yes"
echo "configure: warning: OS/2 threads are not yet supported... disabled" 1>&2
- wxUSE_THREADS="no"
+ 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:15641: checking for GL/gl.h" >&5
+echo "configure:15829: 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 15646 "configure"
+#line 15834 "configure"
#include "confdefs.h"
#include <GL/gl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for -lGL""... $ac_c" 1>&6
-echo "configure:15669: checking for -lGL" >&5
+echo "configure:15857: checking for -lGL" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB /usr/lib;
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6
-echo "configure:15702: checking for -lMesaGL" >&5
+echo "configure:15890: checking for -lMesaGL" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB /usr/lib;
;;
*-*-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
found_versioning=no
- case "${host}" in
- *-*-solaris2* )
- if test "x$GCC" != "xyes" ; then
- LDFLAGS_VERSIONING="-M \$(top_builddir)/version-script"
- found_versioning=yes
- fi
- ;;
- esac
-
+
if test $found_versioning = no ; then
echo $ac_n "checking if the linker accepts --version-script""... $ac_c" 1>&6
-echo "configure:15872: checking if the linker accepts --version-script" >&5
+echo "configure:16061: 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
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:15882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then
+ -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'; { (eval echo configure:16071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then
if test -s conftest.stderr ; then
wx_cv_version_script=no
else
*-*-linux* )
if test "$GCC" != "yes"; then
echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6
-echo "configure:15926: checking for Intel compiler" >&5
+echo "configure:16115: 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 15932 "configure"
+#line 16121 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:15943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_prog_icc=yes
else
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.
set dummy makeC++SharedLib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15996: checking for $ac_word" >&5
+echo "configure:16185: 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
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
;;
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
fi
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
fi
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}"
# 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:16109: checking for $ac_word" >&5
+echo "configure:16301: 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:16139: checking for $ac_word" >&5
+echo "configure:16331: 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
+ # 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:16361: 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
+
MACOSX_BUNDLE="bundle"
- LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
- LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+ 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"
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:16177: checking for ANSI C header files" >&5
+echo "configure:16400: 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 16182 "configure"
+#line 16405 "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:16190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16413: \"$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 16207 "configure"
+#line 16430 "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 16225 "configure"
+#line 16448 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 16246 "configure"
+#line 16469 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:16257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:16480: \"$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:16281: checking for mode_t" >&5
+echo "configure:16504: 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 16286 "configure"
+#line 16509 "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:16314: checking for off_t" >&5
+echo "configure:16537: 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 16319 "configure"
+#line 16542 "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:16347: checking for pid_t" >&5
+echo "configure:16570: 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 16352 "configure"
+#line 16575 "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:16380: checking for size_t" >&5
+echo "configure:16603: 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 16385 "configure"
+#line 16608 "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:16413: checking for uid_t in sys/types.h" >&5
+echo "configure:16636: 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 16418 "configure"
+#line 16641 "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:16456: checking if size_t is unsigned int" >&5
+echo "configure:16679: 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 16461 "configure"
+#line 16684 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:16474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_size_t_is_uint=no
else
else
echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
-echo "configure:16497: checking if size_t is unsigned long" >&5
+echo "configure:16720: 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 16502 "configure"
+#line 16725 "configure"
#include "confdefs.h"
#include <stddef.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:16738: \"$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:16549: checking for pw_gecos in struct passwd" >&5
+echo "configure:16772: 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 16555 "configure"
+#line 16778 "configure"
#include "confdefs.h"
#include <pwd.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:16566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_struct_pw_gecos=yes
for ac_func in wcslen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16606: checking for $ac_func" >&5
+echo "configure:16829: 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 16611 "configure"
+#line 16834 "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:16634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16857: \"$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 "$WCSLEN_FOUND" = 0; then
if test "$TOOLKIT" = "MSW"; then
echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
-echo "configure:16662: checking for wcslen in -lmsvcrt" >&5
+echo "configure:16885: 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 16670 "configure"
+#line 16893 "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:16681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16904: \"$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_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:16703: checking for wcslen in -lw" >&5
+echo "configure:16926: 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 16711 "configure"
+#line 16934 "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:16722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
for ac_func in wcsrtombs
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16758: checking for $ac_func" >&5
+echo "configure:16981: 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 16763 "configure"
+#line 16986 "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:16786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17009: \"$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 vsnprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16826: checking for $ac_func" >&5
+echo "configure:17049: 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 16831 "configure"
+#line 17054 "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:16857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17080: \"$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
+if test "$ac_cv_func_vsnprintf" = "yes"; then
+ echo $ac_n "checking for vsnprintf declaration""... $ac_c" 1>&6
+echo "configure:17107: 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 17113 "configure"
+#include "confdefs.h"
+
+ #include <stdio.h>
+ #include <stdarg.h>
+
+int main() {
+
+ char *buf;
+ va_list ap;
+ vsnprintf(buf, 10u, "%s", ap);
+
+; return 0; }
+EOF
+if { (eval echo configure:17127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_func_vsnprintf_decl=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ wx_cv_func_vsnprintf_decl=no
+
+fi
+rm -f conftest*
+
+
+fi
+
+echo "$ac_t""$wx_cv_func_vsnprintf_decl" 1>&6
+
+ if test "$wx_cv_func_vsnprintf_decl" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_VSNPRINTF_DECL 1
+EOF
+
+ fi
+fi
+
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:16886: checking for $ac_func" >&5
+echo "configure:17156: 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 16891 "configure"
+#line 17161 "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:16917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17187: \"$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
fi
done
+
echo $ac_n "checking for _vsnwprintf""... $ac_c" 1>&6
-echo "configure:16942: checking for _vsnwprintf" >&5
+echo "configure:17213: checking for _vsnwprintf" >&5
cat > conftest.$ac_ext <<EOF
-#line 16944 "configure"
+#line 17215 "configure"
#include "confdefs.h"
#include <wchar.h>
int main() {
&_vsnwprintf;
; return 0; }
EOF
-if { (eval echo configure:16951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:17003: checking for iconv" >&5
+echo "configure:17274: 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 17011 "configure"
+#line 17282 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <iconv.h>
iconv_close(cd);
; return 0; }
EOF
-if { (eval echo configure:17021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17292: \"$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 17033 "configure"
+#line 17304 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <iconv.h>
iconv_close(cd);
; return 0; }
EOF
-if { (eval echo configure:17043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17314: \"$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:17064: checking if iconv needs const" >&5
+echo "configure:17335: 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 17069 "configure"
+#line 17340 "configure"
#include "confdefs.h"
#include <stdlib.h>
; return 0; }
EOF
-if { (eval echo configure:17088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17359: \"$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:17133: checking for $ac_func" >&5
+echo "configure:17404: 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 17138 "configure"
+#line 17409 "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:17161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17432: \"$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:17202: checking for sa_handler type" >&5
+echo "configure:17473: 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 17208 "configure"
+#line 17479 "configure"
#include "confdefs.h"
#include <signal.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:17220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_sa_handler=int
for ac_func in mkstemp mktemp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17257: checking for $ac_func" >&5
+echo "configure:17528: 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 17262 "configure"
+#line 17533 "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:17285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17556: \"$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:17311: checking for statfs" >&5
+echo "configure:17582: 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 17316 "configure"
+#line 17587 "configure"
#include "confdefs.h"
#if defined(__BSD__)
; return 0; }
EOF
-if { (eval echo configure:17337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17608: \"$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:17364: checking for statvfs" >&5
+echo "configure:17636: 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 17369 "configure"
+#line 17641 "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:17385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17653: \"$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:17680: 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 17685 "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:17701: \"$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 17710 "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:17726: \"$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:17419: checking for $ac_func" >&5
+echo "configure:17778: 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 17424 "configure"
+#line 17783 "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:17447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17806: \"$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:17481: checking for $ac_func" >&5
+echo "configure:17840: 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 17486 "configure"
+#line 17845 "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:17509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17868: \"$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:17537: checking for $ac_func" >&5
+echo "configure:17896: 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 17542 "configure"
+#line 17901 "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:17565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17924: \"$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:17612: checking for $ac_func" >&5
+echo "configure:17971: 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 17617 "configure"
+#line 17976 "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:17640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17999: \"$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:17665: checking for nanosleep in -lposix4" >&5
+echo "configure:18024: 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 17673 "configure"
+#line 18032 "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:17684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18043: \"$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:17712: checking for $ac_func" >&5
+echo "configure:18071: 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 17717 "configure"
+#line 18076 "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:17740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18099: \"$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:17783: checking for $ac_func" >&5
+echo "configure:18142: 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 17788 "configure"
+#line 18147 "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:17811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18170: \"$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:17848: checking for $ac_func" >&5
+echo "configure:18207: 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 17853 "configure"
+#line 18212 "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:17879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18238: \"$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:17916: checking for $ac_func" >&5
+echo "configure:18275: 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 17921 "configure"
+#line 18280 "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:17944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18303: \"$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:17969: checking for inet_addr in -lnsl" >&5
+echo "configure:18328: 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 17977 "configure"
+#line 18336 "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:17988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18347: \"$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:18007: checking for inet_addr in -lresolv" >&5
+echo "configure:18366: 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 18015 "configure"
+#line 18374 "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:18026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18385: \"$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:18045: checking for inet_addr in -lsocket" >&5
+echo "configure:18404: 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 18053 "configure"
+#line 18412 "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:18064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18423: \"$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:18100: checking for $ac_func" >&5
+echo "configure:18459: 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 18105 "configure"
+#line 18464 "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:18128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18487: \"$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:18153: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:18512: 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 18161 "configure"
+#line 18520 "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:18172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18531: \"$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
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:18307: checking whether pthreads work without any flags" >&5
+echo "configure:18667: checking whether pthreads work without any flags" >&5
;;
-*)
echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6
-echo "configure:18312: checking whether pthreads work with $flag" >&5
+echo "configure:18672: 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:18318: checking for the pthreads library -l$flag" >&5
+echo "configure:18678: checking for the pthreads library -l$flag" >&5
THREADS_LINK="-l$flag"
;;
esac
CFLAGS="$THREADS_CFLAGS $CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 18329 "configure"
+#line 18689 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
pthread_create(0,0,0,0);
; return 0; }
EOF
-if { (eval echo configure:18336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
THREADS_OK=yes
else
LIBS="$THREADS_LINK $LIBS"
echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6
-echo "configure:18365: checking if more special flags are required for pthreads" >&5
+echo "configure:18725: checking if more special flags are required for pthreads" >&5
flag=no
case "${host}" in
*-aix*)
;;
*-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:18398: checking for $ac_func" >&5
+echo "configure:18761: 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 18403 "configure"
+#line 18766 "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:18426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18789: \"$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:18455: checking for $ac_hdr" >&5
+echo "configure:18818: 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 18460 "configure"
+#line 18823 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:18465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:18828: \"$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:18493: checking for sched_yield" >&5
+echo "configure:18856: 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 18498 "configure"
+#line 18861 "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:18521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18884: \"$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:18543: checking for sched_yield in -lposix4" >&5
+echo "configure:18906: 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 18551 "configure"
+#line 18914 "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:18562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18925: \"$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:18595: checking for pthread_attr_getschedpolicy" >&5
+echo "configure:18958: 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 18600 "configure"
+#line 18963 "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:18623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18986: \"$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:18638: checking for pthread_attr_setschedparam" >&5
+echo "configure:19001: 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 18643 "configure"
+#line 19006 "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:18666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19029: \"$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:18681: checking for sched_get_priority_max" >&5
+echo "configure:19044: 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 18686 "configure"
+#line 19049 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes
else
; return 0; }
EOF
-if { (eval echo configure:18711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19074: \"$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:18729: checking for sched_get_priority_max in -lposix4" >&5
+echo "configure:19092: 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 18737 "configure"
+#line 19100 "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:18748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
echo $ac_n "checking for pthread_cancel""... $ac_c" 1>&6
-echo "configure:18793: checking for pthread_cancel" >&5
+echo "configure:19156: 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 18798 "configure"
+#line 19161 "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:18821: \"$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_cancel=yes"
else
echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:18846: checking for pthread_cleanup_push/pop" >&5
+echo "configure:19209: 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 18852 "configure"
+#line 19215 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:18862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19225: \"$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:18890: checking for pthread_mutexattr_t" >&5
+echo "configure:19253: 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 18896 "configure"
+#line 19259 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:18906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19269: \"$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:18933: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+echo "configure:19296: 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 18939 "configure"
+#line 19302 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:18948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_pthread_rec_mutex_init=yes
case "${host}" in
*-*-mingw32* )
echo $ac_n "checking if compiler supports -mthreads""... $ac_c" 1>&6
-echo "configure:18983: checking if compiler supports -mthreads" >&5
+echo "configure:19346: 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 18991 "configure"
+#line 19354 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:18998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_cflags_mthread=yes
else
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:19037: checking if -D_REENTRANT is needed" >&5
+echo "configure:19400: 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
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:19425: checking for $ac_func" >&5
+echo "configure:19795: 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 19430 "configure"
+#line 19800 "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:19453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19823: \"$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:19479: checking for timezone variable in <time.h>" >&5
+echo "configure:19849: 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 19485 "configure"
+#line 19855 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:19497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19867: \"$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 19508 "configure"
+#line 19878 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:19520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19890: \"$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 19531 "configure"
+#line 19901 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:19543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19913: \"$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:19584: checking for $ac_func" >&5
+echo "configure:19954: 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 19589 "configure"
+#line 19959 "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:19612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19982: \"$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:19639: checking for tm_gmtoff in struct tm" >&5
+echo "configure:20009: 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 19645 "configure"
+#line 20015 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:19657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20027: \"$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:19686: checking for $ac_func" >&5
+echo "configure:20056: 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 19691 "configure"
+#line 20061 "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:19714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20084: \"$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:19741: checking whether gettimeofday takes two arguments" >&5
+echo "configure:20111: 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 19756 "configure"
+#line 20126 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:19769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20139: \"$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 19777 "configure"
+#line 20147 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:19790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20160: \"$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:19845: checking for socket" >&5
+echo "configure:20211: 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 19850 "configure"
+#line 20216 "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:19873: \"$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_socket=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:19891: checking for socket in -lsocket" >&5
+echo "configure:20257: 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 19899 "configure"
+#line 20265 "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:19910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20276: \"$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:19946: checking what is the type of the third argument of getsockname" >&5
+echo "configure:20312: 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 19961 "configure"
+#line 20327 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:19974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20340: \"$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 19982 "configure"
+#line 20348 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:19995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20361: \"$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 20003 "configure"
+#line 20369 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:20016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20382: \"$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:20088: checking for $ac_hdr" >&5
+echo "configure:20454: 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 20093 "configure"
+#line 20459 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:20098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:20464: \"$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:20152: checking for $ac_func" >&5
+echo "configure:20518: 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 20157 "configure"
+#line 20523 "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:20180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20546: \"$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:20208: checking for dlopen in -ldl" >&5
+echo "configure:20574: 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 20216 "configure"
+#line 20582 "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:20227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20593: \"$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:20256: checking for $ac_func" >&5
+echo "configure:20622: 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 20261 "configure"
+#line 20627 "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:20284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20650: \"$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:20312: checking for dld in -lshl_load" >&5
+echo "configure:20678: 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 20320 "configure"
+#line 20686 "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:20331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20697: \"$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:20370: checking for $ac_func" >&5
+echo "configure:20736: 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 20375 "configure"
+#line 20741 "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:20398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20764: \"$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:20423: checking for dlerror in -ldl" >&5
+echo "configure:20789: 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 20431 "configure"
+#line 20797 "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:20442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20808: \"$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:20517: checking for main in -lunicows" >&5
+echo "configure:20883: 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 20525 "configure"
+#line 20891 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:20532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:20714: checking for $ac_hdr" >&5
+echo "configure:21080: 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 20719 "configure"
+#line 21085 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:20724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:21090: \"$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 g++ requires -fvtable-thunks""... $ac_c" 1>&6
-echo "configure:20763: checking if g++ requires -fvtable-thunks" >&5
+echo "configure:21129: checking if g++ requires -fvtable-thunks" >&5
cat > conftest.$ac_ext <<EOF
-#line 20765 "configure"
+#line 21131 "configure"
#include "confdefs.h"
#include <windows.h>
#include <ole2.h>
; return 0; }
EOF
-if { (eval echo configure:20773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:21139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""no" 1>&6
else
fi
fi
-if test "$wxUSE_WINE" = 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:20834: 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 20839 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:20844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-
- 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:20883: checking if g++ requires -fvtable-thunks" >&5
- cat > conftest.$ac_ext <<EOF
-#line 20885 "configure"
-#include "confdefs.h"
-#include <windows.h>
- #include <ole2.h>
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:20893: \"$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)"
- LIBS=" -lwine_uuid$LIBS"
- cat >> confdefs.h <<\EOF
-#define wxUSE_OLE 1
-EOF
-
-
- fi
-
- cat >> confdefs.h <<\EOF
-#define wxUSE_DATAOBJ 1
-EOF
-
- else
- echo "configure: warning: Some features disabled because OLE headers not found" 1>&2
-
- wxUSE_CLIPBOARD=no
- wxUSE_DRAG_AND_DROP=no
- wxUSE_DATAOBJ=no
- wxUSE_OLE=no
- fi
-
- if test "$wxUSE_METAFILE" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_METAFILE 1
-EOF
-
-
- cat >> confdefs.h <<\EOF
-#define wxUSE_ENH_METAFILE 1
-EOF
-
- fi
-fi
-
if test "$wxUSE_IPC" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then
echo "configure: warning: wxWindows IPC classes require sockets... disabled" 1>&2
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
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
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"
for ac_func in cos
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:21744: checking for $ac_func" >&5
+echo "configure:21985: 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 21749 "configure"
+#line 21990 "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:21772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22013: \"$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 floor
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:21799: checking for $ac_func" >&5
+echo "configure:22040: 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 21804 "configure"
+#line 22045 "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:21827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22068: \"$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
echo $ac_n "checking if floating point functions link without -lm""... $ac_c" 1>&6
-echo "configure:21852: checking if floating point functions link without -lm" >&5
+echo "configure:22093: 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
for ac_func in sin
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:21864: checking for $ac_func" >&5
+echo "configure:22105: 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 21869 "configure"
+#line 22110 "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:21892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22133: \"$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 ceil
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:21919: checking for $ac_func" >&5
+echo "configure:22160: 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 21924 "configure"
+#line 22165 "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:21947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:22188: \"$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
echo $ac_n "checking if floating point functions link with -lm""... $ac_c" 1>&6
-echo "configure:21972: checking if floating point functions link with -lm" >&5
+echo "configure:22213: 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
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
+
+
+
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:22125: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:22369: 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_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_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age
-
+ 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"
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%@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%@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%@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
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}"
projects / wxWidgets.git / blobdiff