ac_help="$ac_help
--enable-tabdialog use wxTabControl class"
ac_help="$ac_help
+--enable-togglebtn use wxToggleButton class"
+ac_help="$ac_help
--enable-toolbar use wxToolBar class"
ac_help="$ac_help
--enable-tbarnative use native wxToolBar class"
ac_help="$ac_help
--enable-joystick compile in joystick support (Linux only)"
ac_help="$ac_help
+--enable-image use wxImage class"
+ac_help="$ac_help
--enable-gif use gif images (GIF file format)"
ac_help="$ac_help
--enable-pcx use pcx images (PCX file format)"
ac_help="$ac_help
--enable-pnm use pnm images (PNM file format)"
+ac_help="$ac_help
+--enable-xpm use xpm images (XPM file format)"
ac_help="$ac_help
--with-gtk-prefix=PFX Prefix where GTK is installed (optional)"
ac_help="$ac_help
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:862: checking host system type" >&5
+echo "configure:868: 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:883: checking target system type" >&5
+echo "configure:889: 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:901: checking build system type" >&5
+echo "configure:907: checking build system type" >&5
build_alias=$build
case "$build_alias" in
WX_MINOR_VERSION_NUMBER=3
WX_RELEASE_NUMBER=0
-WX_INTERFACE_AGE=0
-WX_BINARY_AGE=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_CURRENT=`expr $WX_RELEASE_NUMBER - $WX_INTERFACE_AGE`
-WX_REVISION=$WX_INTERFACE_AGE
-WX_AGE=`expr $WX_BINARY_AGE - $WX_INTERFACE_AGE`
+
+WX_CURRENT=0
+WX_REVISION=0
+WX_AGE=0
+
USE_UNIX=1
USE_WIN32=0
USE_BEOS=0
+USE_MAC=0
USE_LINUX=
USE_SGI=
USE_OSF=
USE_BSD=
USE_FREEBSD=
+USE_OPENBSD=
USE_NETBSD=
USE_VMS=
USE_ULTRIX=
cat >> confdefs.h <<\EOF
#define __BSD__ 1
+EOF
+
+ DEFAULT_DEFAULT_wxUSE_GTK=1
+ ;;
+ *-*-openbsd*)
+ USE_BSD=1
+ USE_OPENBSD=1
+ cat >> confdefs.h <<\EOF
+#define __FREEBSD__ 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define __OPENBSD__ 1
EOF
DEFAULT_DEFAULT_wxUSE_GTK=1
DEFAULT_DEFAULT_wxUSE_MOTIF=1
;;
- *-*-cygwin32* | *-*-mingw32* )
+ *-*-cygwin* | *-*-mingw32* )
USE_UNIX=0
USE_WIN32=1
cat >> confdefs.h <<\EOF
if test "$USE_LINUX" = 1; then
echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
-echo "configure:1233: checking for gettext in -lc" >&5
+echo "configure:1252: checking for gettext in -lc" >&5
ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1241 "configure"
+#line 1260 "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
gettext()
; return 0; }
EOF
-if { (eval echo configure:1252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1271: \"$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
DEFAULT_wxUSE_STATLINE=no
DEFAULT_wxUSE_STATUSBAR=yes
DEFAULT_wxUSE_TABDIALOG=no
+ DEFAULT_wxUSE_TOGGLEBTN=no
DEFAULT_wxUSE_TOOLBAR=no
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_UNICODE=no
DEFAULT_wxUSE_WCSRTOMBS=no
+ DEFAULT_wxUSE_IMAGE=no
DEFAULT_wxUSE_GIF=no
DEFAULT_wxUSE_PCX=no
DEFAULT_wxUSE_PNM=no
+ DEFAULT_wxUSE_XPM=no
else
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_STATLINE=yes
DEFAULT_wxUSE_STATUSBAR=yes
DEFAULT_wxUSE_TABDIALOG=no
+ DEFAULT_wxUSE_TOGGLEBTN=yes
DEFAULT_wxUSE_TOOLBAR=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_UNICODE=no
DEFAULT_wxUSE_WCSRTOMBS=no
+ DEFAULT_wxUSE_IMAGE=yes
DEFAULT_wxUSE_GIF=yes
DEFAULT_wxUSE_PCX=yes
DEFAULT_wxUSE_PNM=yes
+ DEFAULT_wxUSE_XPM=yes
fi
echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6
-echo "configure:1548: checking "for --enable-gui"" >&5
+echo "configure:1573: checking "for --enable-gui"" >&5
no_cache=0
# Check whether --enable-gui or --disable-gui was given.
if test "${enable_gui+set}" = set; then
echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6
-echo "configure:1650: checking "for --with-libpng"" >&5
+echo "configure:1675: 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:1697: checking "for --with-libjpeg"" >&5
+echo "configure:1722: 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:1744: checking "for --with-libtiff"" >&5
+echo "configure:1769: checking "for --with-libtiff"" >&5
no_cache=0
# Check whether --with-libtiff or --without-libtiff was given.
if test "${with_libtiff+set}" = set; then
echo $ac_n "checking "for --with-freetype"""... $ac_c" 1>&6
-echo "configure:1791: checking "for --with-freetype"" >&5
+echo "configure:1816: checking "for --with-freetype"" >&5
no_cache=0
# Check whether --with-freetype or --without-freetype was given.
if test "${with_freetype+set}" = set; then
echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6
-echo "configure:1838: checking "for --with-opengl"" >&5
+echo "configure:1863: 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:1880: checking "for --with-dmalloc"" >&5
+echo "configure:1905: 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-zlib"""... $ac_c" 1>&6
-echo "configure:1919: checking "for --with-zlib"" >&5
+echo "configure:1944: 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:1966: checking "for --with-odbc"" >&5
+echo "configure:1991: checking "for --with-odbc"" >&5
no_cache=0
# Check whether --with-odbc or --without-odbc was given.
if test "${with_odbc+set}" = set; then
echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6
-echo "configure:2008: checking "for --enable-shared"" >&5
+echo "configure:2033: checking "for --enable-shared"" >&5
no_cache=0
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
echo $ac_n "checking "for --enable-burnt_name"""... $ac_c" 1>&6
-echo "configure:2047: checking "for --enable-burnt_name"" >&5
+echo "configure:2072: checking "for --enable-burnt_name"" >&5
no_cache=0
# Check whether --enable-burnt_name or --disable-burnt_name was given.
if test "${enable_burnt_name+set}" = set; then
echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6
-echo "configure:2086: checking "for --enable-optimise"" >&5
+echo "configure:2111: checking "for --enable-optimise"" >&5
no_cache=0
# Check whether --enable-optimise or --disable-optimise was given.
if test "${enable_optimise+set}" = set; then
echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6
-echo "configure:2125: checking "for --enable-debug"" >&5
+echo "configure:2150: checking "for --enable-debug"" >&5
no_cache=0
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6
-echo "configure:2173: checking "for --enable-debug_flag"" >&5
+echo "configure:2198: checking "for --enable-debug_flag"" >&5
no_cache=0
# Check whether --enable-debug_flag or --disable-debug_flag was given.
if test "${enable_debug_flag+set}" = set; then
echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6
-echo "configure:2212: checking "for --enable-debug_info"" >&5
+echo "configure:2237: checking "for --enable-debug_info"" >&5
no_cache=0
# Check whether --enable-debug_info or --disable-debug_info was given.
if test "${enable_debug_info+set}" = set; then
echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6
-echo "configure:2251: checking "for --enable-debug_gdb"" >&5
+echo "configure:2276: checking "for --enable-debug_gdb"" >&5
no_cache=0
# Check whether --enable-debug_gdb or --disable-debug_gdb was given.
if test "${enable_debug_gdb+set}" = set; then
echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6
-echo "configure:2290: checking "for --enable-debug_cntxt"" >&5
+echo "configure:2315: checking "for --enable-debug_cntxt"" >&5
no_cache=0
# Check whether --enable-debug_cntxt or --disable-debug_cntxt was given.
if test "${enable_debug_cntxt+set}" = set; then
echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6
-echo "configure:2329: checking "for --enable-mem_tracing"" >&5
+echo "configure:2354: checking "for --enable-mem_tracing"" >&5
no_cache=0
# Check whether --enable-mem_tracing or --disable-mem_tracing was given.
if test "${enable_mem_tracing+set}" = set; then
echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6
-echo "configure:2368: checking "for --enable-profile"" >&5
+echo "configure:2393: checking "for --enable-profile"" >&5
no_cache=0
# Check whether --enable-profile or --disable-profile was given.
if test "${enable_profile+set}" = set; then
echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6
-echo "configure:2407: checking "for --enable-no_rtti"" >&5
+echo "configure:2432: checking "for --enable-no_rtti"" >&5
no_cache=0
# Check whether --enable-no_rtti or --disable-no_rtti was given.
if test "${enable_no_rtti+set}" = set; then
echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6
-echo "configure:2446: checking "for --enable-no_exceptions"" >&5
+echo "configure:2471: checking "for --enable-no_exceptions"" >&5
no_cache=0
# Check whether --enable-no_exceptions or --disable-no_exceptions was given.
if test "${enable_no_exceptions+set}" = set; then
echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6
-echo "configure:2485: checking "for --enable-permissive"" >&5
+echo "configure:2510: checking "for --enable-permissive"" >&5
no_cache=0
# Check whether --enable-permissive or --disable-permissive was given.
if test "${enable_permissive+set}" = set; then
echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6
-echo "configure:2524: checking "for --enable-no_deps"" >&5
+echo "configure:2549: checking "for --enable-no_deps"" >&5
no_cache=0
# Check whether --enable-no_deps or --disable-no_deps was given.
if test "${enable_no_deps+set}" = set; then
echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6
-echo "configure:2565: checking "for --enable-intl"" >&5
+echo "configure:2590: checking "for --enable-intl"" >&5
no_cache=0
# Check whether --enable-intl or --disable-intl was given.
if test "${enable_intl+set}" = set; then
echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6
-echo "configure:2604: checking "for --enable-config"" >&5
+echo "configure:2629: checking "for --enable-config"" >&5
no_cache=0
# Check whether --enable-config or --disable-config was given.
if test "${enable_config+set}" = set; then
echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6
-echo "configure:2644: checking "for --enable-sockets"" >&5
+echo "configure:2669: checking "for --enable-sockets"" >&5
no_cache=0
# Check whether --enable-sockets or --disable-sockets was given.
if test "${enable_sockets+set}" = set; then
echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6
-echo "configure:2684: checking "for --enable-ipc"" >&5
+echo "configure:2709: checking "for --enable-ipc"" >&5
no_cache=0
# Check whether --enable-ipc or --disable-ipc was given.
if test "${enable_ipc+set}" = set; then
echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6
-echo "configure:2724: checking "for --enable-dialupman"" >&5
+echo "configure:2749: checking "for --enable-dialupman"" >&5
no_cache=0
# Check whether --enable-dialupman or --disable-dialupman was given.
if test "${enable_dialupman+set}" = set; then
echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6
-echo "configure:2763: checking "for --enable-apple_ieee"" >&5
+echo "configure:2788: checking "for --enable-apple_ieee"" >&5
no_cache=0
# Check whether --enable-apple_ieee or --disable-apple_ieee was given.
if test "${enable_apple_ieee+set}" = set; then
echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6
-echo "configure:2802: checking "for --enable-timedate"" >&5
+echo "configure:2827: checking "for --enable-timedate"" >&5
no_cache=0
# Check whether --enable-timedate or --disable-timedate was given.
if test "${enable_timedate+set}" = set; then
echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6
-echo "configure:2841: checking "for --enable-wave"" >&5
+echo "configure:2866: checking "for --enable-wave"" >&5
no_cache=0
# Check whether --enable-wave or --disable-wave was given.
if test "${enable_wave+set}" = set; then
echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6
-echo "configure:2880: checking "for --enable-fraction"" >&5
+echo "configure:2905: checking "for --enable-fraction"" >&5
no_cache=0
# Check whether --enable-fraction or --disable-fraction was given.
if test "${enable_fraction+set}" = set; then
echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6
-echo "configure:2919: checking "for --enable-dynlib"" >&5
+echo "configure:2944: checking "for --enable-dynlib"" >&5
no_cache=0
# Check whether --enable-dynlib or --disable-dynlib was given.
if test "${enable_dynlib+set}" = set; then
echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6
-echo "configure:2958: checking "for --enable-longlong"" >&5
+echo "configure:2983: checking "for --enable-longlong"" >&5
no_cache=0
# Check whether --enable-longlong or --disable-longlong was given.
if test "${enable_longlong+set}" = set; then
echo $ac_n "checking "for --enable-geometry"""... $ac_c" 1>&6
-echo "configure:2997: checking "for --enable-geometry"" >&5
+echo "configure:3022: checking "for --enable-geometry"" >&5
no_cache=0
# Check whether --enable-geometry or --disable-geometry was given.
if test "${enable_geometry+set}" = set; then
echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6
-echo "configure:3036: checking "for --enable-log"" >&5
+echo "configure:3061: checking "for --enable-log"" >&5
no_cache=0
# Check whether --enable-log or --disable-log was given.
if test "${enable_log+set}" = set; then
echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6
-echo "configure:3075: checking "for --enable-streams"" >&5
+echo "configure:3100: checking "for --enable-streams"" >&5
no_cache=0
# Check whether --enable-streams or --disable-streams was given.
if test "${enable_streams+set}" = set; then
echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6
-echo "configure:3114: checking "for --enable-file"" >&5
+echo "configure:3139: checking "for --enable-file"" >&5
no_cache=0
# Check whether --enable-file or --disable-file was given.
if test "${enable_file+set}" = set; then
echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6
-echo "configure:3153: checking "for --enable-textfile"" >&5
+echo "configure:3178: checking "for --enable-textfile"" >&5
no_cache=0
# Check whether --enable-textfile or --disable-textfile was given.
if test "${enable_textfile+set}" = set; then
echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6
-echo "configure:3192: checking "for --enable-unicode"" >&5
+echo "configure:3217: checking "for --enable-unicode"" >&5
no_cache=0
# Check whether --enable-unicode or --disable-unicode was given.
if test "${enable_unicode+set}" = set; then
echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6
-echo "configure:3231: checking "for --enable-wcsrtombs"" >&5
+echo "configure:3256: checking "for --enable-wcsrtombs"" >&5
no_cache=0
# Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
if test "${enable_wcsrtombs+set}" = set; then
echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6
-echo "configure:3270: checking "for --enable-wxprintfv"" >&5
+echo "configure:3295: checking "for --enable-wxprintfv"" >&5
no_cache=0
# Check whether --enable-wxprintfv or --disable-wxprintfv was given.
if test "${enable_wxprintfv+set}" = set; then
echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6
-echo "configure:3309: checking "for --enable-std_iostreams"" >&5
+echo "configure:3334: checking "for --enable-std_iostreams"" >&5
no_cache=0
# Check whether --enable-std_iostreams or --disable-std_iostreams was given.
if test "${enable_std_iostreams+set}" = set; then
echo $ac_n "checking "for --enable-filesystem"""... $ac_c" 1>&6
-echo "configure:3348: checking "for --enable-filesystem"" >&5
+echo "configure:3373: checking "for --enable-filesystem"" >&5
no_cache=0
# Check whether --enable-filesystem or --disable-filesystem was given.
if test "${enable_filesystem+set}" = set; then
echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6
-echo "configure:3387: checking "for --enable-fs_inet"" >&5
+echo "configure:3412: checking "for --enable-fs_inet"" >&5
no_cache=0
# Check whether --enable-fs_inet or --disable-fs_inet was given.
if test "${enable_fs_inet+set}" = set; then
echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6
-echo "configure:3426: checking "for --enable-fs_zip"" >&5
+echo "configure:3451: checking "for --enable-fs_zip"" >&5
no_cache=0
# Check whether --enable-fs_zip or --disable-fs_zip was given.
if test "${enable_fs_zip+set}" = set; then
echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6
-echo "configure:3465: checking "for --enable-zipstream"" >&5
+echo "configure:3490: checking "for --enable-zipstream"" >&5
no_cache=0
# Check whether --enable-zipstream or --disable-zipstream was given.
if test "${enable_zipstream+set}" = set; then
echo $ac_n "checking "for --enable-catch_segvs"""... $ac_c" 1>&6
-echo "configure:3505: checking "for --enable-catch_segvs"" >&5
+echo "configure:3530: checking "for --enable-catch_segvs"" >&5
no_cache=0
# Check whether --enable-catch_segvs or --disable-catch_segvs was given.
if test "${enable_catch_segvs+set}" = set; then
echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6
-echo "configure:3546: checking "for --enable-threads"" >&5
+echo "configure:3571: checking "for --enable-threads"" >&5
no_cache=0
# Check whether --enable-threads or --disable-threads was given.
if test "${enable_threads+set}" = set; then
echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6
-echo "configure:3585: checking "for --enable-serial"" >&5
+echo "configure:3610: checking "for --enable-serial"" >&5
no_cache=0
# Check whether --enable-serial or --disable-serial was given.
if test "${enable_serial+set}" = set; then
echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6
-echo "configure:3628: checking "for --enable-docview"" >&5
+echo "configure:3653: checking "for --enable-docview"" >&5
no_cache=0
# Check whether --enable-docview or --disable-docview was given.
if test "${enable_docview+set}" = set; then
echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6
-echo "configure:3667: checking "for --enable-help"" >&5
+echo "configure:3692: checking "for --enable-help"" >&5
no_cache=0
# Check whether --enable-help or --disable-help was given.
if test "${enable_help+set}" = set; then
echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6
-echo "configure:3706: checking "for --enable-constraints"" >&5
+echo "configure:3731: checking "for --enable-constraints"" >&5
no_cache=0
# Check whether --enable-constraints or --disable-constraints was given.
if test "${enable_constraints+set}" = set; then
echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6
-echo "configure:3745: checking "for --enable-printarch"" >&5
+echo "configure:3770: checking "for --enable-printarch"" >&5
no_cache=0
# Check whether --enable-printarch or --disable-printarch was given.
if test "${enable_printarch+set}" = set; then
echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6
-echo "configure:3784: checking "for --enable-mdi"" >&5
+echo "configure:3809: checking "for --enable-mdi"" >&5
no_cache=0
# Check whether --enable-mdi or --disable-mdi was given.
if test "${enable_mdi+set}" = set; then
echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6
-echo "configure:3824: checking "for --enable-postscript"" >&5
+echo "configure:3849: checking "for --enable-postscript"" >&5
no_cache=0
# Check whether --enable-postscript or --disable-postscript was given.
if test "${enable_postscript+set}" = set; then
echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6
-echo "configure:3865: checking "for --enable-prologio"" >&5
+echo "configure:3890: checking "for --enable-prologio"" >&5
no_cache=0
# Check whether --enable-prologio or --disable-prologio was given.
if test "${enable_prologio+set}" = set; then
echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6
-echo "configure:3904: checking "for --enable-resources"" >&5
+echo "configure:3929: checking "for --enable-resources"" >&5
no_cache=0
# Check whether --enable-resources or --disable-resources was given.
if test "${enable_resources+set}" = set; then
echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6
-echo "configure:3944: checking "for --enable-xresources"" >&5
+echo "configure:3969: checking "for --enable-xresources"" >&5
no_cache=0
# Check whether --enable-xresources or --disable-xresources was given.
if test "${enable_xresources+set}" = set; then
echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6
-echo "configure:3985: checking "for --enable-clipboard"" >&5
+echo "configure:4010: checking "for --enable-clipboard"" >&5
no_cache=0
# Check whether --enable-clipboard or --disable-clipboard was given.
if test "${enable_clipboard+set}" = set; then
echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6
-echo "configure:4024: checking "for --enable-dnd"" >&5
+echo "configure:4049: checking "for --enable-dnd"" >&5
no_cache=0
# Check whether --enable-dnd or --disable-dnd was given.
if test "${enable_dnd+set}" = set; then
echo $ac_n "checking "for --enable-metafile"""... $ac_c" 1>&6
-echo "configure:4063: checking "for --enable-metafile"" >&5
+echo "configure:4088: checking "for --enable-metafile"" >&5
no_cache=0
# Check whether --enable-metafile or --disable-metafile was given.
if test "${enable_metafile+set}" = set; then
echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6
-echo "configure:4103: checking "for --enable-wxtree"" >&5
+echo "configure:4128: checking "for --enable-wxtree"" >&5
no_cache=0
# Check whether --enable-wxtree or --disable-wxtree was given.
if test "${enable_wxtree+set}" = set; then
echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6
-echo "configure:4144: checking "for --enable-controls"" >&5
+echo "configure:4169: checking "for --enable-controls"" >&5
no_cache=0
# Check whether --enable-controls or --disable-controls was given.
if test "${enable_controls+set}" = set; then
DEFAULT_wxUSE_STATLINE=yes
DEFAULT_wxUSE_STATUSBAR=yes
DEFAULT_wxUSE_TAB_DIALOG=yes
+ DEFAULT_wxUSE_TOGGLEBTN=yes
DEFAULT_wxUSE_TOOLBAR=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_STATLINE=no
DEFAULT_wxUSE_STATUSBAR=no
DEFAULT_wxUSE_TAB_DIALOG=no
+ DEFAULT_wxUSE_TOGGLEBTN=no
DEFAULT_wxUSE_TOOLBAR=no
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6
-echo "configure:4252: checking "for --enable-accel"" >&5
+echo "configure:4279: checking "for --enable-accel"" >&5
no_cache=0
# Check whether --enable-accel or --disable-accel was given.
if test "${enable_accel+set}" = set; then
echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6
-echo "configure:4291: checking "for --enable-caret"" >&5
+echo "configure:4318: checking "for --enable-caret"" >&5
no_cache=0
# Check whether --enable-caret or --disable-caret was given.
if test "${enable_caret+set}" = set; then
echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6
-echo "configure:4330: checking "for --enable-bmpbutton"" >&5
+echo "configure:4357: checking "for --enable-bmpbutton"" >&5
no_cache=0
# Check whether --enable-bmpbutton or --disable-bmpbutton was given.
if test "${enable_bmpbutton+set}" = set; then
echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6
-echo "configure:4369: checking "for --enable-checkbox"" >&5
+echo "configure:4396: checking "for --enable-checkbox"" >&5
no_cache=0
# Check whether --enable-checkbox or --disable-checkbox was given.
if test "${enable_checkbox+set}" = set; then
echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6
-echo "configure:4408: checking "for --enable-checklst"" >&5
+echo "configure:4435: checking "for --enable-checklst"" >&5
no_cache=0
# Check whether --enable-checklst or --disable-checklst was given.
if test "${enable_checklst+set}" = set; then
echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6
-echo "configure:4447: checking "for --enable-choice"" >&5
+echo "configure:4474: checking "for --enable-choice"" >&5
no_cache=0
# Check whether --enable-choice or --disable-choice was given.
if test "${enable_choice+set}" = set; then
echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6
-echo "configure:4486: checking "for --enable-combobox"" >&5
+echo "configure:4513: checking "for --enable-combobox"" >&5
no_cache=0
# Check whether --enable-combobox or --disable-combobox was given.
if test "${enable_combobox+set}" = set; then
echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6
-echo "configure:4525: checking "for --enable-gauge"" >&5
+echo "configure:4552: checking "for --enable-gauge"" >&5
no_cache=0
# Check whether --enable-gauge or --disable-gauge was given.
if test "${enable_gauge+set}" = set; then
echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6
-echo "configure:4564: checking "for --enable-grid"" >&5
+echo "configure:4591: checking "for --enable-grid"" >&5
no_cache=0
# Check whether --enable-grid or --disable-grid was given.
if test "${enable_grid+set}" = set; then
echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6
-echo "configure:4603: checking "for --enable-newgrid"" >&5
+echo "configure:4630: checking "for --enable-newgrid"" >&5
no_cache=0
# Check whether --enable-newgrid or --disable-newgrid was given.
if test "${enable_newgrid+set}" = set; then
echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6
-echo "configure:4642: checking "for --enable-imaglist"" >&5
+echo "configure:4669: checking "for --enable-imaglist"" >&5
no_cache=0
# Check whether --enable-imaglist or --disable-imaglist was given.
if test "${enable_imaglist+set}" = set; then
echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6
-echo "configure:4681: checking "for --enable-listbox"" >&5
+echo "configure:4708: checking "for --enable-listbox"" >&5
no_cache=0
# Check whether --enable-listbox or --disable-listbox was given.
if test "${enable_listbox+set}" = set; then
echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6
-echo "configure:4720: checking "for --enable-listctrl"" >&5
+echo "configure:4747: checking "for --enable-listctrl"" >&5
no_cache=0
# Check whether --enable-listctrl or --disable-listctrl was given.
if test "${enable_listctrl+set}" = set; then
echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6
-echo "configure:4759: checking "for --enable-notebook"" >&5
+echo "configure:4786: checking "for --enable-notebook"" >&5
no_cache=0
# Check whether --enable-notebook or --disable-notebook was given.
if test "${enable_notebook+set}" = set; then
echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6
-echo "configure:4798: checking "for --enable-radiobox"" >&5
+echo "configure:4825: checking "for --enable-radiobox"" >&5
no_cache=0
# Check whether --enable-radiobox or --disable-radiobox was given.
if test "${enable_radiobox+set}" = set; then
echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6
-echo "configure:4837: checking "for --enable-radiobtn"" >&5
+echo "configure:4864: checking "for --enable-radiobtn"" >&5
no_cache=0
# Check whether --enable-radiobtn or --disable-radiobtn was given.
if test "${enable_radiobtn+set}" = set; then
echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6
-echo "configure:4876: checking "for --enable-sash"" >&5
+echo "configure:4903: checking "for --enable-sash"" >&5
no_cache=0
# Check whether --enable-sash or --disable-sash was given.
if test "${enable_sash+set}" = set; then
echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6
-echo "configure:4915: checking "for --enable-scrollbar"" >&5
+echo "configure:4942: checking "for --enable-scrollbar"" >&5
no_cache=0
# Check whether --enable-scrollbar or --disable-scrollbar was given.
if test "${enable_scrollbar+set}" = set; then
echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6
-echo "configure:4954: checking "for --enable-slider"" >&5
+echo "configure:4981: checking "for --enable-slider"" >&5
no_cache=0
# Check whether --enable-slider or --disable-slider was given.
if test "${enable_slider+set}" = set; then
echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6
-echo "configure:4993: checking "for --enable-spinbtn"" >&5
+echo "configure:5020: checking "for --enable-spinbtn"" >&5
no_cache=0
# Check whether --enable-spinbtn or --disable-spinbtn was given.
if test "${enable_spinbtn+set}" = set; then
echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6
-echo "configure:5032: checking "for --enable-spinctrl"" >&5
+echo "configure:5059: checking "for --enable-spinctrl"" >&5
no_cache=0
# Check whether --enable-spinctrl or --disable-spinctrl was given.
if test "${enable_spinctrl+set}" = set; then
echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6
-echo "configure:5071: checking "for --enable-splitter"" >&5
+echo "configure:5098: checking "for --enable-splitter"" >&5
no_cache=0
# Check whether --enable-splitter or --disable-splitter was given.
if test "${enable_splitter+set}" = set; then
echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6
-echo "configure:5110: checking "for --enable-statbmp"" >&5
+echo "configure:5137: checking "for --enable-statbmp"" >&5
no_cache=0
# Check whether --enable-statbmp or --disable-statbmp was given.
if test "${enable_statbmp+set}" = set; then
echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6
-echo "configure:5149: checking "for --enable-statbox"" >&5
+echo "configure:5176: checking "for --enable-statbox"" >&5
no_cache=0
# Check whether --enable-statbox or --disable-statbox was given.
if test "${enable_statbox+set}" = set; then
echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6
-echo "configure:5188: checking "for --enable-statline"" >&5
+echo "configure:5215: checking "for --enable-statline"" >&5
no_cache=0
# Check whether --enable-statline or --disable-statline was given.
if test "${enable_statline+set}" = set; then
echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6
-echo "configure:5227: checking "for --enable-statusbar"" >&5
+echo "configure:5254: checking "for --enable-statusbar"" >&5
no_cache=0
# Check whether --enable-statusbar or --disable-statusbar was given.
if test "${enable_statusbar+set}" = set; then
echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6
-echo "configure:5266: checking "for --enable-tabdialog"" >&5
+echo "configure:5293: checking "for --enable-tabdialog"" >&5
no_cache=0
# Check whether --enable-tabdialog or --disable-tabdialog was given.
if test "${enable_tabdialog+set}" = set; then
fi
+ echo $ac_n "checking "for --enable-togglebtn"""... $ac_c" 1>&6
+echo "configure:5332: checking "for --enable-togglebtn"" >&5
+ no_cache=0
+ # Check whether --enable-togglebtn or --disable-togglebtn was given.
+if test "${enable_togglebtn+set}" = set; then
+ enableval="$enable_togglebtn"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
+ else
+ ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN
+
+fi
+
+
+ eval "$ac_cv_use_togglebtn"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_TOGGLEBTN" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6
-echo "configure:5305: checking "for --enable-toolbar"" >&5
+echo "configure:5371: checking "for --enable-toolbar"" >&5
no_cache=0
# Check whether --enable-toolbar or --disable-toolbar was given.
if test "${enable_toolbar+set}" = set; then
echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6
-echo "configure:5344: checking "for --enable-tbarnative"" >&5
+echo "configure:5410: checking "for --enable-tbarnative"" >&5
no_cache=0
# Check whether --enable-tbarnative or --disable-tbarnative was given.
if test "${enable_tbarnative+set}" = set; then
echo $ac_n "checking "for --enable-tbarsmpl"""... $ac_c" 1>&6
-echo "configure:5383: checking "for --enable-tbarsmpl"" >&5
+echo "configure:5449: checking "for --enable-tbarsmpl"" >&5
no_cache=0
# Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
if test "${enable_tbarsmpl+set}" = set; then
echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6
-echo "configure:5422: checking "for --enable-treectrl"" >&5
+echo "configure:5488: checking "for --enable-treectrl"" >&5
no_cache=0
# Check whether --enable-treectrl or --disable-treectrl was given.
if test "${enable_treectrl+set}" = set; then
echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6
-echo "configure:5463: checking "for --enable-commondlg"" >&5
+echo "configure:5529: checking "for --enable-commondlg"" >&5
no_cache=0
# Check whether --enable-commondlg or --disable-commondlg was given.
if test "${enable_commondlg+set}" = set; then
echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6
-echo "configure:5502: checking "for --enable-dirdlg"" >&5
+echo "configure:5568: checking "for --enable-dirdlg"" >&5
no_cache=0
# Check whether --enable-dirdlg or --disable-dirdlg was given.
if test "${enable_dirdlg+set}" = set; then
echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6
-echo "configure:5541: checking "for --enable-textdlg"" >&5
+echo "configure:5607: checking "for --enable-textdlg"" >&5
no_cache=0
# Check whether --enable-textdlg or --disable-textdlg was given.
if test "${enable_textdlg+set}" = set; then
echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6
-echo "configure:5580: checking "for --enable-tipdlg"" >&5
+echo "configure:5646: checking "for --enable-tipdlg"" >&5
no_cache=0
# Check whether --enable-tipdlg or --disable-tipdlg was given.
if test "${enable_tipdlg+set}" = set; then
echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6
-echo "configure:5619: checking "for --enable-progressdlg"" >&5
+echo "configure:5685: checking "for --enable-progressdlg"" >&5
no_cache=0
# Check whether --enable-progressdlg or --disable-progressdlg was given.
if test "${enable_progressdlg+set}" = set; then
echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6
-echo "configure:5658: checking "for --enable-miniframe"" >&5
+echo "configure:5724: checking "for --enable-miniframe"" >&5
no_cache=0
# Check whether --enable-miniframe or --disable-miniframe was given.
if test "${enable_miniframe+set}" = set; then
echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6
-echo "configure:5697: checking "for --enable-html"" >&5
+echo "configure:5763: checking "for --enable-html"" >&5
no_cache=0
# Check whether --enable-html or --disable-html was given.
if test "${enable_html+set}" = set; then
echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6
-echo "configure:5736: checking "for --enable-tooltips"" >&5
+echo "configure:5802: checking "for --enable-tooltips"" >&5
no_cache=0
# Check whether --enable-tooltips or --disable-tooltips was given.
if test "${enable_tooltips+set}" = set; then
echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6
-echo "configure:5775: checking "for --enable-splines"" >&5
+echo "configure:5841: checking "for --enable-splines"" >&5
no_cache=0
# Check whether --enable-splines or --disable-splines was given.
if test "${enable_splines+set}" = set; then
echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6
-echo "configure:5814: checking "for --enable-validators"" >&5
+echo "configure:5880: checking "for --enable-validators"" >&5
no_cache=0
# Check whether --enable-validators or --disable-validators was given.
if test "${enable_validators+set}" = set; then
echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6
-echo "configure:5853: checking "for --enable-busyinfo"" >&5
+echo "configure:5919: checking "for --enable-busyinfo"" >&5
no_cache=0
# Check whether --enable-busyinfo or --disable-busyinfo was given.
if test "${enable_busyinfo+set}" = set; then
echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6
-echo "configure:5892: checking "for --enable-joystick"" >&5
+echo "configure:5958: checking "for --enable-joystick"" >&5
no_cache=0
# Check whether --enable-joystick or --disable-joystick was given.
if test "${enable_joystick+set}" = set; then
+ echo $ac_n "checking "for --enable-image"""... $ac_c" 1>&6
+echo "configure:5999: checking "for --enable-image"" >&5
+ no_cache=0
+ # Check whether --enable-image or --disable-image was given.
+if test "${enable_image+set}" = set; then
+ enableval="$enable_image"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_image='wxUSE_IMAGE=yes'
+ else
+ ac_cv_use_image='wxUSE_IMAGE=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE
+
+fi
+
+
+ eval "$ac_cv_use_image"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_IMAGE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6
-echo "configure:5933: checking "for --enable-gif"" >&5
+echo "configure:6038: checking "for --enable-gif"" >&5
no_cache=0
# Check whether --enable-gif or --disable-gif was given.
if test "${enable_gif+set}" = set; then
echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6
-echo "configure:5972: checking "for --enable-pcx"" >&5
+echo "configure:6077: checking "for --enable-pcx"" >&5
no_cache=0
# Check whether --enable-pcx or --disable-pcx was given.
if test "${enable_pcx+set}" = set; then
echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6
-echo "configure:6011: checking "for --enable-pnm"" >&5
+echo "configure:6116: checking "for --enable-pnm"" >&5
no_cache=0
# Check whether --enable-pnm or --disable-pnm was given.
if test "${enable_pnm+set}" = set; then
fi
+ echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6
+echo "configure:6155: checking "for --enable-pnm"" >&5
+ no_cache=0
+ # Check whether --enable-pnm or --disable-pnm was given.
+if test "${enable_pnm+set}" = set; then
+ enableval="$enable_pnm"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_pnm='wxUSE_XPM=yes'
+ else
+ ac_cv_use_pnm='wxUSE_XPM=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_pnm='wxUSE_XPM='$DEFAULT_wxUSE_XPM
+
+fi
+
+
+ eval "$ac_cv_use_pnm"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_XPM" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
fi
echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:6058: checking for toolkit" >&5
+echo "configure:6202: checking for toolkit" >&5
if test "$wxUSE_GUI" = "yes"; then
# 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:6191: checking for $ac_word" >&5
+echo "configure:6335: 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:6221: checking for $ac_word" >&5
+echo "configure:6365: 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:6272: checking for $ac_word" >&5
+echo "configure:6416: 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:6304: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:6448: 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 6315 "configure"
+#line 6459 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:6320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6464: \"$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:6346: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:6490: 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:6351: checking whether we are using GNU C" >&5
+echo "configure:6495: 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:6360: \"$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:6504: \"$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:6379: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:6523: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:6414: checking how to run the C preprocessor" >&5
+echo "configure:6558: 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 6429 "configure"
+#line 6573 "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:6435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6579: \"$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 6446 "configure"
+#line 6590 "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:6452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6596: \"$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 6463 "configure"
+#line 6607 "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:6469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6613: \"$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:6496: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:6640: 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 6502 "configure"
+#line 6646 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 6520 "configure"
+#line 6664 "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:6556: checking for $ac_word" >&5
+echo "configure:6700: 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:6588: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:6732: 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 6599 "configure"
+#line 6743 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:6604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6748: \"$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:6630: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:6774: 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:6635: checking whether we are using GNU C++" >&5
+echo "configure:6779: 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:6644: \"$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:6788: \"$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:6663: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:6807: 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
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:6696: checking how to run the C++ preprocessor" >&5
+echo "configure:6840: 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 6709 "configure"
+#line 6853 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6858: \"$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
:
# 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:6752: checking for $ac_word" >&5
+echo "configure:6896: 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:6783: checking for $ac_word" >&5
+echo "configure:6927: 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:6823: checking for a BSD compatible install" >&5
+echo "configure:6967: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6879: checking for $ac_word" >&5
+echo "configure:7023: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:6908: checking "make for VPATH support"" >&5
+echo "configure:7052: checking "make for VPATH support"" >&5
cat - << EOF > confMake
check : file
cp \$? \$@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6937: checking for $ac_word" >&5
+echo "configure:7081: 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:6971: checking for $ac_word" >&5
+echo "configure:7115: 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:7005: checking for yywrap in -l$ac_lib" >&5
+echo "configure:7149: 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 7013 "configure"
+#line 7157 "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:7024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7168: \"$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:7048: checking whether ln -s works" >&5
+echo "configure:7192: 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
TOOLKIT=
TOOLKIT_INCLUDE=
-GUIOBJS=
-COMMONOBJS=
-GENERICOBJS=
-
GUI_TK_LIBRARY=
GUI_TK_LINK=
echo "configure: warning: skipping windows.h check for cross-compilation" 1>&2
else
echo $ac_n "checking for Windows headers""... $ac_c" 1>&6
-echo "configure:7216: checking for Windows headers" >&5
+echo "configure:7356: checking for Windows headers" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
fi
TOOLKIT=MSW
-
- GUIOBJS="\$(MSW_GUIOBJS)"
- GUIHEADERS="\$(MSW_HEADERS)"
- COMMONOBJS="\$(MSW_COMMONOBJS)"
- GENERICOBJS="\$(MSW_GENERICOBJS)"
- UNIXOBJS=
GUIDIST=MSW_DIST
RCINCSWITCH="--include-dir"
# Extract the first word of "gtk-config-2.0", so it can be a program name with args.
set dummy gtk-config-2.0; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7318: checking for $ac_word" >&5
+echo "configure:7452: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
min_gtk_version=1.3.1
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:7353: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:7487: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG_2_0" = "no" ; then
no_gtk=yes
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 7376 "configure"
+#line 7510 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:7454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7588: \"$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 7488 "configure"
+#line 7622 "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:7498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7632: \"$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:7548: checking for $ac_word" >&5
+echo "configure:7682: 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:7583: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:7717: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" != "no" ; then
GTK_CFLAGS=`$GTK_CONFIG --cflags`
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 7596 "configure"
+#line 7730 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:7629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
# 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:7675: checking for $ac_word" >&5
+echo "configure:7809: 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:7710: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:7844: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" != "no" ; then
GTK_CFLAGS=`$GTK_CONFIG --cflags`
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 7723 "configure"
+#line 7857 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:7756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
GUI_TK_LIBRARY="$GTK_LIBS"
- TOOLKIT=GTK
AFMINSTALL=afminstall
-
- GUIOBJS="\$(GTK_GUIOBJS)"
- GUIHEADERS="\$(GTK_HEADERS)"
- COMMONOBJS="\$(GTK_COMMONOBJS)"
- GENERICOBJS="\$(GTK_GENERICOBJS)"
- GUIDEPS="\$(GTK_GUIDEPS)"
- COMMONDEPS="\$(GTK_COMMONDEPS)"
- GENERICDEPS="\$(GTK_GENERICDEPS)"
- UNIXOBJS="\$(UNIX_OBJS)"
- UNIXDEPS="\$(UNIX_DEPS)"
+ TOOLKIT=GTK
GUIDIST=GTK_DIST
echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:7822: checking for gdk_im_open in -lgdk" >&5
+echo "configure:7946: 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 7830 "configure"
+#line 7954 "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:7841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7965: \"$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_WINE" = 1; then
echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
-echo "configure:7868: checking for WINE includes" >&5
+echo "configure:7992: checking for WINE includes" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
XPM_LINK=""
echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:7889: checking for Xpm library" >&5
+echo "configure:8013: checking for Xpm library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
MESA_LINK=""
echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:7917: checking for Mesa library" >&5
+echo "configure:8041: checking for Mesa library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
WXWINE=1
TOOLKIT=MSW
-
- GUIHEADERS="\$(MSW_HEADERS)"
- GUIOBJS="\$(MSW_GUIOBJS)"
- COMMONOBJS="\$(MSW_COMMONOBJS)"
- GENERICOBJS="\$(MSW_GENERICOBJS)"
- GUIDEPS="\$(MSW_GUIDEPS)"
- COMMONDEPS="\$(MSW_COMMONDEPS)"
- GENERICDEPS="\$(MSW_GENERICDEPS)"
- UNIXOBJS="\$(UNIX_OBJS)"
- UNIXDEPS="\$(UNIX_DEPS)"
GUIDIST=MSW_DIST
fi
# 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:7961: checking for X" >&5
+echo "configure:8075: 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 8023 "configure"
+#line 8137 "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:8028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8142: \"$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 8097 "configure"
+#line 8211 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:8104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8218: \"$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:8210: checking whether -R must be followed by a space" >&5
+echo "configure:8324: 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 8213 "configure"
+#line 8327 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:8220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8334: \"$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 8236 "configure"
+#line 8350 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:8243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8357: \"$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:8275: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:8389: 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 8283 "configure"
+#line 8397 "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:8294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8408: \"$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:8316: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:8430: 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 8324 "configure"
+#line 8438 "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:8335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8449: \"$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:8364: checking for gethostbyname" >&5
+echo "configure:8478: 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 8369 "configure"
+#line 8483 "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:8392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8506: \"$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:8413: checking for gethostbyname in -lnsl" >&5
+echo "configure:8527: 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 8421 "configure"
+#line 8535 "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:8432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8546: \"$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:8462: checking for connect" >&5
+echo "configure:8576: 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 8467 "configure"
+#line 8581 "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:8490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8604: \"$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:8511: checking for connect in -lsocket" >&5
+echo "configure:8625: 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 8519 "configure"
+#line 8633 "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:8530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8644: \"$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:8554: checking for remove" >&5
+echo "configure:8668: 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 8559 "configure"
+#line 8673 "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:8582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8696: \"$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:8603: checking for remove in -lposix" >&5
+echo "configure:8717: 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 8611 "configure"
+#line 8725 "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:8622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8736: \"$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:8646: checking for shmat" >&5
+echo "configure:8760: 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 8651 "configure"
+#line 8765 "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:8674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8788: \"$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:8695: checking for shmat in -lipc" >&5
+echo "configure:8809: 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 8703 "configure"
+#line 8817 "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:8714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8828: \"$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:8747: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:8861: 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 8755 "configure"
+#line 8869 "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:8766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8880: \"$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:8807: checking for Motif/Lesstif headers" >&5
+echo "configure:8921: checking for Motif/Lesstif headers" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
echo "$ac_t""found $ac_find_includes" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8822 "configure"
+#line 8936 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:8835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8949: \"$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:8856: checking for Motif/Lesstif library" >&5
+echo "configure:8970: checking for Motif/Lesstif library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
echo "$ac_t""found at $ac_find_libraries" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8895 "configure"
+#line 9009 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:8908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9022: \"$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:8931: checking for Xpm library" >&5
+echo "configure:9045: checking for Xpm library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
echo "$ac_t""found at $ac_find_libraries" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8963 "configure"
+#line 9077 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
; return 0; }
EOF
-if { (eval echo configure:8976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
XPM_LINK="-lXpm "
GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
TOOLKIT=MOTIF
-
- GUIHEADERS="\$(MOTIF_HEADERS)"
- GUIOBJS="\$(MOTIF_GUIOBJS)"
- COMMONOBJS="\$(MOTIF_COMMONOBJS)"
- GENERICOBJS="\$(MOTIF_GENERICOBJS)"
- GUIDEPS="\$(MOTIF_GUIDEPS)"
- COMMONDEPS="\$(MOTIF_COMMONDEPS)"
- GENERICDEPS="\$(MOTIF_GENERICDEPS)"
- UNIXOBJS="\$(UNIX_OBJS)"
- UNIXDEPS="\$(UNIX_DEPS)"
GUIDIST=MOTIF_DIST
fi
if test "$wxUSE_MAC" = 1; then
TOOLKIT=MAC
- UNIXOBJS="\$(UNIX_OBJS)"
- UNIXDEPS="\$(UNIX_DEPS)"
GUIDIST=MACX_DIST
fi
if test "$wxUSE_PM" = 1; then
TOOLKIT=PM
-
- GUIOBJS="\$(PM_GUIOBJS)"
- GUIHEADERS="\$(PM_HEADERS)"
- COMMONOBJS="\$(PM_COMMONOBJS)"
- GENERICOBJS="\$(PM_GENERICOBJS)"
- GUIDEPS="\$(PM_GUIDEPS)"
- COMMONDEPS="\$(PM_COMMONDEPS)"
- GENERICDEPS="\$(PM_GENERICDEPS)"
- UNIXOBJS=
- UNIXDEPS=
GUIDIST=GTK_DIST
fi
ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)"
- if test "$TOOLKIT" != "MSW"; then
- if test "$wxUSE_ODBC" = "yes" ; then
- ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
- fi
+ if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
fi
if test "$wxUSE_LIBJPEG" = "yes" ; then
GUIDIST="BASE_DIST"
DISTDIR="wxBase"
-
- if test "$USE_UNIX" = 1 ; then
- ALL_OBJECTS="${ALL_OBJECTS} dl_macosx.o"
- ALL_DEPFILES="${ALL_DEPFILES} dl_macosx.d"
- fi
fi
WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
;;
- *-*-freebsd* | *-*-netbsd* )
+ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* )
SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC"
if test "$wxUSE_OPENGL" = "yes"; then
fi
;;
*-*-darwin* )
- SHARED_LD="libtool -dynamic -o"
- PIC_FLAG="-fPIC"
+ SHARED_LD="${CXX} -dynamiclib -o"
+ PIC_FLAG="-dynamic -fPIC"
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
fi
+ WX_ALL="${WX_ALL} lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.r"
+ WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
+ WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
+ WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.dylib"
+ WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.dylib"
+ WX_LIBRARY_LINK3="lib${WX_LIBRARY}.dylib"
+ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.dylib"
+ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib"
+ WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib"
;;
*-*-osf* )
SHARED_LD="${CXX} -shared -o"
SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
WX_ALL=${WX_LIBRARY_NAME_SHARED}
;;
- *-*-cygwin32* )
+ *-*-cygwin* )
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
if test "$wxUSE_OPENGL" = "yes"; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9327: checking for $ac_hdr" >&5
+echo "configure:9421: 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 9332 "configure"
+#line 9426 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9431: \"$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:9367: checking for $ac_hdr" >&5
+echo "configure:9461: 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 9372 "configure"
+#line 9466 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9471: \"$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:9407: checking for $ac_hdr" >&5
+echo "configure:9501: 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 9412 "configure"
+#line 9506 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9511: \"$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:9447: checking for $ac_hdr" >&5
+echo "configure:9541: 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 9452 "configure"
+#line 9546 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9551: \"$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:9487: checking for $ac_hdr" >&5
+echo "configure:9581: 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 9492 "configure"
+#line 9586 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9591: \"$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:9527: checking for $ac_hdr" >&5
+echo "configure:9621: 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 9532 "configure"
+#line 9626 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9631: \"$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:9567: checking for $ac_hdr" >&5
+echo "configure:9661: 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 9572 "configure"
+#line 9666 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9671: \"$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:9607: checking for $ac_hdr" >&5
+echo "configure:9701: 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 9612 "configure"
+#line 9706 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9711: \"$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:9650: checking for $ac_hdr" >&5
+echo "configure:9744: 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 9655 "configure"
+#line 9749 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:9691: checking for ANSI C header files" >&5
+echo "configure:9785: 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 9696 "configure"
+#line 9790 "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:9704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9798: \"$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 9721 "configure"
+#line 9815 "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 9739 "configure"
+#line 9833 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 9760 "configure"
+#line 9854 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:9771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9865: \"$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:9795: checking for mode_t" >&5
+echo "configure:9889: 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 9800 "configure"
+#line 9894 "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:9828: checking for off_t" >&5
+echo "configure:9922: 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 9833 "configure"
+#line 9927 "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:9861: checking for pid_t" >&5
+echo "configure:9955: 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 9866 "configure"
+#line 9960 "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:9894: checking for size_t" >&5
+echo "configure:9988: 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 9899 "configure"
+#line 9993 "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:9927: checking for uid_t in sys/types.h" >&5
+echo "configure:10021: 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 9932 "configure"
+#line 10026 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
fi
+echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
+echo "configure:10056: checking for wchar_t" >&5
+if eval "test \"`echo '$''{'wx_cv_type_wchar_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ cat > conftest.$ac_ext <<EOF
+#line 10062 "configure"
+#include "confdefs.h"
+#include <wchar.h>
+int main() {
+
+ wchar_t wc, *ws;
+ wc = L'a';
+ ws = L"Hello, world!";
+
+; return 0; }
+EOF
+if { (eval echo configure:10073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_type_wchar_t=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ wx_cv_type_wchar_t=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$wx_cv_type_wchar_t" 1>&6
+if test "$wx_cv_type_wchar_t" = yes ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_WCHAR_T 1
+EOF
+
+fi
+
echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
-echo "configure:9963: checking for pw_gecos in struct passwd" >&5
+echo "configure:10096: 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 9969 "configure"
+#line 10102 "configure"
#include "confdefs.h"
#include <pwd.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:9980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_struct_pw_gecos=yes
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:10010: checking for working const" >&5
+echo "configure:10143: 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 10015 "configure"
+#line 10148 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:10064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10197: \"$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:10085: checking for inline" >&5
+echo "configure:10218: 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 10092 "configure"
+#line 10225 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:10099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10232: \"$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:10126: checking size of char" >&5
+echo "configure:10259: 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 10134 "configure"
+#line 10267 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10278: \"$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
EOF
-echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
-echo "configure:10165: checking size of wchar_t" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_wchar_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_sizeof_wchar_t=4
-else
- cat > conftest.$ac_ext <<EOF
-#line 10173 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
- FILE *f=fopen("conftestval", "w");
- if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(wchar_t));
- exit(0);
-}
-EOF
-if { (eval echo configure:10184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- ac_cv_sizeof_wchar_t=`cat conftestval`
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_sizeof_wchar_t=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_wchar_t" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
-EOF
-
-
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:10204: checking size of short" >&5
+echo "configure:10298: 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 10212 "configure"
+#line 10306 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_short=`cat conftestval`
else
echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:10243: checking size of int *" >&5
+echo "configure:10337: checking size of int *" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_sizeof_int_p=4
else
cat > conftest.$ac_ext <<EOF
-#line 10251 "configure"
+#line 10345 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int_p=`cat conftestval`
else
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:10282: checking size of int" >&5
+echo "configure:10376: 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 10290 "configure"
+#line 10384 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10395: \"$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:10321: checking size of long" >&5
+echo "configure:10415: 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 10329 "configure"
+#line 10423 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10360: checking size of long long" >&5
+echo "configure:10454: 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 10368 "configure"
+#line 10462 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long_long=`cat conftestval`
else
+echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
+echo "configure:10494: checking size of wchar_t" >&5
+if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ if test "$cross_compiling" = yes; then
+ wx_cv_sizeof_wchar_t=4
+
+else
+ cat > conftest.$ac_ext <<EOF
+#line 10504 "configure"
+#include "confdefs.h"
+
+ #include <wchar.h>
+ #include <stdio.h>
+ int main()
+ {
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+ fprintf(f, "%i", sizeof(wchar_t));
+ exit(0);
+ }
+
+EOF
+if { (eval echo configure:10518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ wx_cv_sizeof_wchar_t=`cat conftestval`
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ wx_cv_sizeof_wchar_t=0
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+echo "$ac_t""$wx_cv_sizeof_wchar_t" 1>&6
+
+cat >> confdefs.h <<EOF
+#define SIZEOF_WCHAR_T $wx_cv_sizeof_wchar_t
+EOF
+
+
+
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:10400: checking whether byte ordering is bigendian" >&5
+echo "configure:10542: 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 10407 "configure"
+#line 10549 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:10418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10560: \"$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 10422 "configure"
+#line 10564 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:10433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10575: \"$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 10453 "configure"
+#line 10595 "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:10466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10608: \"$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
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10513: checking for $ac_hdr" >&5
+echo "configure:10655: 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 10518 "configure"
+#line 10660 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10665: \"$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:10571: checking if C++ compiler supports bool" >&5
+echo "configure:10713: 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 10586 "configure"
+#line 10728 "configure"
#include "confdefs.h"
; return 0; }
EOF
-if { (eval echo configure:10598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6
-echo "configure:10640: checking if you need GNU extensions" >&5
+echo "configure:10782: checking if you need GNU extensions" >&5
if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10646 "configure"
+#line 10788 "configure"
#include "confdefs.h"
#include <features.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:10659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_gnu_extensions=yes
else
echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
-echo "configure:10684: checking for wcslen in -lc" >&5
+echo "configure:10826: checking for wcslen in -lc" >&5
ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10692 "configure"
+#line 10834 "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:10703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:10729: checking for wcslen in -lw" >&5
+echo "configure:10871: 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 10737 "configure"
+#line 10879 "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:10748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:10779: checking for vprintf" >&5
+echo "configure:10921: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10784 "configure"
+#line 10926 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
; return 0; }
EOF
-if { (eval echo configure:10807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:10831: checking for _doprnt" >&5
+echo "configure:10973: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10836 "configure"
+#line 10978 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
; return 0; }
EOF
-if { (eval echo configure:10859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
-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 vsnprintf""... $ac_c" 1>&6
-echo "configure:10897: checking for vsnprintf" >&5
+echo "configure:11032: checking for vsnprintf" >&5
if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10903 "configure"
+#line 11038 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:10928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- cat >> confdefs.h <<\EOF
-#define HAVE_VSNPRINTF 1
-EOF
-
wx_cv_func_vsnprintf=yes
else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 10943 "configure"
+#line 11074 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:10968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- cat >> confdefs.h <<\EOF
-#define HAVE_VSNPRINTF 1
-EOF
-
wx_cv_func_vsnprintf=yes
else
cat conftest.$ac_ext >&5
rm -rf conftest*
- echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
wx_cv_func_vsnprintf=no
fi
echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6
+if test "$wx_cv_func_vsnprintf" = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_VSNPRINTF 1
+EOF
+
+else
+ echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
+fi
+
echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
-echo "configure:10996: checking for vsscanf" >&5
+echo "configure:11131: checking for vsscanf" >&5
if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 11002 "configure"
+#line 11137 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:11025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- cat >> confdefs.h <<\EOF
-#define HAVE_VSSCANF 1
-EOF
-
wx_cv_func_vsscanf=yes
else
echo "$ac_t""$wx_cv_func_vsscanf" 1>&6
+if test "$wx_cv_func_vsscanf" = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_VSSCANF 1
+EOF
+
+fi
+
+
+
+if test "$TOOLKIT" != "MSW"; 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 iconv() takes char**""... $ac_c" 1>&6
+echo "configure:11200: checking if iconv() takes char**" >&5
+if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ cat > conftest.$ac_ext <<EOF
+#line 11206 "configure"
+#include "confdefs.h"
+#include <iconv.h>
+int main() {
+
+ char **inbuf, **outbuf;
+ iconv_t cd;
+ size_t insz, outsz;
+ iconv(cd, inbuf, &insz, outbuf, &outsz);
+
+; return 0; }
+EOF
+if { (eval echo configure:11218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_iconv_takes_char=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ wx_cv_iconv_takes_char=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$wx_cv_iconv_takes_char" 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_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
+if test "$wx_cv_iconv_takes_char" = yes ; then
+ cat >> confdefs.h <<\EOF
+#define WX_ICONV_TAKES_CHAR 1
+EOF
+
+fi
-if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
for ac_func in sigaction
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11062: checking for $ac_func" >&5
+echo "configure:11251: 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 11067 "configure"
+#line 11256 "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:11090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11279: \"$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:11131: checking for sa_handler type" >&5
+echo "configure:11320: 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 11137 "configure"
+#line 11326 "configure"
#include "confdefs.h"
#include <signal.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_sa_handler=int
for ac_func in vfork
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11186: checking for $ac_func" >&5
+echo "configure:11375: 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 11191 "configure"
+#line 11380 "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:11214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11403: \"$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:11242: checking for $ac_func" >&5
+echo "configure:11431: 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 11247 "configure"
+#line 11436 "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:11270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11459: \"$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:11298: checking for $ac_func" >&5
+echo "configure:11487: 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 11303 "configure"
+#line 11492 "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:11326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11515: \"$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:11373: checking for $ac_func" >&5
+echo "configure:11562: 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 11378 "configure"
+#line 11567 "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:11401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11590: \"$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:11426: checking for nanosleep in -lposix4" >&5
+echo "configure:11615: 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 11434 "configure"
+#line 11623 "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:11445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11634: \"$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:11473: checking for $ac_func" >&5
+echo "configure:11662: 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 11478 "configure"
+#line 11667 "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:11501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11690: \"$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:11543: checking for $ac_func" >&5
+echo "configure:11732: 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 11548 "configure"
+#line 11737 "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:11571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11760: \"$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:11608: checking for $ac_func" >&5
+echo "configure:11797: 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 11613 "configure"
+#line 11802 "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:11639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11828: \"$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:11676: checking for $ac_func" >&5
+echo "configure:11865: 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 11681 "configure"
+#line 11870 "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:11704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11893: \"$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:11729: checking for inet_addr in -lnsl" >&5
+echo "configure:11918: 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 11737 "configure"
+#line 11926 "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:11748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11937: \"$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:11767: checking for inet_addr in -lresolv" >&5
+echo "configure:11956: 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 11775 "configure"
+#line 11964 "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:11786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11975: \"$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:11819: checking for $ac_func" >&5
+echo "configure:12008: 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 11824 "configure"
+#line 12013 "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:11847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12036: \"$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:11872: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:12061: 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 11880 "configure"
+#line 12069 "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:11891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$USE_AIX" = 1; then
THREADS_LIB=pthreads
+ elif test "$USE_MAC" = 1; then
+ THREADS_LIB=cc_dynamic
else
THREADS_LIB=pthread
fi
echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
-echo "configure:12004: checking for pthread_create in -l$THREADS_LIB" >&5
+echo "configure:12195: checking for pthread_create in -l$THREADS_LIB" >&5
ac_lib_var=`echo $THREADS_LIB'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12012 "configure"
+#line 12203 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:12023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:12046: checking for pthread_create in -lc_r" >&5
+echo "configure:12237: checking for pthread_create in -lc_r" >&5
ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lc_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12054 "configure"
+#line 12245 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:12065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lcc_dynamic""... $ac_c" 1>&6
-echo "configure:12088: checking for pthread_create in -lcc_dynamic" >&5
+echo "configure:12279: checking for pthread_create in -lcc_dynamic" >&5
ac_lib_var=`echo cc_dynamic'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lcc_dynamic $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12096 "configure"
+#line 12287 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:12107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
-echo "configure:12131: checking for sys/prctl.h" >&5
+echo "configure:12322: checking for sys/prctl.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12136 "configure"
+#line 12327 "configure"
#include "confdefs.h"
#include <sys/prctl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12332: \"$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 thr_setconcurrency
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12184: checking for $ac_func" >&5
+echo "configure:12375: 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 12189 "configure"
+#line 12380 "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:12212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12403: \"$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:12242: checking for $ac_hdr" >&5
+echo "configure:12433: 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 12247 "configure"
+#line 12438 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12280: checking for sched_yield in -l$THREADS_LINK" >&5
+echo "configure:12471: checking for sched_yield in -l$THREADS_LINK" >&5
ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12288 "configure"
+#line 12479 "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:12299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6
-echo "configure:12321: checking for sched_yield in -l"posix4"" >&5
+echo "configure:12512: checking for sched_yield in -l"posix4"" >&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="-l"posix4" $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12329 "configure"
+#line 12520 "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:12340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
HAVE_PRIOR_FUNCS=0
echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12371: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+echo "configure:12562: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12379 "configure"
+#line 12570 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_attr_getschedpolicy()
; return 0; }
EOF
-if { (eval echo configure:12390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12406: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
+echo "configure:12597: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12414 "configure"
+#line 12605 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_attr_setschedparam()
; return 0; }
EOF
-if { (eval echo configure:12425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12441: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
+echo "configure:12632: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12449 "configure"
+#line 12640 "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:12460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sched_get_priority_max in -l"posix4"""... $ac_c" 1>&6
-echo "configure:12479: checking for sched_get_priority_max in -l"posix4"" >&5
+echo "configure:12670: checking for sched_get_priority_max in -l"posix4"" >&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="-l"posix4" $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12487 "configure"
+#line 12678 "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:12498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12545: checking for pthread_cancel in -l$THREADS_LINK" >&5
+echo "configure:12736: checking for pthread_cancel in -l$THREADS_LINK" >&5
ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12553 "configure"
+#line 12744 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_cancel()
; return 0; }
EOF
-if { (eval echo configure:12564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:12590: checking for pthread_cleanup_push/pop" >&5
+echo "configure:12781: 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 12596 "configure"
+#line 12787 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:12606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_pthread_cleanup_push=yes
- cat >> confdefs.h <<\EOF
-#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
-EOF
-
else
echo "configure: failed program was:" >&5
echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6
+ if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
+EOF
+
+ fi
+
+
+ echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
+echo "configure:12825: 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 12831 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+int main() {
+
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+
+; return 0; }
+EOF
+if { (eval echo configure:12841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ wx_cv_type_pthread_mutexattr_t=yes
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ wx_cv_type_pthread_mutexattr_t=no
+
+
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$wx_cv_type_pthread_mutexattr_t" 1>&6
+
+ if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_MUTEXATTR_T 1
+EOF
+
+ else
+ echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
+echo "configure:12868: 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 12874 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+int main() {
+
+ pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+
+; return 0; }
+EOF
+if { (eval echo configure:12883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ wx_cv_type_pthread_rec_mutex_init=yes
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ wx_cv_type_pthread_rec_mutex_init=no
+
+
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&6
+ if test "$wx_cv_type_pthread_rec_mutex_init"="yes"; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
+EOF
+
+ else
+ echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2
+ fi
+ fi
+
THREADS_LINK="-l$THREADS_LINK"
if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
EOF
+ if test "$wxUSE_MAC" = "0"; then
CFLAGS="${CFLAGS} -D_REENTRANT"
- CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+ CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+ fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
else
if test "$ac_cv_func_strtok_r" = "yes"; then
echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
-echo "configure:12653: checking if -D_REENTRANT is needed" >&5
+echo "configure:12938: checking if -D_REENTRANT is needed" >&5
if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
CFLAGS="${CFLAGS} -D_REENTRANT"
CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
fi
if test "$wxUSE_MAC" = 1 ; then
- TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -DTARGET_CARBON"
- TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE}"
+ TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__POWERPC__ -DTARGET_CARBON"
+ CFLAGS="${CFLAGS} -fno-common -fpascal-strings"
+ CPPFLAGS="${CPPFLAGS} -fno-common -fpascal-strings"
+ # 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:12982: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_REZ'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$REZ"; then
+ ac_cv_prog_REZ="$REZ" # 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_REZ="Rez"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
+fi
+fi
+REZ="$ac_cv_prog_REZ"
+if test -n "$REZ"; then
+ echo "$ac_t""$REZ" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ # Extract the first word of "Derez", so it can be a program name with args.
+set dummy Derez; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:13012: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$DEREZ"; then
+ ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_DEREZ="Derez"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez"
+fi
+fi
+DEREZ="$ac_cv_prog_DEREZ"
+if test -n "$DEREZ"; then
+ echo "$ac_t""$DEREZ" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ RESCOMP=${REZ}
+ REZFLAGS="-d __UNIX__ -useDF"
+ DEREZFLAGS="Carbon.r -useDF"
+ RESFLAGS="Carbon.r -t APPL"
+ LIBWXMACRES="\$(LIBWX_MACRES)"
+ LIBWXMACRESCOMP="\$(LIBWX_MACRESCOMP)"
fi
if test "$wxUSE_CYGWIN" = 1 ; then
DEP_INFO_FLAGS=
CODE_GEN_FLAGS=
+CODE_GEN_FLAGS_CXX=
if test "$GCC" = yes ; then
if test "$wxUSE_NO_RTTI" = "yes" ; then
- CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-rtti"
+ CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-rtti"
fi
if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
- CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-exceptions"
+ CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-exceptions"
fi
if test "$wxUSE_PERMISSIVE" = "yes" ; then
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
ZLIB_LINK=
ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:12796: checking for zlib.h" >&5
+echo "configure:13149: 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 12801 "configure"
+#line 13154 "configure"
#include "confdefs.h"
#include <zlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
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:12823: checking for deflate in -lz" >&5
+echo "configure:13176: 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 12831 "configure"
+#line 13184 "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:12842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13195: \"$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
PNG_LINK=
ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:12889: checking for png.h" >&5
+echo "configure:13242: 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 12894 "configure"
+#line 13247 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
-echo "configure:12916: checking for png_check_sig in -lpng" >&5
+echo "configure:13269: 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 12924 "configure"
+#line 13277 "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:12935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13288: \"$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
JPEG_LINK=
ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:12980: checking for jpeglib.h" >&5
+echo "configure:13333: checking for jpeglib.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 12985 "configure"
+#line 13338 "configure"
#include "confdefs.h"
#include <jpeglib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13343: \"$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 jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:13007: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:13360: 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 13015 "configure"
+#line 13368 "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:13026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
TIFF_LINK=
ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:13068: checking for tiffio.h" >&5
+echo "configure:13421: 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 13073 "configure"
+#line 13426 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13431: \"$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:13095: checking for TIFFError in -ltiff" >&5
+echo "configure:13448: checking for TIFFError in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ltiff -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13103 "configure"
+#line 13456 "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:13114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13467: \"$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
FREETYPE_LINK=
ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
-echo "configure:13156: checking for freetype.h" >&5
+echo "configure:13509: checking for freetype.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 13161 "configure"
+#line 13514 "configure"
#include "confdefs.h"
#include <freetype.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6
-echo "configure:13183: checking for FT_Render_Glyph in -lfreetype" >&5
+echo "configure:13536: checking for FT_Render_Glyph in -lfreetype" >&5
ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lfreetype -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13191 "configure"
+#line 13544 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
FT_Render_Glyph()
; return 0; }
EOF
-if { (eval echo configure:13202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13555: \"$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_OPENGL" = "yes"; then
ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
-echo "configure:13236: checking for GL/gl.h" >&5
+echo "configure:13589: 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 13241 "configure"
+#line 13594 "configure"
#include "confdefs.h"
#include <GL/gl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13599: \"$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*
EOF
echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
-echo "configure:13272: checking for glFlush in -lGL" >&5
+echo "configure:13625: checking for glFlush in -lGL" >&5
ac_lib_var=`echo GL'_'glFlush | 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="-lGL $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13280 "configure"
+#line 13633 "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
glFlush()
; return 0; }
EOF
-if { (eval echo configure:13291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
-echo "configure:13313: checking for glFlush in -lMesaGL" >&5
+echo "configure:13666: checking for glFlush in -lMesaGL" >&5
ac_lib_var=`echo MesaGL'_'glFlush | 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="-lMesaGL $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13321 "configure"
+#line 13674 "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
glFlush()
; return 0; }
EOF
-if { (eval echo configure:13332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13685: \"$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 strptime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13535: checking for $ac_func" >&5
+echo "configure:13888: 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 13540 "configure"
+#line 13893 "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:13563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13916: \"$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:13589: checking for timezone variable in <time.h>" >&5
+echo "configure:13942: 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 13595 "configure"
+#line 13948 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:13607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13960: \"$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 13618 "configure"
+#line 13971 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:13630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13983: \"$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 13641 "configure"
+#line 13994 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:13653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14006: \"$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:13688: checking for $ac_func" >&5
+echo "configure:14041: 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 13693 "configure"
+#line 14046 "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:13716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14069: \"$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:13743: checking for tm_gmtoff in struct tm" >&5
+echo "configure:14096: 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 13749 "configure"
+#line 14102 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:13761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14114: \"$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:13787: checking for $ac_func" >&5
+echo "configure:14140: 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 13792 "configure"
+#line 14145 "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:13815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14168: \"$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:13842: checking whether gettimeofday takes two arguments" >&5
+echo "configure:14195: 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 13857 "configure"
+#line 14210 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:13871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14224: \"$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 13879 "configure"
+#line 14232 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:13892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_gettimeofday_has_2_args=no
else
if test "$wxUSE_SOCKETS" = "yes"; then
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:13938: checking for socket" >&5
+echo "configure:14291: 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 13943 "configure"
+#line 14296 "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:13966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14319: \"$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:13984: checking for socket in -lsocket" >&5
+echo "configure:14337: 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 13992 "configure"
+#line 14345 "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:14003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test "$wxUSE_SOCKETS" = "yes" ; then
echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:14036: checking what is the type of the third argument of getsockname" >&5
+echo "configure:14389: 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 14051 "configure"
+#line 14404 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:14064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14417: \"$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 14072 "configure"
+#line 14425 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:14085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14438: \"$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 14093 "configure"
+#line 14446 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:14106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=int
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14168: checking for $ac_hdr" >&5
+echo "configure:14521: 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 14173 "configure"
+#line 14526 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14531: \"$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:14234: checking for $ac_func" >&5
+echo "configure:14587: 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 14239 "configure"
+#line 14592 "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:14262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14615: \"$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:14290: checking for dlopen in -ldl" >&5
+echo "configure:14643: 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 14298 "configure"
+#line 14651 "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:14309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14662: \"$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:14338: checking for $ac_func" >&5
+echo "configure:14691: 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 14343 "configure"
+#line 14696 "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:14366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14719: \"$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:14394: checking for dld in -lshl_load" >&5
+echo "configure:14747: 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 14402 "configure"
+#line 14755 "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:14413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14766: \"$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:14452: checking for $ac_func" >&5
+echo "configure:14805: 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 14457 "configure"
+#line 14810 "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:14480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14833: \"$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:14505: checking for dlerror in -ldl" >&5
+echo "configure:14858: 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 14513 "configure"
+#line 14866 "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:14524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14877: \"$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
WXODBCFLAG="-D_IODBC_"
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
- IODBCOBJS="\$(IODBC_OBJS)"
-else
- IODBCOBJS=
fi
wxUSE_DRAG_AND_DROP=no
fi
+ if test "$wxUSE_MAC" = 1; then
+ echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 1>&2
+ wxUSE_DRAG_AND_DROP=no
+ fi
+
if test "$USE_WIN32" = 1; 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:14751: checking for $ac_hdr" >&5
+echo "configure:15106: 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 14756 "configure"
+#line 15111 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15116: \"$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*
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
fi
+if test "$wxUSE_TOGGLEBTN" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TOGGLEBTN 1
+EOF
+
+fi
+
if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_TOOLBAR_SIMPLE 1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
fi
+if test "$wxUSE_IMAGE" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_IMAGE 1
+EOF
+
+fi
+
if test "$wxUSE_GIF" = "yes" ; then
cat >> confdefs.h <<\EOF
#define wxUSE_GIF 1
fi
+if test "$wxUSE_XPM" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_XPM 1
+EOF
+
+fi
+
if test "$cross_compiling" = "yes"; then
OSINFO="\"$host\""
GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
OPENGL_LIBS="$OPENGL_LINK"
+EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
if test "$USE_MAC" = 1 ; then
- EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -framework System"
- CFLAGS="${CFLAGS} -fpascal-strings"
- CPPFLAGS="${CPPFLAGS} -fpascal-strings"
-else
- EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
+ EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
fi
if test "$wxUSE_GUI" = "yes"; then
EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
-
-
-
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:15343: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:15713: 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
s%@X_PRE_LIBS@%$X_PRE_LIBS%g
s%@X_LIBS@%$X_LIBS%g
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
+s%@REZ@%$REZ%g
+s%@DEREZ@%$DEREZ%g
s%@LEX_STEM@%$LEX_STEM%g
s%@PATH_IFS@%$PATH_IFS%g
s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g
s%@PIC_FLAG@%$PIC_FLAG%g
s%@DEP_INFO_FLAGS@%$DEP_INFO_FLAGS%g
s%@CODE_GEN_FLAGS@%$CODE_GEN_FLAGS%g
+s%@CODE_GEN_FLAGS_CXX@%$CODE_GEN_FLAGS_CXX%g
s%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%g
s%@BURNT_LIBRARY_NAME_GL@%$BURNT_LIBRARY_NAME_GL%g
s%@WX_TARGET_LIBRARY_SONAME@%$WX_TARGET_LIBRARY_SONAME%g
s%@TOOLKIT_NAME@%$TOOLKIT_NAME%g
s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
-s%@GUIHEADERS@%$GUIHEADERS%g
-s%@GUIOBJS@%$GUIOBJS%g
-s%@COMMONOBJS@%$COMMONOBJS%g
-s%@GENERICOBJS@%$GENERICOBJS%g
-s%@GUIDEPS@%$GUIDEPS%g
-s%@COMMONDEPS@%$COMMONDEPS%g
-s%@GENERICDEPS@%$GENERICDEPS%g
-s%@IODBCOBJS@%$IODBCOBJS%g
-s%@UNIXOBJS@%$UNIXOBJS%g
-s%@UNIXDEPS@%$UNIXDEPS%g
s%@ALL_OBJECTS@%$ALL_OBJECTS%g
s%@ALL_DEPFILES@%$ALL_DEPFILES%g
s%@GUIDIST@%$GUIDIST%g
s%@RESPROGRAM@%$RESPROGRAM%g
s%@RESCOMP@%$RESCOMP%g
s%@RESFLAGS@%$RESFLAGS%g
+s%@REZFLAGS@%$REZFLAGS%g
+s%@DEREZFLAGS@%$DEREZFLAGS%g
+s%@LIBWXMACRES@%$LIBWXMACRES%g
+s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g
s%@DLLTOOL@%$DLLTOOL%g
s%@AS@%$AS%g
s%@NM@%$NM%g
mv wx-config wx${TOOLKIT_NAME}-config
${LN_S} wx${TOOLKIT_NAME}-config wx-config
-
+
if test ! -d lib; then
mkdir lib
fi
mkdir lib/wx/include/wx/${TOOLKIT_NAME}
fi
if test -f setup.h; then
- cp -f setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
+ cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
fi
mkdir include/wx/${TOOLKIT_DIR}
fi
if test -f setup.h; then
- mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+ cp -fp setup.h include/wx/${TOOLKIT_DIR}/setup.h
fi
projects / wxWidgets.git / blobdiff