# Any additions from configure.in:
ac_help="$ac_help
--enable-gui use GUI classes"
+ac_help="$ac_help
+--enable-universal use wxWindows GUI controls instead of native ones"
ac_help="$ac_help
--with-gtk use GTK+"
ac_help="$ac_help
--with-mingw use GCC Minimal MS-Windows"
ac_help="$ac_help
--with-pm use OS/2 Presentation Manager"
+ac_help="$ac_help
+ --with-mgl use MGL"
ac_help="$ac_help
--with-gtk-prefix=PFX Prefix where GTK is installed"
ac_help="$ac_help
ac_help="$ac_help
--enable-ipc use interprocess communication (wxSocket etc.)"
ac_help="$ac_help
+--enable-cmdline use wxCmdLineParser class"
+ac_help="$ac_help
+--enable-datetime use wxDateTime class"
+ac_help="$ac_help
+--enable-timedate use obsolete wxDate/wxTime classes"
+ac_help="$ac_help
+--enable-stopwatch use wxStopWatch class"
+ac_help="$ac_help
--enable-dialupman use dialup network classes"
ac_help="$ac_help
--enable-apple_ieee use the Apple IEEE codec"
ac_help="$ac_help
---enable-timedate use date/time classes"
+--enable-timer use wxTimer class"
ac_help="$ac_help
--enable-wave use wxWave class"
ac_help="$ac_help
ac_help="$ac_help
--enable-file use wxFile classes"
ac_help="$ac_help
+--enable-ffile use wxFFile classes"
+ac_help="$ac_help
--enable-textfile use wxTextFile classes"
ac_help="$ac_help
+--enable-fontmap use font encodings conversion classes"
+ac_help="$ac_help
--enable-unicode compile wxString with Unicode support"
ac_help="$ac_help
--enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"
ac_help="$ac_help
--enable-snglinst use wxSingleInstanceChecker class"
ac_help="$ac_help
+--enable-mimetypes use wxMimeTypesManager"
+ac_help="$ac_help
--enable-threads use threads"
ac_help="$ac_help
--enable-serial use class serialization"
ac_help="$ac_help
--enable-mdi use multiple document interface architecture"
ac_help="$ac_help
+--enable-loggui use standard GUI logger"
+ac_help="$ac_help
+--enable-logwin use wxLogWindow"
+ac_help="$ac_help
--enable-postscript use wxPostscriptDC device context (default for gtk+)"
ac_help="$ac_help
--enable-prologio use Prolog IO library"
ac_help="$ac_help
--enable-accel use accelerators"
ac_help="$ac_help
---enable-caret use wxCaret class"
+--enable-button use wxButton class"
ac_help="$ac_help
--enable-bmpbutton use wxBitmapButton class"
ac_help="$ac_help
+--enable-calendar use wxCalendarCtrl class"
+ac_help="$ac_help
+--enable-caret use wxCaret class"
+ac_help="$ac_help
--enable-checkbox use wxCheckBox class"
ac_help="$ac_help
--enable-checklst use wxCheckListBox (listbox with checkboxes) class"
ac_help="$ac_help
--enable-statline use wxStaticLine class"
ac_help="$ac_help
+--enable-stattext use wxStaticText class"
+ac_help="$ac_help
--enable-statusbar use wxStatusBar class"
ac_help="$ac_help
--enable-tabdialog use wxTabControl class"
ac_help="$ac_help
+--enable-textctrl use wxTextCtrl class"
+ac_help="$ac_help
--enable-togglebtn use wxToggleButton class"
ac_help="$ac_help
--enable-toolbar use wxToolBar class"
ac_help="$ac_help
--enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
ac_help="$ac_help
+--enable-choicedlg use wxChoiceDialog"
+ac_help="$ac_help
+--enable-coldlg use wxColourDialog"
+ac_help="$ac_help
+--enable-filedlg use wxFileDialog"
+ac_help="$ac_help
+--enable-fontdlg use wxFontDialog"
+ac_help="$ac_help
--enable-dirdlg use wxDirDialog"
ac_help="$ac_help
+--enable-msgdlg use wxMessageDialog"
+ac_help="$ac_help
+--enable-numberdlg use wxNumberEntryDialog"
+ac_help="$ac_help
--enable-textdlg use wxTextDialog"
ac_help="$ac_help
--enable-tipdlg use startup tips"
ac_help="$ac_help
--enable-progressdlg use wxProgressDialog"
ac_help="$ac_help
+--enable-menus use wxMenu/wxMenuBar/wxMenuItem classes"
+ac_help="$ac_help
--enable-miniframe use wxMiniFrame class"
ac_help="$ac_help
--enable-html use wxHTML sub-library"
ac_help="$ac_help
--enable-joystick compile in joystick support (Linux only)"
ac_help="$ac_help
+--enable-metafiles use wxMetaFile (Windows only)"
+ac_help="$ac_help
--enable-image use wxImage class"
ac_help="$ac_help
--enable-gif use gif images (GIF file format)"
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:870: checking host system type" >&5
+echo "configure:916: 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:891: checking target system type" >&5
+echo "configure:937: 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:909: checking build system type" >&5
+echo "configure:955: checking build system type" >&5
build_alias=$build
case "$build_alias" in
NEEDS_D_REENTRANT_FOR_R_FUNCS=0
-ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF MAC WINE PM"
+ALL_TOOLKITS="CYGWIN GTK MAC MGL MINGW MOTIF PM WINE"
DEFAULT_wxUSE_GTK=0
+DEFAULT_wxUSE_MAC=0
+DEFAULT_wxUSE_MGL=0
DEFAULT_wxUSE_MOTIF=0
DEFAULT_wxUSE_MSW=0
-DEFAULT_wxUSE_MAC=0
-DEFAULT_wxUSE_WINE=0
DEFAULT_wxUSE_PM=0
+DEFAULT_wxUSE_WINE=0
DEFAULT_DEFAULT_wxUSE_GTK=0
+DEFAULT_DEFAULT_wxUSE_MAC=0
+DEFAULT_DEFAULT_wxUSE_MGL=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=0
-DEFAULT_DEFAULT_wxUSE_MAC=0
-DEFAULT_DEFAULT_wxUSE_WINE=0
DEFAULT_DEFAULT_wxUSE_PM=0
+DEFAULT_DEFAULT_wxUSE_WINE=0
PROGRAM_EXT=
if test "$USE_LINUX" = 1; then
echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
-echo "configure:1254: checking for gettext in -lc" >&5
+echo "configure:1302: 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 1262 "configure"
+#line 1310 "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:1273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1321: \"$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
DEBUG_CONFIGURE=0
if test $DEBUG_CONFIGURE = 1; then
+ DEFAULT_wxUSE_UNIVERSAL=no
+
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_BURNT_NAME=no
- DEFAULT_wxUSE_OPTIMISE=yes
+ DEFAULT_wxUSE_OPTIMISE=no
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
DEFAULT_wxUSE_NO_RTTI=no
DEFAULT_wxUSE_APPLE_IEEE=no
DEFAULT_wxUSE_LOG=yes
+ DEFAULT_wxUSE_LOGWINDOW=no
+ DEFAULT_wxUSE_LOGGUI=no
DEFAULT_wxUSE_GUI=yes
+ DEFAULT_wxUSE_CONTROLS=no
DEFAULT_wxUSE_ZLIB=no
DEFAULT_wxUSE_LIBPNG=no
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
DEFAULT_wxUSE_SNGLINST_CHECKER=no
DEFAULT_wxUSE_STD_IOSTREAM=no
+ DEFAULT_wxUSE_CMDLINE_PARSER=no
+ DEFAULT_wxUSE_DATETIME=no
+ DEFAULT_wxUSE_TIMEDATE=no
+ DEFAULT_wxUSE_TIMER=no
+ DEFAULT_wxUSE_STOPWATCH=no
DEFAULT_wxUSE_FILE=no
+ DEFAULT_wxUSE_FFILE=no
DEFAULT_wxUSE_TEXTFILE=no
- DEFAULT_wxUSE_TIMEDATE=no
DEFAULT_wxUSE_WAVE=no
DEFAULT_wxUSE_INTL=no
DEFAULT_wxUSE_CONFIG=no
+ DEFAULT_wxUSE_FONTMAP=no
DEFAULT_wxUSE_STREAMS=no
DEFAULT_wxUSE_SOCKETS=no
DEFAULT_wxUSE_DIALUP_MANAGER=no
DEFAULT_wxUSE_HELP=no
DEFAULT_wxUSE_WXTREE=no
DEFAULT_wxUSE_METAFILE=no
+ DEFAULT_wxUSE_MIMETYPE=no
DEFAULT_wxUSE_COMMONDLGS=no
+ DEFAULT_wxUSE_CHOICEDLG=no
+ DEFAULT_wxUSE_COLOURDLG=no
DEFAULT_wxUSE_DIRDLG=no
+ DEFAULT_wxUSE_FILEDLG=no
+ DEFAULT_wxUSE_FONTDLG=no
+ DEFAULT_wxUSE_MSGDLG=no
+ DEFAULT_wxUSE_NUMBERDLG=no
DEFAULT_wxUSE_TEXTDLG=no
DEFAULT_wxUSE_STARTUP_TIPS=no
DEFAULT_wxUSE_PROGRESSDLG=no
+ DEFAULT_wxUSE_MENUS=no
DEFAULT_wxUSE_MINIFRAME=no
DEFAULT_wxUSE_HTML=no
DEFAULT_wxUSE_FILESYSTEM=no
DEFAULT_wxUSE_FS_ZIP=no
DEFAULT_wxUSE_BUSYINFO=no
DEFAULT_wxUSE_ZIPSTREAM=no
- DEFAULT_wxUSE_VALIDATORS=yes
+ DEFAULT_wxUSE_VALIDATORS=no
DEFAULT_wxUSE_ACCEL=no
- DEFAULT_wxUSE_CARET=no
+ DEFAULT_wxUSE_BUTTON=no
DEFAULT_wxUSE_BMPBUTTON=no
+ DEFAULT_wxUSE_CALCTRL=no
+ DEFAULT_wxUSE_CARET=no
DEFAULT_wxUSE_CHECKBOX=no
DEFAULT_wxUSE_CHECKLST=no
- DEFAULT_wxUSE_CHOICE=yes
+ DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_COMBOBOX=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
DEFAULT_wxUSE_STATBMP=no
DEFAULT_wxUSE_STATBOX=no
DEFAULT_wxUSE_STATLINE=no
+ DEFAULT_wxUSE_STATTEXT=no
DEFAULT_wxUSE_STATUSBAR=yes
DEFAULT_wxUSE_TABDIALOG=no
+ DEFAULT_wxUSE_TEXTCTRL=no
DEFAULT_wxUSE_TOGGLEBTN=no
DEFAULT_wxUSE_TOOLBAR=no
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_PNM=no
DEFAULT_wxUSE_XPM=no
else
+ DEFAULT_wxUSE_UNIVERSAL=no
+
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
DEFAULT_wxUSE_SNGLINST_CHECKER=yes
DEFAULT_wxUSE_STD_IOSTREAM=no
+ DEFAULT_wxUSE_CMDLINE_PARSER=yes
+ DEFAULT_wxUSE_DATETIME=yes
+ DEFAULT_wxUSE_TIMEDATE=no
+ DEFAULT_wxUSE_TIMER=yes
+ DEFAULT_wxUSE_STOPWATCH=yes
DEFAULT_wxUSE_FILE=yes
+ DEFAULT_wxUSE_FFILE=yes
DEFAULT_wxUSE_TEXTFILE=yes
- DEFAULT_wxUSE_TIMEDATE=yes
DEFAULT_wxUSE_WAVE=no
DEFAULT_wxUSE_INTL=yes
DEFAULT_wxUSE_CONFIG=yes
+ DEFAULT_wxUSE_FONTMAP=yes
DEFAULT_wxUSE_STREAMS=yes
DEFAULT_wxUSE_SOCKETS=yes
DEFAULT_wxUSE_DIALUP_MANAGER=yes
DEFAULT_wxUSE_HELP=yes
DEFAULT_wxUSE_WXTREE=yes
DEFAULT_wxUSE_METAFILE=yes
+ DEFAULT_wxUSE_MIMETYPE=yes
DEFAULT_wxUSE_COMMONDLGS=yes
+ DEFAULT_wxUSE_CHOICEDLG=yes
+ DEFAULT_wxUSE_COLOURDLG=yes
DEFAULT_wxUSE_DIRDLG=yes
+ DEFAULT_wxUSE_FILEDLG=yes
+ DEFAULT_wxUSE_FONTDLG=yes
+ DEFAULT_wxUSE_MSGDLG=yes
+ DEFAULT_wxUSE_NUMBERDLG=yes
DEFAULT_wxUSE_TEXTDLG=yes
DEFAULT_wxUSE_STARTUP_TIPS=yes
DEFAULT_wxUSE_PROGRESSDLG=yes
+ DEFAULT_wxUSE_MENUS=yes
DEFAULT_wxUSE_MINIFRAME=yes
DEFAULT_wxUSE_HTML=yes
DEFAULT_wxUSE_FILESYSTEM=yes
DEFAULT_wxUSE_VALIDATORS=yes
DEFAULT_wxUSE_ACCEL=yes
- DEFAULT_wxUSE_CARET=yes
+ DEFAULT_wxUSE_BUTTON=yes
DEFAULT_wxUSE_BMPBUTTON=yes
+ DEFAULT_wxUSE_CALCTRL=yes
+ DEFAULT_wxUSE_CARET=yes
DEFAULT_wxUSE_CHECKBOX=yes
DEFAULT_wxUSE_CHECKLST=yes
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_STATBMP=yes
DEFAULT_wxUSE_STATBOX=yes
DEFAULT_wxUSE_STATLINE=yes
+ DEFAULT_wxUSE_STATTEXT=yes
DEFAULT_wxUSE_STATUSBAR=yes
DEFAULT_wxUSE_TABDIALOG=no
+ DEFAULT_wxUSE_TEXTCTRL=yes
DEFAULT_wxUSE_TOGGLEBTN=yes
DEFAULT_wxUSE_TOOLBAR=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
- echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6
-echo "configure:1577: checking "for --enable-gui"" >&5
+ echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
+echo "configure:1668: checking for --enable-gui" >&5
no_cache=0
# Check whether --enable-gui or --disable-gui was given.
if test "${enable_gui+set}" = set; then
if test "$wxUSE_GUI" = "yes"; then
+
+ echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6
+echo "configure:1710: checking for --enable-universal" >&5
+ no_cache=0
+ # Check whether --enable-universal or --disable-universal was given.
+if test "${enable_universal+set}" = set; then
+ enableval="$enable_universal"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_universal='wxUSE_UNIVERSAL=yes'
+ else
+ ac_cv_use_universal='wxUSE_UNIVERSAL=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_UNIVERSAL" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_universal='wxUSE_UNIVERSAL='$DEFAULT_wxUSE_UNIVERSAL
+
+fi
+
+
+ eval "$ac_cv_use_universal"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_universal >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_UNIVERSAL" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
# Check whether --with-gtk or --without-gtk was given.
if test "${with_gtk+set}" = set; then
withval="$with_gtk"
wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1
fi
+# Check whether --with-mgl or --without-mgl was given.
+if test "${with_mgl+set}" = set; then
+ withval="$with_mgl"
+ wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1
+fi
+
# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
if test "${with_gtk_prefix+set}" = set; then
- echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6
-echo "configure:1679: checking "for --with-libpng"" >&5
+ echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
+echo "configure:1815: checking for --with-libpng" >&5
no_cache=0
# Check whether --with-libpng or --without-libpng was given.
if test "${with_libpng+set}" = set; then
fi
- echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6
-echo "configure:1726: checking "for --with-libjpeg"" >&5
+ echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
+echo "configure:1862: checking for --with-libjpeg" >&5
no_cache=0
# Check whether --with-libjpeg or --without-libjpeg was given.
if test "${with_libjpeg+set}" = set; then
fi
- echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6
-echo "configure:1773: checking "for --with-libtiff"" >&5
+ echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
+echo "configure:1909: checking for --with-libtiff" >&5
no_cache=0
# Check whether --with-libtiff or --without-libtiff was given.
if test "${with_libtiff+set}" = set; then
fi
- echo $ac_n "checking "for --with-freetype"""... $ac_c" 1>&6
-echo "configure:1820: checking "for --with-freetype"" >&5
+ echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6
+echo "configure:1956: checking for --with-freetype" >&5
no_cache=0
# Check whether --with-freetype or --without-freetype was given.
if test "${with_freetype+set}" = set; then
fi
- echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6
-echo "configure:1867: checking "for --with-opengl"" >&5
+ echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
+echo "configure:2003: checking for --with-opengl" >&5
no_cache=0
# Check whether --with-opengl or --without-opengl was given.
if test "${with_opengl+set}" = set; then
fi
- echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6
-echo "configure:1909: checking "for --with-dmalloc"" >&5
+ echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
+echo "configure:2045: checking for --with-dmalloc" >&5
no_cache=0
# Check whether --with-dmalloc or --without-dmalloc was given.
if test "${with_dmalloc+set}" = set; then
fi
- echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6
-echo "configure:1948: checking "for --with-zlib"" >&5
+ echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
+echo "configure:2084: checking for --with-zlib" >&5
no_cache=0
# Check whether --with-zlib or --without-zlib was given.
if test "${with_zlib+set}" = set; then
fi
- echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6
-echo "configure:1995: checking "for --with-odbc"" >&5
+ echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
+echo "configure:2131: 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:2037: checking "for --enable-shared"" >&5
+ echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6
+echo "configure:2173: checking for --enable-shared" >&5
no_cache=0
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
fi
- echo $ac_n "checking "for --enable-burnt_name"""... $ac_c" 1>&6
-echo "configure:2076: checking "for --enable-burnt_name"" >&5
+ echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6
+echo "configure:2212: 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
fi
- echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6
-echo "configure:2115: checking "for --enable-optimise"" >&5
+ echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
+echo "configure:2251: checking for --enable-optimise" >&5
no_cache=0
# Check whether --enable-optimise or --disable-optimise was given.
if test "${enable_optimise+set}" = set; then
fi
- echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6
-echo "configure:2154: checking "for --enable-debug"" >&5
+ echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
+echo "configure:2290: checking for --enable-debug" >&5
no_cache=0
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
fi
- echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6
-echo "configure:2202: checking "for --enable-debug_flag"" >&5
+ echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6
+echo "configure:2338: 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
fi
- echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6
-echo "configure:2241: checking "for --enable-debug_info"" >&5
+ echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6
+echo "configure:2377: 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
fi
- echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6
-echo "configure:2280: checking "for --enable-debug_gdb"" >&5
+ echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6
+echo "configure:2416: 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
fi
- echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6
-echo "configure:2319: checking "for --enable-debug_cntxt"" >&5
+ echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6
+echo "configure:2455: 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
fi
- echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6
-echo "configure:2358: checking "for --enable-mem_tracing"" >&5
+ echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6
+echo "configure:2494: 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
fi
- echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6
-echo "configure:2397: checking "for --enable-profile"" >&5
+ echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
+echo "configure:2533: checking for --enable-profile" >&5
no_cache=0
# Check whether --enable-profile or --disable-profile was given.
if test "${enable_profile+set}" = set; then
fi
- echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6
-echo "configure:2436: checking "for --enable-no_rtti"" >&5
+ echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6
+echo "configure:2572: 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
fi
- echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6
-echo "configure:2475: checking "for --enable-no_exceptions"" >&5
+ echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6
+echo "configure:2611: 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
fi
- echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6
-echo "configure:2514: checking "for --enable-permissive"" >&5
+ echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
+echo "configure:2650: checking for --enable-permissive" >&5
no_cache=0
# Check whether --enable-permissive or --disable-permissive was given.
if test "${enable_permissive+set}" = set; then
fi
- echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6
-echo "configure:2553: checking "for --enable-no_deps"" >&5
+ echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6
+echo "configure:2689: 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:2594: checking "for --enable-intl"" >&5
+ echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6
+echo "configure:2730: checking for --enable-intl" >&5
no_cache=0
# Check whether --enable-intl or --disable-intl was given.
if test "${enable_intl+set}" = set; then
fi
- echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6
-echo "configure:2633: checking "for --enable-config"" >&5
+ echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
+echo "configure:2769: 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:2673: checking "for --enable-sockets"" >&5
+ echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
+echo "configure:2809: 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:2713: checking "for --enable-ipc"" >&5
+ echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
+echo "configure:2849: 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:2753: checking "for --enable-dialupman"" >&5
+ echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6
+echo "configure:2889: checking for --enable-cmdline" >&5
+ no_cache=0
+ # Check whether --enable-cmdline or --disable-cmdline was given.
+if test "${enable_cmdline+set}" = set; then
+ enableval="$enable_cmdline"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
+ else
+ ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER
+
+fi
+
+
+ eval "$ac_cv_use_cmdline"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_CMDLINE_PARSER" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
+echo "configure:2928: checking for --enable-datetime" >&5
+ no_cache=0
+ # Check whether --enable-datetime or --disable-datetime was given.
+if test "${enable_datetime+set}" = set; then
+ enableval="$enable_datetime"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_datetime='wxUSE_DATETIME=yes'
+ else
+ ac_cv_use_datetime='wxUSE_DATETIME=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME
+
+fi
+
+
+ eval "$ac_cv_use_datetime"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_DATETIME" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6
+echo "configure:2967: checking for --enable-timedate" >&5
+ no_cache=0
+ # Check whether --enable-timedate or --disable-timedate was given.
+if test "${enable_timedate+set}" = set; then
+ enableval="$enable_timedate"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_timedate='wxUSE_TIMEDATE=yes'
+ else
+ ac_cv_use_timedate='wxUSE_TIMEDATE=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_TIMEDATE" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_timedate='wxUSE_TIMEDATE='$DEFAULT_wxUSE_TIMEDATE
+
+fi
+
+
+ eval "$ac_cv_use_timedate"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_timedate >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_TIMEDATE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
+echo "configure:3006: checking for --enable-stopwatch" >&5
+ no_cache=0
+ # Check whether --enable-stopwatch or --disable-stopwatch was given.
+if test "${enable_stopwatch+set}" = set; then
+ enableval="$enable_stopwatch"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
+ else
+ ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
+
+fi
+
+
+ eval "$ac_cv_use_stopwatch"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_STOPWATCH" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
+echo "configure:3045: checking for --enable-dialupman" >&5
no_cache=0
# Check whether --enable-dialupman or --disable-dialupman was given.
if test "${enable_dialupman+set}" = set; then
fi
- echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6
-echo "configure:2792: checking "for --enable-apple_ieee"" >&5
+ echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6
+echo "configure:3084: 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
fi
- echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6
-echo "configure:2831: checking "for --enable-timedate"" >&5
+ echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6
+echo "configure:3123: checking for --enable-timer" >&5
no_cache=0
- # Check whether --enable-timedate or --disable-timedate was given.
-if test "${enable_timedate+set}" = set; then
- enableval="$enable_timedate"
+ # Check whether --enable-timer or --disable-timer was given.
+if test "${enable_timer+set}" = set; then
+ enableval="$enable_timer"
if test "$enableval" = yes; then
- ac_cv_use_timedate='wxUSE_TIMEDATE=yes'
+ ac_cv_use_timer='wxUSE_TIMER=yes'
else
- ac_cv_use_timedate='wxUSE_TIMEDATE=no'
+ ac_cv_use_timer='wxUSE_TIMER=no'
fi
else
- LINE=`grep "wxUSE_TIMEDATE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_timedate='wxUSE_TIMEDATE='$DEFAULT_wxUSE_TIMEDATE
+ ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
fi
- eval "$ac_cv_use_timedate"
+ eval "$ac_cv_use_timer"
if test "$no_cache" != 1; then
- echo $ac_cv_use_timedate >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TIMEDATE" = yes; then
+ if test "$wxUSE_TIMER" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6
-echo "configure:2870: checking "for --enable-wave"" >&5
+ echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6
+echo "configure:3162: checking for --enable-wave" >&5
no_cache=0
# Check whether --enable-wave or --disable-wave was given.
if test "${enable_wave+set}" = set; then
fi
- echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6
-echo "configure:2909: checking "for --enable-fraction"" >&5
+ echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6
+echo "configure:3201: checking for --enable-fraction" >&5
no_cache=0
# Check whether --enable-fraction or --disable-fraction was given.
if test "${enable_fraction+set}" = set; then
fi
- echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6
-echo "configure:2948: checking "for --enable-dynlib"" >&5
+ echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6
+echo "configure:3240: checking for --enable-dynlib" >&5
no_cache=0
# Check whether --enable-dynlib or --disable-dynlib was given.
if test "${enable_dynlib+set}" = set; then
fi
- echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6
-echo "configure:2987: checking "for --enable-longlong"" >&5
+ echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
+echo "configure:3279: checking for --enable-longlong" >&5
no_cache=0
# Check whether --enable-longlong or --disable-longlong was given.
if test "${enable_longlong+set}" = set; then
fi
- echo $ac_n "checking "for --enable-geometry"""... $ac_c" 1>&6
-echo "configure:3026: checking "for --enable-geometry"" >&5
+ echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
+echo "configure:3318: checking for --enable-geometry" >&5
no_cache=0
# Check whether --enable-geometry or --disable-geometry was given.
if test "${enable_geometry+set}" = set; then
fi
- echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6
-echo "configure:3065: checking "for --enable-log"" >&5
+ echo $ac_n "checking for --enable-log""... $ac_c" 1>&6
+echo "configure:3357: checking for --enable-log" >&5
no_cache=0
# Check whether --enable-log or --disable-log was given.
if test "${enable_log+set}" = set; then
fi
- echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6
-echo "configure:3104: checking "for --enable-streams"" >&5
+ echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
+echo "configure:3396: checking for --enable-streams" >&5
no_cache=0
# Check whether --enable-streams or --disable-streams was given.
if test "${enable_streams+set}" = set; then
fi
- echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6
-echo "configure:3143: checking "for --enable-file"" >&5
+ echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
+echo "configure:3435: checking for --enable-file" >&5
no_cache=0
# Check whether --enable-file or --disable-file was given.
if test "${enable_file+set}" = set; then
fi
- echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6
-echo "configure:3182: checking "for --enable-textfile"" >&5
+ echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
+echo "configure:3474: checking for --enable-ffile" >&5
no_cache=0
- # Check whether --enable-textfile or --disable-textfile was given.
-if test "${enable_textfile+set}" = set; then
- enableval="$enable_textfile"
+ # Check whether --enable-ffile or --disable-ffile was given.
+if test "${enable_ffile+set}" = set; then
+ enableval="$enable_ffile"
if test "$enableval" = yes; then
- ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
+ ac_cv_use_ffile='wxUSE_FFILE=yes'
else
- ac_cv_use_textfile='wxUSE_TEXTFILE=no'
+ ac_cv_use_ffile='wxUSE_FFILE=no'
fi
else
- LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
+ ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE
fi
- eval "$ac_cv_use_textfile"
+ eval "$ac_cv_use_ffile"
if test "$no_cache" != 1; then
- echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TEXTFILE" = yes; then
+ if test "$wxUSE_FFILE" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6
-echo "configure:3221: checking "for --enable-unicode"" >&5
+ echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6
+echo "configure:3513: checking for --enable-textfile" >&5
no_cache=0
- # Check whether --enable-unicode or --disable-unicode was given.
-if test "${enable_unicode+set}" = set; then
- enableval="$enable_unicode"
+ # Check whether --enable-textfile or --disable-textfile was given.
+if test "${enable_textfile+set}" = set; then
+ enableval="$enable_textfile"
if test "$enableval" = yes; then
- ac_cv_use_unicode='wxUSE_UNICODE=yes'
+ ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
else
- ac_cv_use_unicode='wxUSE_UNICODE=no'
+ ac_cv_use_textfile='wxUSE_TEXTFILE=no'
fi
else
- LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
+ ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
fi
- eval "$ac_cv_use_unicode"
+ eval "$ac_cv_use_textfile"
if test "$no_cache" != 1; then
- echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_UNICODE" = yes; then
+ if test "$wxUSE_TEXTFILE" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6
-echo "configure:3260: checking "for --enable-wcsrtombs"" >&5
+ echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
+echo "configure:3552: checking for --enable-fontmap" >&5
no_cache=0
- # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
-if test "${enable_wcsrtombs+set}" = set; then
- enableval="$enable_wcsrtombs"
+ # Check whether --enable-fontmap or --disable-fontmap was given.
+if test "${enable_fontmap+set}" = set; then
+ enableval="$enable_fontmap"
if test "$enableval" = yes; then
- ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=yes'
+ ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
else
- ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=no'
+ ac_cv_use_fontmap='wxUSE_FONTMAP=no'
fi
else
- LINE=`grep "wxUSE_WCSRTOMBS" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS='$DEFAULT_wxUSE_WCSRTOMBS
+ ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP
fi
- eval "$ac_cv_use_wcsrtombs"
+ eval "$ac_cv_use_fontmap"
if test "$no_cache" != 1; then
- echo $ac_cv_use_wcsrtombs >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_WCSRTOMBS" = yes; then
+ if test "$wxUSE_FONTMAP" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6
-echo "configure:3299: checking "for --enable-wxprintfv"" >&5
+ echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6
+echo "configure:3591: checking for --enable-unicode" >&5
no_cache=0
- # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
-if test "${enable_wxprintfv+set}" = set; then
- enableval="$enable_wxprintfv"
+ # Check whether --enable-unicode or --disable-unicode was given.
+if test "${enable_unicode+set}" = set; then
+ enableval="$enable_unicode"
if test "$enableval" = yes; then
- ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
+ ac_cv_use_unicode='wxUSE_UNICODE=yes'
else
- ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
+ ac_cv_use_unicode='wxUSE_UNICODE=no'
fi
else
- LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF
+ ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
+
+fi
+
+
+ eval "$ac_cv_use_unicode"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_UNICODE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-wcsrtombs""... $ac_c" 1>&6
+echo "configure:3630: checking for --enable-wcsrtombs" >&5
+ no_cache=0
+ # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
+if test "${enable_wcsrtombs+set}" = set; then
+ enableval="$enable_wcsrtombs"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=yes'
+ else
+ ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_WCSRTOMBS" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS='$DEFAULT_wxUSE_WCSRTOMBS
+
+fi
+
+
+ eval "$ac_cv_use_wcsrtombs"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_wcsrtombs >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_WCSRTOMBS" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
+echo "configure:3669: checking for --enable-wxprintfv" >&5
+ no_cache=0
+ # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
+if test "${enable_wxprintfv+set}" = set; then
+ enableval="$enable_wxprintfv"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
+ else
+ ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF
fi
fi
- echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6
-echo "configure:3338: checking "for --enable-std_iostreams"" >&5
+ echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
+echo "configure:3708: 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
fi
- echo $ac_n "checking "for --enable-filesystem"""... $ac_c" 1>&6
-echo "configure:3377: checking "for --enable-filesystem"" >&5
+ echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
+echo "configure:3747: checking for --enable-filesystem" >&5
no_cache=0
# Check whether --enable-filesystem or --disable-filesystem was given.
if test "${enable_filesystem+set}" = set; then
fi
- echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6
-echo "configure:3416: checking "for --enable-fs_inet"" >&5
+ echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
+echo "configure:3786: 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
fi
- echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6
-echo "configure:3455: checking "for --enable-fs_zip"" >&5
+ echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
+echo "configure:3825: 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
fi
- echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6
-echo "configure:3494: checking "for --enable-zipstream"" >&5
+ echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
+echo "configure:3864: 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:3534: checking "for --enable-catch_segvs"" >&5
+ echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6
+echo "configure:3904: 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
fi
- echo $ac_n "checking "for --enable-snglinst"""... $ac_c" 1>&6
-echo "configure:3573: checking "for --enable-snglinst"" >&5
+ echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
+echo "configure:3943: checking for --enable-snglinst" >&5
no_cache=0
# Check whether --enable-snglinst or --disable-snglinst was given.
if test "${enable_snglinst+set}" = set; then
+ echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6
+echo "configure:3983: checking for --enable-mimetype" >&5
+ no_cache=0
+ # Check whether --enable-mimetype or --disable-mimetype was given.
+if test "${enable_mimetype+set}" = set; then
+ enableval="$enable_mimetype"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
+ else
+ ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
+
+fi
+
+
+ eval "$ac_cv_use_mimetype"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_MIMETYPE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+
- echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6
-echo "configure:3614: checking "for --enable-threads"" >&5
+ echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6
+echo "configure:4024: checking for --enable-threads" >&5
no_cache=0
# Check whether --enable-threads or --disable-threads was given.
if test "${enable_threads+set}" = set; then
fi
- echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6
-echo "configure:3653: checking "for --enable-serial"" >&5
+ echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6
+echo "configure:4063: 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:3696: checking "for --enable-docview"" >&5
+ echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
+echo "configure:4106: checking for --enable-docview" >&5
no_cache=0
# Check whether --enable-docview or --disable-docview was given.
if test "${enable_docview+set}" = set; then
fi
- echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6
-echo "configure:3735: checking "for --enable-help"" >&5
+ echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
+echo "configure:4145: checking for --enable-help" >&5
no_cache=0
# Check whether --enable-help or --disable-help was given.
if test "${enable_help+set}" = set; then
fi
- echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6
-echo "configure:3774: checking "for --enable-constraints"" >&5
+ echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6
+echo "configure:4184: checking for --enable-constraints" >&5
no_cache=0
# Check whether --enable-constraints or --disable-constraints was given.
if test "${enable_constraints+set}" = set; then
fi
- echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6
-echo "configure:3813: checking "for --enable-printarch"" >&5
+ echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
+echo "configure:4223: checking for --enable-printarch" >&5
no_cache=0
# Check whether --enable-printarch or --disable-printarch was given.
if test "${enable_printarch+set}" = set; then
fi
- echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6
-echo "configure:3852: checking "for --enable-mdi"" >&5
+ echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
+echo "configure:4262: checking for --enable-mdi" >&5
no_cache=0
# Check whether --enable-mdi or --disable-mdi was given.
if test "${enable_mdi+set}" = set; then
fi
+ echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
+echo "configure:4301: checking for --enable-loggui" >&5
+ no_cache=0
+ # Check whether --enable-loggui or --disable-loggui was given.
+if test "${enable_loggui+set}" = set; then
+ enableval="$enable_loggui"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_loggui='wxUSE_LOGGUI=yes'
+ else
+ ac_cv_use_loggui='wxUSE_LOGGUI=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI
+
+fi
+
+
+ eval "$ac_cv_use_loggui"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_LOGGUI" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6
+echo "configure:4340: checking for --enable-logwin" >&5
+ no_cache=0
+ # Check whether --enable-logwin or --disable-logwin was given.
+if test "${enable_logwin+set}" = set; then
+ enableval="$enable_logwin"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_logwin='wxUSE_LOGWINDOW=yes'
+ else
+ ac_cv_use_logwin='wxUSE_LOGWINDOW=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW
+
+fi
+
+
+ eval "$ac_cv_use_logwin"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_LOGWINDOW" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
- echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6
-echo "configure:3892: checking "for --enable-postscript"" >&5
+ echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6
+echo "configure:4380: 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:3933: checking "for --enable-prologio"" >&5
+
+ echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6
+echo "configure:4422: checking for --enable-prologio" >&5
no_cache=0
# Check whether --enable-prologio or --disable-prologio was given.
if test "${enable_prologio+set}" = set; then
fi
- echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6
-echo "configure:3972: checking "for --enable-resources"" >&5
+ echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
+echo "configure:4461: 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:4012: checking "for --enable-xresources"" >&5
+ echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6
+echo "configure:4501: 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:4053: checking "for --enable-clipboard"" >&5
+ echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6
+echo "configure:4542: checking for --enable-clipboard" >&5
no_cache=0
# Check whether --enable-clipboard or --disable-clipboard was given.
if test "${enable_clipboard+set}" = set; then
fi
- echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6
-echo "configure:4092: checking "for --enable-dnd"" >&5
+ echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
+echo "configure:4581: checking for --enable-dnd" >&5
no_cache=0
# Check whether --enable-dnd or --disable-dnd was given.
if test "${enable_dnd+set}" = set; then
fi
- echo $ac_n "checking "for --enable-metafile"""... $ac_c" 1>&6
-echo "configure:4131: checking "for --enable-metafile"" >&5
+ echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:4620: 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:4171: checking "for --enable-wxtree"" >&5
+ echo $ac_n "checking for --enable-wxtree""... $ac_c" 1>&6
+echo "configure:4660: 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:4212: checking "for --enable-controls"" >&5
+ echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
+echo "configure:4701: checking for --enable-controls" >&5
no_cache=0
# Check whether --enable-controls or --disable-controls was given.
if test "${enable_controls+set}" = set; then
if test "$wxUSE_CONTROLS" = "yes"; then
DEFAULT_wxUSE_ACCEL=yes
+ DEFAULT_wxUSE_BMPBUTTON=yes
+ DEFAULT_wxUSE_BUTTON=yes
+ DEFAULT_wxUSE_CALCTRL=no
DEFAULT_wxUSE_CARET=yes
DEFAULT_wxUSE_COMBOBOX=yes
- DEFAULT_wxUSE_BMPBUTTON=yes
DEFAULT_wxUSE_CHECKBOX=yes
DEFAULT_wxUSE_CHECKLISTBOX=yes
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_TREECTRL=yes
elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_ACCEL=no
+ DEFAULT_wxUSE_BMPBUTTON=no
+ DEFAULT_wxUSE_BUTTON=no
+ DEFAULT_wxUSE_CALCTRL=no
DEFAULT_wxUSE_CARET=no
DEFAULT_wxUSE_COMBOBOX=no
- DEFAULT_wxUSE_BMPBUTTON=no
DEFAULT_wxUSE_CHECKBOX=no
DEFAULT_wxUSE_CHECKLISTBOX=no
DEFAULT_wxUSE_CHOICE=no
fi
- echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6
-echo "configure:4322: checking "for --enable-accel"" >&5
+ echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
+echo "configure:4815: checking for --enable-accel" >&5
no_cache=0
# Check whether --enable-accel or --disable-accel was given.
if test "${enable_accel+set}" = set; then
fi
- echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6
-echo "configure:4361: checking "for --enable-caret"" >&5
+ echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
+echo "configure:4854: checking for --enable-button" >&5
no_cache=0
- # Check whether --enable-caret or --disable-caret was given.
-if test "${enable_caret+set}" = set; then
- enableval="$enable_caret"
+ # Check whether --enable-button or --disable-button was given.
+if test "${enable_button+set}" = set; then
+ enableval="$enable_button"
if test "$enableval" = yes; then
- ac_cv_use_caret='wxUSE_CARET=yes'
+ ac_cv_use_button='wxUSE_BUTTON=yes'
else
- ac_cv_use_caret='wxUSE_CARET=no'
+ ac_cv_use_button='wxUSE_BUTTON=no'
fi
else
- LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
+ ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON
fi
- eval "$ac_cv_use_caret"
+ eval "$ac_cv_use_button"
if test "$no_cache" != 1; then
- echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_CARET" = yes; then
+ if test "$wxUSE_BUTTON" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6
-echo "configure:4400: checking "for --enable-bmpbutton"" >&5
+ echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6
+echo "configure:4893: checking for --enable-bmpbutton" >&5
no_cache=0
# Check whether --enable-bmpbutton or --disable-bmpbutton was given.
if test "${enable_bmpbutton+set}" = set; then
fi
- echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6
-echo "configure:4439: checking "for --enable-checkbox"" >&5
+ echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
+echo "configure:4932: checking for --enable-calendar" >&5
+ no_cache=0
+ # Check whether --enable-calendar or --disable-calendar was given.
+if test "${enable_calendar+set}" = set; then
+ enableval="$enable_calendar"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_calendar='wxUSE_CALCTRL=yes'
+ else
+ ac_cv_use_calendar='wxUSE_CALCTRL=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_CALCTRL" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_calendar='wxUSE_CALCTRL='$DEFAULT_wxUSE_CALCTRL
+
+fi
+
+
+ eval "$ac_cv_use_calendar"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_calendar >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_CALCTRL" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6
+echo "configure:4971: checking for --enable-caret" >&5
+ no_cache=0
+ # Check whether --enable-caret or --disable-caret was given.
+if test "${enable_caret+set}" = set; then
+ enableval="$enable_caret"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_caret='wxUSE_CARET=yes'
+ else
+ ac_cv_use_caret='wxUSE_CARET=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
+
+fi
+
+
+ eval "$ac_cv_use_caret"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_CARET" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6
+echo "configure:5010: checking for --enable-checkbox" >&5
no_cache=0
# Check whether --enable-checkbox or --disable-checkbox was given.
if test "${enable_checkbox+set}" = set; then
fi
- echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6
-echo "configure:4478: checking "for --enable-checklst"" >&5
+ echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
+echo "configure:5049: checking for --enable-checklst" >&5
no_cache=0
# Check whether --enable-checklst or --disable-checklst was given.
if test "${enable_checklst+set}" = set; then
fi
- echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6
-echo "configure:4517: checking "for --enable-choice"" >&5
+ echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
+echo "configure:5088: checking for --enable-choice" >&5
no_cache=0
# Check whether --enable-choice or --disable-choice was given.
if test "${enable_choice+set}" = set; then
fi
- echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6
-echo "configure:4556: checking "for --enable-combobox"" >&5
+ echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
+echo "configure:5127: checking for --enable-combobox" >&5
no_cache=0
# Check whether --enable-combobox or --disable-combobox was given.
if test "${enable_combobox+set}" = set; then
fi
- echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6
-echo "configure:4595: checking "for --enable-gauge"" >&5
+ echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
+echo "configure:5166: checking for --enable-gauge" >&5
no_cache=0
# Check whether --enable-gauge or --disable-gauge was given.
if test "${enable_gauge+set}" = set; then
fi
- echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6
-echo "configure:4634: checking "for --enable-grid"" >&5
+ echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
+echo "configure:5205: checking for --enable-grid" >&5
no_cache=0
# Check whether --enable-grid or --disable-grid was given.
if test "${enable_grid+set}" = set; then
fi
- echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6
-echo "configure:4673: checking "for --enable-newgrid"" >&5
+ echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
+echo "configure:5244: checking for --enable-newgrid" >&5
no_cache=0
# Check whether --enable-newgrid or --disable-newgrid was given.
if test "${enable_newgrid+set}" = set; then
fi
- echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6
-echo "configure:4712: checking "for --enable-imaglist"" >&5
+ echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
+echo "configure:5283: checking for --enable-imaglist" >&5
no_cache=0
# Check whether --enable-imaglist or --disable-imaglist was given.
if test "${enable_imaglist+set}" = set; then
fi
- echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6
-echo "configure:4751: checking "for --enable-listbox"" >&5
+ echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
+echo "configure:5322: checking for --enable-listbox" >&5
no_cache=0
# Check whether --enable-listbox or --disable-listbox was given.
if test "${enable_listbox+set}" = set; then
fi
- echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6
-echo "configure:4790: checking "for --enable-listctrl"" >&5
+ echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
+echo "configure:5361: checking for --enable-listctrl" >&5
no_cache=0
# Check whether --enable-listctrl or --disable-listctrl was given.
if test "${enable_listctrl+set}" = set; then
fi
- echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6
-echo "configure:4829: checking "for --enable-notebook"" >&5
+ echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
+echo "configure:5400: checking for --enable-notebook" >&5
no_cache=0
# Check whether --enable-notebook or --disable-notebook was given.
if test "${enable_notebook+set}" = set; then
fi
- echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6
-echo "configure:4868: checking "for --enable-radiobox"" >&5
+ echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
+echo "configure:5439: checking for --enable-radiobox" >&5
no_cache=0
# Check whether --enable-radiobox or --disable-radiobox was given.
if test "${enable_radiobox+set}" = set; then
fi
- echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6
-echo "configure:4907: checking "for --enable-radiobtn"" >&5
+ echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
+echo "configure:5478: checking for --enable-radiobtn" >&5
no_cache=0
# Check whether --enable-radiobtn or --disable-radiobtn was given.
if test "${enable_radiobtn+set}" = set; then
fi
- echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6
-echo "configure:4946: checking "for --enable-sash"" >&5
+ echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
+echo "configure:5517: checking for --enable-sash" >&5
no_cache=0
# Check whether --enable-sash or --disable-sash was given.
if test "${enable_sash+set}" = set; then
fi
- echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6
-echo "configure:4985: checking "for --enable-scrollbar"" >&5
+ echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
+echo "configure:5556: checking for --enable-scrollbar" >&5
no_cache=0
# Check whether --enable-scrollbar or --disable-scrollbar was given.
if test "${enable_scrollbar+set}" = set; then
fi
- echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6
-echo "configure:5024: checking "for --enable-slider"" >&5
+ echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
+echo "configure:5595: checking for --enable-slider" >&5
no_cache=0
# Check whether --enable-slider or --disable-slider was given.
if test "${enable_slider+set}" = set; then
fi
- echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6
-echo "configure:5063: checking "for --enable-spinbtn"" >&5
+ echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
+echo "configure:5634: checking for --enable-spinbtn" >&5
no_cache=0
# Check whether --enable-spinbtn or --disable-spinbtn was given.
if test "${enable_spinbtn+set}" = set; then
fi
- echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6
-echo "configure:5102: checking "for --enable-spinctrl"" >&5
+ echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
+echo "configure:5673: checking for --enable-spinctrl" >&5
no_cache=0
# Check whether --enable-spinctrl or --disable-spinctrl was given.
if test "${enable_spinctrl+set}" = set; then
fi
- echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6
-echo "configure:5141: checking "for --enable-splitter"" >&5
+ echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
+echo "configure:5712: checking for --enable-splitter" >&5
no_cache=0
# Check whether --enable-splitter or --disable-splitter was given.
if test "${enable_splitter+set}" = set; then
fi
- echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6
-echo "configure:5180: checking "for --enable-statbmp"" >&5
+ echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
+echo "configure:5751: checking for --enable-statbmp" >&5
no_cache=0
# Check whether --enable-statbmp or --disable-statbmp was given.
if test "${enable_statbmp+set}" = set; then
else
- LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP
+
+fi
+
+
+ eval "$ac_cv_use_statbmp"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_STATBMP" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
+echo "configure:5790: checking for --enable-statbox" >&5
+ no_cache=0
+ # Check whether --enable-statbox or --disable-statbox was given.
+if test "${enable_statbox+set}" = set; then
+ enableval="$enable_statbox"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_statbox='wxUSE_STATBOX=yes'
+ else
+ ac_cv_use_statbox='wxUSE_STATBOX=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
+
+fi
+
+
+ eval "$ac_cv_use_statbox"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_STATBOX" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6
+echo "configure:5829: checking for --enable-statline" >&5
+ no_cache=0
+ # Check whether --enable-statline or --disable-statline was given.
+if test "${enable_statline+set}" = set; then
+ enableval="$enable_statline"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_statline='wxUSE_STATLINE=yes'
+ else
+ ac_cv_use_statline='wxUSE_STATLINE=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
+
+fi
+
+
+ eval "$ac_cv_use_statline"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_STATLINE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6
+echo "configure:5868: checking for --enable-stattext" >&5
+ no_cache=0
+ # Check whether --enable-stattext or --disable-stattext was given.
+if test "${enable_stattext+set}" = set; then
+ enableval="$enable_stattext"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_stattext='wxUSE_STATTEXT=yes'
+ else
+ ac_cv_use_stattext='wxUSE_STATTEXT=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT
+
+fi
+
+
+ eval "$ac_cv_use_stattext"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_STATTEXT" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6
+echo "configure:5907: checking for --enable-statusbar" >&5
+ no_cache=0
+ # Check whether --enable-statusbar or --disable-statusbar was given.
+if test "${enable_statusbar+set}" = set; then
+ enableval="$enable_statusbar"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
+ else
+ ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
+
+fi
+
+
+ eval "$ac_cv_use_statusbar"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_STATUSBAR" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6
+echo "configure:5946: checking for --enable-tabdialog" >&5
+ no_cache=0
+ # Check whether --enable-tabdialog or --disable-tabdialog was given.
+if test "${enable_tabdialog+set}" = set; then
+ enableval="$enable_tabdialog"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes'
+ else
+ ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
+
+fi
+
+
+ eval "$ac_cv_use_tabdialog"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_TABDIALOG" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6
+echo "configure:5985: checking for --enable-textctrl" >&5
+ no_cache=0
+ # Check whether --enable-textctrl or --disable-textctrl was given.
+if test "${enable_textctrl+set}" = set; then
+ enableval="$enable_textctrl"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
+ else
+ ac_cv_use_textctrl='wxUSE_TEXTCTRL=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL
+
+fi
+
+
+ eval "$ac_cv_use_textctrl"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_TEXTCTRL" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6
+echo "configure:6024: 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:6063: checking for --enable-toolbar" >&5
+ no_cache=0
+ # Check whether --enable-toolbar or --disable-toolbar was given.
+if test "${enable_toolbar+set}" = set; then
+ enableval="$enable_toolbar"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+ else
+ ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP
+ ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
fi
- eval "$ac_cv_use_statbmp"
+ eval "$ac_cv_use_toolbar"
if test "$no_cache" != 1; then
- echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STATBMP" = yes; then
+ if test "$wxUSE_TOOLBAR" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6
-echo "configure:5219: checking "for --enable-statbox"" >&5
+ echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6
+echo "configure:6102: checking for --enable-tbarnative" >&5
no_cache=0
- # Check whether --enable-statbox or --disable-statbox was given.
-if test "${enable_statbox+set}" = set; then
- enableval="$enable_statbox"
+ # Check whether --enable-tbarnative or --disable-tbarnative was given.
+if test "${enable_tbarnative+set}" = set; then
+ enableval="$enable_tbarnative"
if test "$enableval" = yes; then
- ac_cv_use_statbox='wxUSE_STATBOX=yes'
+ ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
else
- ac_cv_use_statbox='wxUSE_STATBOX=no'
+ ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
fi
else
- LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
+ ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
fi
- eval "$ac_cv_use_statbox"
+ eval "$ac_cv_use_tbarnative"
if test "$no_cache" != 1; then
- echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STATBOX" = yes; then
+ if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6
-echo "configure:5258: checking "for --enable-statline"" >&5
+ echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6
+echo "configure:6141: checking for --enable-tbarsmpl" >&5
no_cache=0
- # Check whether --enable-statline or --disable-statline was given.
-if test "${enable_statline+set}" = set; then
- enableval="$enable_statline"
+ # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
+if test "${enable_tbarsmpl+set}" = set; then
+ enableval="$enable_tbarsmpl"
if test "$enableval" = yes; then
- ac_cv_use_statline='wxUSE_STATLINE=yes'
+ ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
else
- ac_cv_use_statline='wxUSE_STATLINE=no'
+ ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
fi
else
- LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
+ ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
fi
- eval "$ac_cv_use_statline"
+ eval "$ac_cv_use_tbarsmpl"
if test "$no_cache" != 1; then
- echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STATLINE" = yes; then
+ if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6
-echo "configure:5297: checking "for --enable-statusbar"" >&5
+ echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6
+echo "configure:6180: checking for --enable-treectrl" >&5
no_cache=0
- # Check whether --enable-statusbar or --disable-statusbar was given.
-if test "${enable_statusbar+set}" = set; then
- enableval="$enable_statusbar"
+ # Check whether --enable-treectrl or --disable-treectrl was given.
+if test "${enable_treectrl+set}" = set; then
+ enableval="$enable_treectrl"
if test "$enableval" = yes; then
- ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
+ ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
else
- ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
+ ac_cv_use_treectrl='wxUSE_TREECTRL=no'
fi
else
- LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
+ ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
fi
- eval "$ac_cv_use_statusbar"
+ eval "$ac_cv_use_treectrl"
if test "$no_cache" != 1; then
- echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STATUSBAR" = yes; then
+ if test "$wxUSE_TREECTRL" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6
-echo "configure:5336: checking "for --enable-tabdialog"" >&5
+
+
+ echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6
+echo "configure:6221: checking for --enable-commondlg" >&5
no_cache=0
- # Check whether --enable-tabdialog or --disable-tabdialog was given.
-if test "${enable_tabdialog+set}" = set; then
- enableval="$enable_tabdialog"
+ # Check whether --enable-commondlg or --disable-commondlg was given.
+if test "${enable_commondlg+set}" = set; then
+ enableval="$enable_commondlg"
if test "$enableval" = yes; then
- ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes'
+ ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
else
- ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
+ ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
fi
else
- LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
+ ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
fi
- eval "$ac_cv_use_tabdialog"
+ eval "$ac_cv_use_commondlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TABDIALOG" = yes; then
+ if test "$wxUSE_COMMONDLGS" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-togglebtn"""... $ac_c" 1>&6
-echo "configure:5375: checking "for --enable-togglebtn"" >&5
+ echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6
+echo "configure:6260: checking for --enable-choicedlg" >&5
no_cache=0
- # Check whether --enable-togglebtn or --disable-togglebtn was given.
-if test "${enable_togglebtn+set}" = set; then
- enableval="$enable_togglebtn"
+ # Check whether --enable-choicedlg or --disable-choicedlg was given.
+if test "${enable_choicedlg+set}" = set; then
+ enableval="$enable_choicedlg"
if test "$enableval" = yes; then
- ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
+ ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
else
- ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
+ ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
fi
else
- LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_CHOICEDLG" ${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
+ ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG
fi
- eval "$ac_cv_use_togglebtn"
+ eval "$ac_cv_use_choicedlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TOGGLEBTN" = yes; then
+ if test "$wxUSE_CHOICEDLG" = 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:5414: checking "for --enable-toolbar"" >&5
+ echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6
+echo "configure:6299: checking for --enable-coldlg" >&5
no_cache=0
- # Check whether --enable-toolbar or --disable-toolbar was given.
-if test "${enable_toolbar+set}" = set; then
- enableval="$enable_toolbar"
+ # Check whether --enable-coldlg or --disable-coldlg was given.
+if test "${enable_coldlg+set}" = set; then
+ enableval="$enable_coldlg"
if test "$enableval" = yes; then
- ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+ ac_cv_use_coldlg='wxUSE_COLOURDLG=yes'
else
- ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
+ ac_cv_use_coldlg='wxUSE_COLOURDLG=no'
fi
else
- LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
+ ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG
fi
- eval "$ac_cv_use_toolbar"
+ eval "$ac_cv_use_coldlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TOOLBAR" = yes; then
+ if test "$wxUSE_COLOURDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6
-echo "configure:5453: checking "for --enable-tbarnative"" >&5
+ echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
+echo "configure:6338: checking for --enable-filedlg" >&5
no_cache=0
- # Check whether --enable-tbarnative or --disable-tbarnative was given.
-if test "${enable_tbarnative+set}" = set; then
- enableval="$enable_tbarnative"
+ # Check whether --enable-filedlg or --disable-filedlg was given.
+if test "${enable_filedlg+set}" = set; then
+ enableval="$enable_filedlg"
if test "$enableval" = yes; then
- ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+ ac_cv_use_filedlg='wxUSE_FILEDLG=yes'
else
- ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+ ac_cv_use_filedlg='wxUSE_FILEDLG=no'
fi
else
- LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
+ ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG
fi
- eval "$ac_cv_use_tbarnative"
+ eval "$ac_cv_use_filedlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
+ if test "$wxUSE_FILEDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-tbarsmpl"""... $ac_c" 1>&6
-echo "configure:5492: checking "for --enable-tbarsmpl"" >&5
+ echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6
+echo "configure:6377: checking for --enable-fontdlg" >&5
no_cache=0
- # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
-if test "${enable_tbarsmpl+set}" = set; then
- enableval="$enable_tbarsmpl"
+ # Check whether --enable-fontdlg or --disable-fontdlg was given.
+if test "${enable_fontdlg+set}" = set; then
+ enableval="$enable_fontdlg"
if test "$enableval" = yes; then
- ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
+ ac_cv_use_fontdlg='wxUSE_FONTDLG=yes'
else
- ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
+ ac_cv_use_fontdlg='wxUSE_FONTDLG=no'
fi
else
- LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
+ ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG
fi
- eval "$ac_cv_use_tbarsmpl"
+ eval "$ac_cv_use_fontdlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
+ if test "$wxUSE_FONTDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6
-echo "configure:5531: checking "for --enable-treectrl"" >&5
+ echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6
+echo "configure:6416: checking for --enable-dirdlg" >&5
no_cache=0
- # Check whether --enable-treectrl or --disable-treectrl was given.
-if test "${enable_treectrl+set}" = set; then
- enableval="$enable_treectrl"
+ # Check whether --enable-dirdlg or --disable-dirdlg was given.
+if test "${enable_dirdlg+set}" = set; then
+ enableval="$enable_dirdlg"
if test "$enableval" = yes; then
- ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
+ ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
else
- ac_cv_use_treectrl='wxUSE_TREECTRL=no'
+ ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
fi
else
- LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
+ ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
fi
- eval "$ac_cv_use_treectrl"
+ eval "$ac_cv_use_dirdlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TREECTRL" = yes; then
+ if test "$wxUSE_DIRDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
-
-
- echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6
-echo "configure:5572: checking "for --enable-commondlg"" >&5
+ echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
+echo "configure:6455: checking for --enable-msgdlg" >&5
no_cache=0
- # Check whether --enable-commondlg or --disable-commondlg was given.
-if test "${enable_commondlg+set}" = set; then
- enableval="$enable_commondlg"
+ # Check whether --enable-msgdlg or --disable-msgdlg was given.
+if test "${enable_msgdlg+set}" = set; then
+ enableval="$enable_msgdlg"
if test "$enableval" = yes; then
- ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
+ ac_cv_use_msgdlg='wxUSE_MSGDLG=yes'
else
- ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
+ ac_cv_use_msgdlg='wxUSE_MSGDLG=no'
fi
else
- LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
+ ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG
fi
- eval "$ac_cv_use_commondlg"
+ eval "$ac_cv_use_msgdlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_COMMONDLGS" = yes; then
+ if test "$wxUSE_MSGDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6
-echo "configure:5611: checking "for --enable-dirdlg"" >&5
+ echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
+echo "configure:6494: checking for --enable-numberdlg" >&5
no_cache=0
- # Check whether --enable-dirdlg or --disable-dirdlg was given.
-if test "${enable_dirdlg+set}" = set; then
- enableval="$enable_dirdlg"
+ # Check whether --enable-numberdlg or --disable-numberdlg was given.
+if test "${enable_numberdlg+set}" = set; then
+ enableval="$enable_numberdlg"
if test "$enableval" = yes; then
- ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
+ ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
else
- ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
+ ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
fi
else
- LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
+ ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG
fi
- eval "$ac_cv_use_dirdlg"
+ eval "$ac_cv_use_numberdlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_DIRDLG" = yes; then
+ if test "$wxUSE_NUMBERDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6
-echo "configure:5650: checking "for --enable-textdlg"" >&5
+ echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6
+echo "configure:6533: checking for --enable-textdlg" >&5
no_cache=0
# Check whether --enable-textdlg or --disable-textdlg was given.
if test "${enable_textdlg+set}" = set; then
fi
- echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6
-echo "configure:5689: checking "for --enable-tipdlg"" >&5
+ echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
+echo "configure:6572: checking for --enable-tipdlg" >&5
no_cache=0
# Check whether --enable-tipdlg or --disable-tipdlg was given.
if test "${enable_tipdlg+set}" = set; then
fi
- echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6
-echo "configure:5728: checking "for --enable-progressdlg"" >&5
+ echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
+echo "configure:6611: checking for --enable-progressdlg" >&5
no_cache=0
# Check whether --enable-progressdlg or --disable-progressdlg was given.
if test "${enable_progressdlg+set}" = set; then
fi
- echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6
-echo "configure:5767: checking "for --enable-miniframe"" >&5
+ echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6
+echo "configure:6650: checking for --enable-menus" >&5
+ no_cache=0
+ # Check whether --enable-menus or --disable-menus was given.
+if test "${enable_menus+set}" = set; then
+ enableval="$enable_menus"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_menus='wxUSE_MENUS=yes'
+ else
+ ac_cv_use_menus='wxUSE_MENUS=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS
+
+fi
+
+
+ eval "$ac_cv_use_menus"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_MENUS" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6
+echo "configure:6689: checking for --enable-miniframe" >&5
no_cache=0
# Check whether --enable-miniframe or --disable-miniframe was given.
if test "${enable_miniframe+set}" = set; then
fi
- echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6
-echo "configure:5806: checking "for --enable-html"" >&5
+ echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
+echo "configure:6728: checking for --enable-html" >&5
no_cache=0
# Check whether --enable-html or --disable-html was given.
if test "${enable_html+set}" = set; then
fi
- echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6
-echo "configure:5845: checking "for --enable-tooltips"" >&5
+ echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6
+echo "configure:6767: checking for --enable-tooltips" >&5
no_cache=0
# Check whether --enable-tooltips or --disable-tooltips was given.
if test "${enable_tooltips+set}" = set; then
fi
- echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6
-echo "configure:5884: checking "for --enable-splines"" >&5
+ echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
+echo "configure:6806: checking for --enable-splines" >&5
no_cache=0
# Check whether --enable-splines or --disable-splines was given.
if test "${enable_splines+set}" = set; then
fi
- echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6
-echo "configure:5923: checking "for --enable-validators"" >&5
+ echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
+echo "configure:6845: checking for --enable-validators" >&5
no_cache=0
# Check whether --enable-validators or --disable-validators was given.
if test "${enable_validators+set}" = set; then
fi
- echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6
-echo "configure:5962: checking "for --enable-busyinfo"" >&5
+ echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
+echo "configure:6884: checking for --enable-busyinfo" >&5
no_cache=0
# Check whether --enable-busyinfo or --disable-busyinfo was given.
if test "${enable_busyinfo+set}" = set; then
fi
- echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6
-echo "configure:6001: checking "for --enable-joystick"" >&5
+ echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
+echo "configure:6923: checking for --enable-joystick" >&5
no_cache=0
# Check whether --enable-joystick or --disable-joystick was given.
if test "${enable_joystick+set}" = set; then
fi
+ echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:6962: checking for --enable-metafile" >&5
+ no_cache=0
+ # Check whether --enable-metafile or --disable-metafile was given.
+if test "${enable_metafile+set}" = set; then
+ enableval="$enable_metafile"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_metafile='wxUSE_METAFILE=yes'
+ else
+ ac_cv_use_metafile='wxUSE_METAFILE=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
+
+fi
+
+
+ eval "$ac_cv_use_metafile"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_METAFILE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
- echo $ac_n "checking "for --enable-image"""... $ac_c" 1>&6
-echo "configure:6042: checking "for --enable-image"" >&5
+ echo $ac_n "checking for --enable-image""... $ac_c" 1>&6
+echo "configure:7003: checking for --enable-image" >&5
no_cache=0
# Check whether --enable-image or --disable-image was given.
if test "${enable_image+set}" = set; then
fi
- echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6
-echo "configure:6081: checking "for --enable-gif"" >&5
+ echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
+echo "configure:7042: checking for --enable-gif" >&5
no_cache=0
# Check whether --enable-gif or --disable-gif was given.
if test "${enable_gif+set}" = set; then
fi
- echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6
-echo "configure:6120: checking "for --enable-pcx"" >&5
+ echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
+echo "configure:7081: checking for --enable-pcx" >&5
no_cache=0
# Check whether --enable-pcx or --disable-pcx was given.
if test "${enable_pcx+set}" = set; then
fi
- echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6
-echo "configure:6159: checking "for --enable-pnm"" >&5
+ echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7120: 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:6198: checking "for --enable-pnm"" >&5
+ echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7159: checking for --enable-pnm" >&5
no_cache=0
# Check whether --enable-pnm or --disable-pnm was given.
if test "${enable_pnm+set}" = set; then
echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:6245: checking for toolkit" >&5
+echo "configure:7206: checking for toolkit" >&5
if test "$wxUSE_GUI" = "yes"; then
done
fi
-NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
+NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_MGL:-0}`
case "${host}" in
*-pc-os2_emx )
echo "$var=$value" >> ${wx_arg_cache_file}
fi
if test "$value" = 1; then
- echo "$ac_t""`echo $toolkit | tr A-Z a-z`" 1>&6
+ echo "$ac_t""`echo $toolkit | tr [A-Z] [a-z]`" 1>&6
fi
fi
done
# 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:6378: checking for $ac_word" >&5
+echo "configure:7339: 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:6408: checking for $ac_word" >&5
+echo "configure:7369: 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:6459: checking for $ac_word" >&5
+echo "configure:7420: 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:6491: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:7452: 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 6502 "configure"
+#line 7463 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:6507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7468: \"$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:6533: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:7494: 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:6538: checking whether we are using GNU C" >&5
+echo "configure:7499: 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:6547: \"$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:7508: \"$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:6566: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:7527: 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:6601: checking how to run the C preprocessor" >&5
+echo "configure:7562: 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 6616 "configure"
+#line 7577 "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:6622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7583: \"$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 6633 "configure"
+#line 7594 "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:6639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7600: \"$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 6650 "configure"
+#line 7611 "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:6656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7617: \"$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:6683: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:7644: 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 6689 "configure"
+#line 7650 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 6707 "configure"
+#line 7668 "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:6743: checking for $ac_word" >&5
+echo "configure:7704: 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:6775: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:7736: 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 6786 "configure"
+#line 7747 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:6791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7752: \"$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:6817: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:7778: 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:6822: checking whether we are using GNU C++" >&5
+echo "configure:7783: 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:6831: \"$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:7792: \"$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:6850: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:7811: 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:6883: checking how to run the C++ preprocessor" >&5
+echo "configure:7844: 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 6896 "configure"
+#line 7857 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7862: \"$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:6939: checking for $ac_word" >&5
+echo "configure:7900: 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:6970: checking for $ac_word" >&5
+echo "configure:7931: 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:7010: checking for a BSD compatible install" >&5
+echo "configure:7971: 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:7066: checking for $ac_word" >&5
+echo "configure:8027: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
-echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:7095: checking "make for VPATH support"" >&5
+echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6
+echo "configure:8056: checking make for VPATH support" >&5
cat - << EOF > confMake
check : file
cp \$? \$@
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
- { echo "configure: error: You need a make-utility that is able to use the variable
+ { echo "configure: error:
+You need a make-utility that is able to use the variable
VPATH correctly.
-If your version of make does not support VPATH correctly" 1>&2; exit 1; }
+If your version of make does not support VPATH correctly,
+please install GNU-make (possibly as gmake), and start
+configure with the following command:
+export MAKE=gmake; ./configure for sh-type shells
+setenv MAKE gmake; ./configure for csh-type shells
+Also please do remember to use gmake in this case every time
+you are trying to compile.
+" 1>&2; exit 1; }
fi
for ac_prog in 'bison -y' byacc
# 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:7124: checking for $ac_word" >&5
+echo "configure:8093: 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:7158: checking for $ac_word" >&5
+echo "configure:8127: 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:7192: checking for yywrap in -l$ac_lib" >&5
+echo "configure:8161: 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 7200 "configure"
+#line 8169 "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:7211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8180: \"$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:7235: checking whether ln -s works" >&5
+echo "configure:8204: 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
AFMINSTALL=
if test "$wxUSE_GUI" = "yes"; then
+ USE_GUI=1
-USE_GUI=1
-
-TOOLKIT=
-TOOLKIT_INCLUDE=
+ TOOLKIT=
+ TOOLKIT_INCLUDE=
-GUI_TK_LIBRARY=
-GUI_TK_LINK=
+ GUI_TK_LIBRARY=
+ GUI_TK_LINK=
-WXGTK12=
-WXGTK127=
-WXGTK20=
+ WXGTK12=
+ WXGTK127=
+ WXGTK20=
-WXWINE=
+ WXWINE=
-if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
- if test "$cross_compiling" = "yes" ; then
- 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:7399: checking for Windows headers" >&5
-
+ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
+ if test "$cross_compiling" = "yes" ; then
+ 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:8367: checking for Windows headers" >&5
+
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
do
if test -f "$ac_dir/windows.h"; then
- ac_find_includes=$ac_dir
- break
- fi
- done
-
- if test "$ac_find_includes" != "" ; then
- echo "$ac_t""found $ac_find_includes" 1>&6
- TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
- else
- echo "$ac_t""no" 1>&6
- { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
- fi
+ ac_find_includes=$ac_dir
+ break
fi
+ done
- INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
- LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+ if test "$ac_find_includes" != "" ; then
+ echo "$ac_t""found $ac_find_includes" 1>&6
+ TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
+ else
+ echo "$ac_t""no" 1>&6
+ { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+ fi
+ fi
- if test "$wxUSE_ODBC" = "yes" ; then
- LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
- fi
+ INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
- if test "$wxUSE_MINGW" = 1; then
- LDFLAGS="$LDFLAGS -mwindows"
- fi
+ if test "$wxUSE_ODBC" = "yes" ; then
+ LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
+ fi
- TOOLKIT=MSW
- GUIDIST=MSW_DIST
+ if test "$wxUSE_MINGW" = 1; then
+ LDFLAGS="$LDFLAGS -mwindows"
+ fi
- RCINCSWITCH="--include-dir"
- RCDEFSWITCH="--define"
- RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\""
- RCINPUTSWITCH="-i"
- RCOUTPUTSWITCH="-o"
- RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__"
+ TOOLKIT=MSW
+ GUIDIST=MSW_DIST
- RESPROGRAM="\$(RES_PROGRAM)"
+ RCINCSWITCH="--include-dir"
+ RCDEFSWITCH="--define"
+ RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\""
+ RCINPUTSWITCH="-i"
+ RCOUTPUTSWITCH="-o"
+ RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__"
-fi
+ RESPROGRAM="\$(RES_PROGRAM)"
+ fi
-if test "$wxUSE_GTK" = 1; then
- # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+ if test "$wxUSE_GTK" = 1; then
+ # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
if test "${with_gtk_prefix+set}" = set; then
withval="$with_gtk_prefix"
gtk_config_prefix="$withval"
# Extract the first word of "gtk-config-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:7495: checking for $ac_word" >&5
+echo "configure:8462: 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:7530: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:8497: 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 7553 "configure"
+#line 8520 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:7631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8598: \"$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 7665 "configure"
+#line 8632 "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:7675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8642: \"$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"
GTK_CFLAGS=""
GTK_LIBS=""
-
+
if test x$gtk_config_exec_prefix != x ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
if test x${GTK_CONFIG+set} != xset ; then
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7725: checking for $ac_word" >&5
+echo "configure:8692: 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:7760: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:8727: 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 7773 "configure"
+#line 8740 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:7806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
-
+
if test x$gtk_config_exec_prefix != x ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
if test x${GTK_CONFIG+set} != xset ; then
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7852: checking for $ac_word" >&5
+echo "configure:8819: 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:7887: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:8854: 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 7900 "configure"
+#line 8867 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:7933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
-
+
fi
rm -f conf.gtktest
- if test "$WXGTK12" != 1 -a "$WXGTK20" != 1; then
- { echo "configure: error:
- Please check that gtk-config is in path, the directory
- where GTK+ libraries are installed (returned by
- 'gtk-config --libs' command) is in LD_LIBRARY_PATH or
- equivalent variable and GTK+ is version 1.2.3 or above.
- " 1>&2; exit 1; }
- fi
-
- TOOLKIT_INCLUDE="$GTK_CFLAGS"
-
+ if test "$WXGTK12" != 1 -a "$WXGTK20" != 1; then
+ { echo "configure: error:
+ Please check that gtk-config is in path, the directory
+ where GTK+ libraries are installed (returned by
+ 'gtk-config --libs' command) is in LD_LIBRARY_PATH or
+ equivalent variable and GTK+ is version 1.2.3 or above.
+ " 1>&2; exit 1; }
+ fi
- GUI_TK_LIBRARY="$GTK_LIBS"
+ TOOLKIT_INCLUDE="$GTK_CFLAGS"
+
+ GUI_TK_LIBRARY="$GTK_LIBS"
- AFMINSTALL=afminstall
- TOOLKIT=GTK
- GUIDIST=GTK_DIST
+
+ AFMINSTALL=afminstall
+ TOOLKIT=GTK
+ GUIDIST=GTK_DIST
- echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:7989: checking for gdk_im_open in -lgdk" >&5
+ echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+echo "configure:8956: 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 7997 "configure"
+#line 8964 "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:8008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_t""no" 1>&6
fi
-fi
+ fi
-if test "$wxUSE_WINE" = 1; then
- echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
-echo "configure:8035: checking for WINE includes" >&5
-
+ if test "$wxUSE_MGL" = 1; then
+
+ echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
+echo "configure:9003: checking for SciTech MGL library" >&5
+ if test "x$MGL_ROOT" = x ; then
+ echo "$ac_t""not found" 1>&6
+ { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; }
+ else
+ echo "$ac_t""$MGL_ROOT" 1>&6
+ fi
+
+ MGL_OS=linux/gcc/glibc
+ MGL_LIB_TYPE=""
+
+ if test "$wxUSE_DEBUG_FLAG" = yes ; then
+ if test -f $MGL_ROOT/lib/debug/$MGL_OS/libmgl.a ; then
+ MGL_LIB_TYPE=debug
+ fi
+ fi
+ if test "x$MGL_LIB_TYPE" = x ; then
+ if test -f $MGL_ROOT/lib/release/$MGL_OS/libmgl.a ; then
+ MGL_LIB_TYPE=release
+ else
+ { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; }
+ fi
+ fi
+
+ TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
+ GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$MGL_LIB_TYPE/$MGL_OS -lmgl -lmglcpp -lpm"
+
+ AFMINSTALL=afminstall
+ TOOLKIT=MGL
+ GUIDIST=MGL_DIST
+ fi
+
+ if test "$wxUSE_WINE" = 1; then
+ echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
+echo "configure:9037: checking for WINE includes" >&5
+
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
do
fi
done
- if test "$ac_find_includes" != "" ; then
- echo "$ac_t""found $ac_find_includes" 1>&6
- TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
- else
- echo "$ac_t""no" 1>&6
- { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
- fi
+ if test "$ac_find_includes" != "" ; then
+ echo "$ac_t""found $ac_find_includes" 1>&6
+ TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
+ else
+ echo "$ac_t""no" 1>&6
+ { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+ fi
- XPM_LINK=""
- echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:8056: checking for Xpm library" >&5
-
+ XPM_LINK=""
+ echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:9058: checking for Xpm library" >&5
+
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
do
done
done
- if test "$ac_find_libraries" != "" ; then
- GUI_TK_LIBRARY="-L$ac_find_libraries"
- XPM_LINK="-lXpm"
- cat >> confdefs.h <<\EOF
+ if test "$ac_find_libraries" != "" ; then
+ GUI_TK_LIBRARY="-L$ac_find_libraries"
+ XPM_LINK="-lXpm"
+ cat >> confdefs.h <<\EOF
#define wxHAVE_LIB_XPM 1
EOF
- echo "$ac_t""found at $ac_find_libraries" 1>&6
- else
- echo "$ac_t""no" 1>&6
- echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
- fi
+ echo "$ac_t""found at $ac_find_libraries" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+ fi
- MESA_LINK=""
- echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:8084: checking for Mesa library" >&5
-
+ MESA_LINK=""
+ echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
+echo "configure:9086: checking for Mesa library" >&5
+
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
do
done
done
- if test "$ac_find_libraries" != "" ; then
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
- MESA_LINK="-lMesaGL"
- echo "$ac_t""found at $ac_find_libraries" 1>&6
- else
- { echo "configure: error: no" 1>&2; exit 1; }
- fi
-
- GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
- WXWINE=1
- TOOLKIT=MSW
- GUIDIST=MSW_DIST
-fi
+ if test "$ac_find_libraries" != "" ; then
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
+ MESA_LINK="-lMesaGL"
+ echo "$ac_t""found at $ac_find_libraries" 1>&6
+ else
+ { echo "configure: error: no" 1>&2; exit 1; }
+ fi
+ GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
+ WXWINE=1
+ TOOLKIT=MSW
+ GUIDIST=MSW_DIST
+ fi
-# If we find X, set shell vars x_includes and x_libraries to the
+
+ # If we find X, set shell vars x_includes and x_libraries to the
# paths, otherwise set no_x=yes.
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:8118: checking for X" >&5
+echo "configure:9120: 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 8180 "configure"
+#line 9182 "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:8185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9187: \"$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 8254 "configure"
+#line 9256 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:8261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9263: \"$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:8367: checking whether -R must be followed by a space" >&5
+echo "configure:9369: 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 8370 "configure"
+#line 9372 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:8377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9379: \"$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 8393 "configure"
+#line 9395 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:8400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9402: \"$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:8432: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:9434: 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 8440 "configure"
+#line 9442 "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:8451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9453: \"$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:8473: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:9475: 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 8481 "configure"
+#line 9483 "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:8492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9494: \"$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:8521: checking for gethostbyname" >&5
+echo "configure:9523: 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 8526 "configure"
+#line 9528 "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:8549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9551: \"$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:8570: checking for gethostbyname in -lnsl" >&5
+echo "configure:9572: 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 8578 "configure"
+#line 9580 "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:8589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9591: \"$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:8619: checking for connect" >&5
+echo "configure:9621: 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 8624 "configure"
+#line 9626 "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:8647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9649: \"$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:8668: checking for connect in -lsocket" >&5
+echo "configure:9670: 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 8676 "configure"
+#line 9678 "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:8687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9689: \"$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:8711: checking for remove" >&5
+echo "configure:9713: 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 8716 "configure"
+#line 9718 "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:8739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9741: \"$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:8760: checking for remove in -lposix" >&5
+echo "configure:9762: 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 8768 "configure"
+#line 9770 "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:8779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9781: \"$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:8803: checking for shmat" >&5
+echo "configure:9805: 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 8808 "configure"
+#line 9810 "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:8831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9833: \"$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:8852: checking for shmat in -lipc" >&5
+echo "configure:9854: 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 8860 "configure"
+#line 9862 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
shmat()
; return 0; }
EOF
-if { (eval echo configure:8871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# 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:8904: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:9906: 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 8912 "configure"
+#line 9914 "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:8923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9925: \"$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
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS"
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ LDFLAGS="$LDFLAGS $X_LIBS"
-if test "$wxUSE_MOTIF" = 1; then
- if test "$no_x" = "yes"; then
- { echo "configure: error: X11 not found" 1>&2; exit 1; }
- fi
+ if test "$wxUSE_MOTIF" = 1; then
+ if test "$no_x" = "yes"; then
+ { echo "configure: error: X11 not found" 1>&2; exit 1; }
+ fi
- GUI_TK_LIBRARY="$X_LIBS"
- TOOLKIT_INCLUDE="$X_CFLAGS"
+ GUI_TK_LIBRARY="$X_LIBS"
+ TOOLKIT_INCLUDE="$X_CFLAGS"
- AFMINSTALL=afminstall
+ AFMINSTALL=afminstall
-
- COMPILED_X_PROGRAM=0
+
+ COMPILED_X_PROGRAM=0
- echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:8964: checking for Motif/Lesstif headers" >&5
-
+ echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
+echo "configure:9966: checking for Motif/Lesstif headers" >&5
+
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
do
fi
done
- if test "$ac_find_includes" != "" ; then
- echo "$ac_t""found $ac_find_includes" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
-#line 8979 "configure"
+ if test "$ac_find_includes" != "" ; then
+ echo "$ac_t""found $ac_find_includes" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+#line 9981 "configure"
#include "confdefs.h"
- #include <Xm/Xm.h>
-
+ #include <Xm/Xm.h>
+
int main() {
- int version;
+ int version;
- version = xmUseVersion;
-
+ version = xmUseVersion;
+
; return 0; }
EOF
-if { (eval echo configure:8992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- echo "$ac_t""found in default search path" 1>&6
- COMPILED_X_PROGRAM=1
-
+ echo "$ac_t""found in default search path" 1>&6
+ COMPILED_X_PROGRAM=1
+
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- echo "$ac_t""no" 1>&6
- { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; }
+ echo "$ac_t""no" 1>&6
+ { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; }
+
-
fi
rm -f conftest*
- fi
+ fi
- if test "$COMPILED_X_PROGRAM" = 0; then
- echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:9013: checking for Motif/Lesstif library" >&5
-
+ if test "$COMPILED_X_PROGRAM" = 0; then
+ echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
+echo "configure:10015: checking for Motif/Lesstif library" >&5
+
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
do
done
done
- if test "$ac_find_libraries" != "" ; then
-
+ if test "$ac_find_libraries" != "" ; then
+
ac_path_to_include=$ac_find_includes
echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
result=$?
ac_path_to_include="-I$ac_find_includes"
fi
-
+
echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
result=$?
if test $result = 0; then
fi
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
- TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
- echo "$ac_t""found at $ac_find_libraries" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
-#line 9052 "configure"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+ TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
+ echo "$ac_t""found at $ac_find_libraries" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+#line 10054 "configure"
#include "confdefs.h"
- #include <Xm/Xm.h>
-
+ #include <Xm/Xm.h>
+
int main() {
- int version;
+ int version;
- version = xmUseVersion;
-
+ version = xmUseVersion;
+
; return 0; }
EOF
-if { (eval echo configure:9065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- echo "$ac_t""found in default search path" 1>&6
- COMPILED_X_PROGRAM=1
-
+ echo "$ac_t""found in default search path" 1>&6
+ COMPILED_X_PROGRAM=1
+
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- echo "$ac_t""no" 1>&6
- { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
+ echo "$ac_t""no" 1>&6
+ { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
+
-
fi
rm -f conftest*
+ fi
fi
- fi
-
- XPM_LINK=""
- echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:9088: checking for Xpm library" >&5
-
+
+ XPM_LINK=""
+ echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:10090: checking for Xpm library" >&5
+
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
do
done
done
- if test "$ac_find_libraries" != "" ; then
-
+ if test "$ac_find_libraries" != "" ; then
+
echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_link="-L$ac_find_libraries"
fi
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
- XPM_LINK="-lXpm "
- cat >> confdefs.h <<\EOF
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+ XPM_LINK="-lXpm "
+ cat >> confdefs.h <<\EOF
#define wxHAVE_LIB_XPM 1
EOF
- echo "$ac_t""found at $ac_find_libraries" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
-#line 9120 "configure"
+ echo "$ac_t""found at $ac_find_libraries" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+#line 10122 "configure"
#include "confdefs.h"
- #include <X11/xpm.h>
-
+ #include <X11/xpm.h>
+
int main() {
- int version;
+ int version;
- version = XpmLibraryVersion();
-
+ version = XpmLibraryVersion();
+
; return 0; }
EOF
-if { (eval echo configure:9133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- XPM_LINK="-lXpm "
- cat >> confdefs.h <<\EOF
+ XPM_LINK="-lXpm "
+ cat >> confdefs.h <<\EOF
#define wxHAVE_LIB_XPM 1
EOF
- echo "$ac_t""found in default search path" 1>&6
- COMPILED_X_PROGRAM=0
-
+ echo "$ac_t""found in default search path" 1>&6
+ COMPILED_X_PROGRAM=0
+
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- echo "$ac_t""no" 1>&6
- echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+ echo "$ac_t""no" 1>&6
+ echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+
-
fi
rm -f conftest*
+ fi
+
+ GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
+ TOOLKIT=MOTIF
+ GUIDIST=MOTIF_DIST
fi
- GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
- TOOLKIT=MOTIF
- GUIDIST=MOTIF_DIST
-fi
+ if test "$wxUSE_MAC" = 1; then
+ TOOLKIT=MAC
+ GUIDIST=MACX_DIST
+ fi
-if test "$wxUSE_MAC" = 1; then
- TOOLKIT=MAC
- GUIDIST=MACX_DIST
-fi
+ if test "$wxUSE_PM" = 1; then
+ TOOLKIT=PM
+ GUIDIST=GTK_DIST
+ fi
-if test "$wxUSE_PM" = 1; then
- TOOLKIT=PM
- GUIDIST=GTK_DIST
-fi
+ if test "$TOOLKIT" != "PM" ; then
+ TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
+ else
+ TOOLKIT_DIR="os2"
+ fi
-if test "$TOOLKIT" != "PM" ; then
- TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
-else
- TOOLKIT_DIR="os2"
-fi
+ TOOLKIT_NAME="${TOOLKIT_DIR}"
- if test "$wxUSE_DEBUG_FLAG" = "yes"; then
- TOOLKIT_NAME="${TOOLKIT_DIR}d"
+ TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}"
+
+ if test "$TOOLKIT_NAME" = "motif"; then
+ TOOLKIT_VPATH="${TOOLKIT_VPATH}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
+ fi
+
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ TOOLKIT_NAME="${TOOLKIT_NAME}univ"
+ UNIV_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes"
+ TOOLKIT_VPATH="${UNIV_VPATH}${PATH_IFS}${TOOLKIT_VPATH}"
+ SETUPH_DIR="univ"
else
- TOOLKIT_NAME="${TOOLKIT_DIR}"
+ SETUPH_DIR="${TOOLKIT_DIR}"
+ fi
+
+ if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+ TOOLKIT_NAME="${TOOLKIT_NAME}d"
fi
TOOLKIT_DEF="-D__WX${TOOLKIT}__"
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__"
+ fi
WX_LIBRARY="wx_${TOOLKIT_NAME}"
- ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)"
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+ else
+ ALL_OBJECTS="\$(GUIOBJS)"
+ fi
+
+ ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
+
+ if test "$TOOLKIT" != "MSW"; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
+ fi
+
+ if test "$wxUSE_HTML" = "yes"; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)"
+ fi
- if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
- ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+ if test "$TOOLKIT" != "MSW"; then
+ if test "$wxUSE_ODBC" = "yes" ; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+ fi
fi
if test "$wxUSE_LIBJPEG" = "yes" ; then
if test "$wxUSE_FREETYPE" = "yes" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
fi
- ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)"
- PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ ALL_DEPFILES="\$(GUI_LOWLEVEL_DEPS) \$(UNIVDEPS)"
+ else
+ ALL_DEPFILES="\$(GUIDEPS)"
+ fi
+
+ ALL_DEPFILES="${ALL_DEPFILES} \$(COMMONDEPS) \$(GENERICDEPS)"
+
+ if test "$TOOLKIT" != "MSW"; then
+ ALL_DEPFILES="${ALL_DEPFILES} \$(UNIXDEPS)"
+ fi
+
+ if test "$wxUSE_HTML" = "yes"; then
+ ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)"
+ fi
+
+ PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
+ fi
RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
RPM_SPEC="wx\$(TOOLKIT).spec"
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
fi
- WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
- WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
- WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
- WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}"
- 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}.dylib.${WX_CURRENT}"
- WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib"
- WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib"
+ WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
+ WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+ WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+ WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}"
+ 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}.dylib.${WX_CURRENT}"
+ 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"
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9464: checking for $ac_hdr" >&5
+echo "configure:10518: 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 9469 "configure"
+#line 10523 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10528: \"$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:9504: checking for $ac_hdr" >&5
+echo "configure:10558: 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 9509 "configure"
+#line 10563 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10568: \"$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:9544: checking for $ac_hdr" >&5
+echo "configure:10598: 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 9549 "configure"
+#line 10603 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10608: \"$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:9584: checking for $ac_hdr" >&5
+echo "configure:10638: 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 9589 "configure"
+#line 10643 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10648: \"$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:9624: checking for $ac_hdr" >&5
+echo "configure:10678: 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 9629 "configure"
+#line 10683 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10688: \"$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:9664: checking for $ac_hdr" >&5
+echo "configure:10718: 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 9669 "configure"
+#line 10723 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10728: \"$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:9704: checking for $ac_hdr" >&5
+echo "configure:10758: 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 9709 "configure"
+#line 10763 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10768: \"$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:9744: checking for $ac_hdr" >&5
+echo "configure:10798: 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 9749 "configure"
+#line 10803 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10808: \"$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:9787: checking for $ac_hdr" >&5
+echo "configure:10841: 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 9792 "configure"
+#line 10846 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10851: \"$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:9828: checking for ANSI C header files" >&5
+echo "configure:10882: 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 9833 "configure"
+#line 10887 "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:9841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10895: \"$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 9858 "configure"
+#line 10912 "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 9876 "configure"
+#line 10930 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 9897 "configure"
+#line 10951 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:9908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10962: \"$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:9932: checking for mode_t" >&5
+echo "configure:10986: 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 9937 "configure"
+#line 10991 "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:9965: checking for off_t" >&5
+echo "configure:11019: 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 9970 "configure"
+#line 11024 "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:9998: checking for pid_t" >&5
+echo "configure:11052: 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 10003 "configure"
+#line 11057 "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:10031: checking for size_t" >&5
+echo "configure:11085: 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 10036 "configure"
+#line 11090 "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:10064: checking for uid_t in sys/types.h" >&5
+echo "configure:11118: 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 10069 "configure"
+#line 11123 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
-echo "configure:10099: checking for wchar_t" >&5
+echo "configure:11153: 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 10105 "configure"
+#line 11159 "configure"
#include "confdefs.h"
#include <wchar.h>
int main() {
- wchar_t wc, *ws;
- wc = L'a';
- ws = L"Hello, world!";
+ wchar_t wc, *ws;
+ wc = L'a';
+ ws = L"Hello, world!";
+
+; return 0; }
+EOF
+if { (eval echo configure:11170: \"$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*
+ cat > conftest.$ac_ext <<EOF
+#line 11178 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+int main() {
+
+ wchar_t wc, *ws;
+ wc = L'a';
+ ws = L"Hello, world!";
+
+; return 0; }
+EOF
+if { (eval echo configure:11189: \"$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
+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
+
+
+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 size_t is unsigned int""... $ac_c" 1>&6
+echo "configure:11223: checking if size_t is unsigned int" >&5
+if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 11228 "configure"
+#include "confdefs.h"
+#include <stddef.h>
+int main() {
+
+ return 0; }
+
+ struct Foo { void foo(size_t); void foo(unsigned int); };
+
+ int bar() {
; return 0; }
EOF
-if { (eval echo configure:10116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- wx_cv_type_wchar_t=yes
+ wx_cv_size_t_is_uint=no
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
+ wx_cv_size_t_is_uint=yes
+
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$wx_cv_size_t_is_uint" 1>&6
+
+if test "$wx_cv_size_t_is_uint" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxSIZE_T_IS_UINT 1
+EOF
+
+else
+ echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
+echo "configure:11264: checking if size_t is unsigned long" >&5
+if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
cat > conftest.$ac_ext <<EOF
-#line 10124 "configure"
+#line 11269 "configure"
#include "confdefs.h"
-#include <stdlib.h>
+#include <stddef.h>
int main() {
- wchar_t wc, *ws;
- wc = L'a';
- ws = L"Hello, world!";
+ return 0; }
+
+ struct Foo { void foo(size_t); void foo(unsigned long); };
+
+ int bar() {
; return 0; }
EOF
-if { (eval echo configure:10135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- wx_cv_type_wchar_t=yes
+ wx_cv_size_t_is_ulong=no
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- wx_cv_type_wchar_t=no
+ wx_cv_size_t_is_ulong=yes
+
fi
rm -f conftest*
-
+
fi
-rm -f conftest*
-fi
+echo "$ac_t""$wx_cv_size_t_is_ulong" 1>&6
-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
+ if test "$wx_cv_size_t_is_ulong" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxSIZE_T_IS_ULONG 1
EOF
+ fi
fi
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
-echo "configure:10161: checking for pw_gecos in struct passwd" >&5
+echo "configure:11316: 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 10167 "configure"
+#line 11322 "configure"
#include "confdefs.h"
#include <pwd.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:10178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11333: \"$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:10208: checking for working const" >&5
+echo "configure:11363: 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 10213 "configure"
+#line 11368 "configure"
#include "confdefs.h"
int main() {
/* Ultrix mips cc rejects this. */
-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;
/* SunOS 4.1.1 cc rejects this. */
char const *const *ccp;
char **p;
; return 0; }
EOF
-if { (eval echo configure:10262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11417: \"$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:10283: checking for inline" >&5
+echo "configure:11438: 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 10290 "configure"
+#line 11445 "configure"
#include "confdefs.h"
int main() {
-} int $ac_kw foo() {
+} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:10297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11452: \"$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:10324: checking size of char" >&5
+echo "configure:11479: 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 10332 "configure"
+#line 11487 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_char=`cat conftestval`
else
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:10363: checking size of short" >&5
+echo "configure:11518: 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 10371 "configure"
+#line 11526 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11537: \"$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:10402: checking size of int *" >&5
+echo "configure:11557: 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 10410 "configure"
+#line 11565 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11576: \"$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:10441: checking size of int" >&5
+echo "configure:11596: 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 10449 "configure"
+#line 11604 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11615: \"$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:10480: checking size of long" >&5
+echo "configure:11635: 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 10488 "configure"
+#line 11643 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10519: checking size of long long" >&5
+echo "configure:11674: 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 10527 "configure"
+#line 11682 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11693: \"$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:10559: checking size of wchar_t" >&5
+echo "configure:11714: 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 10569 "configure"
+#line 11724 "configure"
#include "confdefs.h"
- #ifdef HAVE_WCHAR_H
- # include <wchar.h>
- #endif
- #ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- #endif
- #include <stdio.h>
- int main()
- {
- FILE *f=fopen("conftestval", "w");
- if (!f) exit(1);
- fprintf(f, "%i", sizeof(wchar_t));
- exit(0);
- }
+ #ifdef HAVE_WCHAR_H
+ # include <wchar.h>
+ #endif
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
+ #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:10588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
wx_cv_sizeof_wchar_t=`cat conftestval`
else
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:10612: checking whether byte ordering is bigendian" >&5
+echo "configure:11767: 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 10619 "configure"
+#line 11774 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:10630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11785: \"$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 10634 "configure"
+#line 11789 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:10645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11800: \"$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 10665 "configure"
+#line 11820 "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:10678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11833: \"$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:10725: checking for $ac_hdr" >&5
+echo "configure:11880: 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 10730 "configure"
+#line 11885 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
done
- if test "x$HAVE_IOSTREAM" = x ; then
+ if test "$ac_cv_header_iostream" = "yes" ; then
+ :
+ else
cat >> confdefs.h <<\EOF
#define wxUSE_IOSTREAMH 1
EOF
- else
- :
fi
ac_ext=c
echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:10783: checking if C++ compiler supports bool" >&5
+echo "configure:11938: 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 10798 "configure"
+#line 11953 "configure"
#include "confdefs.h"
; return 0; }
EOF
-if { (eval echo configure:10810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_cpp_bool=yes
echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6
-echo "configure:10848: checking if you need GNU extensions" >&5
+echo "configure:12003: 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 10854 "configure"
+#line 12009 "configure"
#include "confdefs.h"
#include <features.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:10867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12022: \"$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:10892: checking for wcslen in -lc" >&5
+echo "configure:12047: 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 10900 "configure"
+#line 12055 "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:10911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12066: \"$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:10937: checking for wcslen in -lw" >&5
+echo "configure:12092: 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 10945 "configure"
+#line 12100 "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:10956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12111: \"$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:10987: checking for vprintf" >&5
+echo "configure:12142: 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 10992 "configure"
+#line 12147 "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:11015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12170: \"$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:11039: checking for _doprnt" >&5
+echo "configure:12194: 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 11044 "configure"
+#line 12199 "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:11067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
-echo "configure:11098: checking for vsnprintf" >&5
+echo "configure:12253: 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 11104 "configure"
+#line 12259 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:11129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_vsnprintf=yes
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 11140 "configure"
+#line 12295 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:11165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_vsnprintf=yes
fi
echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
-echo "configure:11197: checking for vsscanf" >&5
+echo "configure:12352: 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 11203 "configure"
+#line 12358 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:11226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_vsscanf=yes
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6
-echo "configure:11264: checking if iconv() takes char**" >&5
+echo "configure:12419: 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 11270 "configure"
+#line 12425 "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);
+ iconv_t cd;
+ size_t insz, outsz;
+ iconv(cd, inbuf, &insz, outbuf, &outsz);
; return 0; }
EOF
-if { (eval echo configure:11282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_iconv_takes_char=yes
else
for ac_func in sigaction
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11315: checking for $ac_func" >&5
+echo "configure:12470: 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 11320 "configure"
+#line 12475 "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:11343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12498: \"$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:11384: checking for sa_handler type" >&5
+echo "configure:12539: 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 11390 "configure"
+#line 12545 "configure"
#include "confdefs.h"
#include <signal.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12557: \"$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:11439: checking for $ac_func" >&5
+echo "configure:12594: 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 11444 "configure"
+#line 12599 "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:11467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12622: \"$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 fcntl flock
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11496: checking for $ac_func" >&5
+echo "configure:12651: 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 11501 "configure"
+#line 12656 "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:11524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12679: \"$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:11558: checking for $ac_func" >&5
+echo "configure:12713: 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 11563 "configure"
+#line 12718 "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:11586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12741: \"$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:11614: checking for $ac_func" >&5
+echo "configure:12769: 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 11619 "configure"
+#line 12774 "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:11642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12797: \"$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:11689: checking for $ac_func" >&5
+echo "configure:12844: 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 11694 "configure"
+#line 12849 "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:11717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_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:11742: checking for nanosleep in -lposix4" >&5
+echo "configure:12897: 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 11750 "configure"
+#line 12905 "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:11761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12916: \"$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:11789: checking for $ac_func" >&5
+echo "configure:12944: 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 11794 "configure"
+#line 12949 "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:11817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12972: \"$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:11860: checking for $ac_func" >&5
+echo "configure:13015: 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 11865 "configure"
+#line 13020 "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:11888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13043: \"$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:11925: checking for $ac_func" >&5
+echo "configure:13080: 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 11930 "configure"
+#line 13085 "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:11956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13111: \"$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:11993: checking for $ac_func" >&5
+echo "configure:13148: 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 11998 "configure"
+#line 13153 "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:12021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13176: \"$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:12046: checking for inet_addr in -lnsl" >&5
+echo "configure:13201: 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 12054 "configure"
+#line 13209 "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:12065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13220: \"$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:12084: checking for inet_addr in -lresolv" >&5
+echo "configure:13239: 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 12092 "configure"
+#line 13247 "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:12103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13258: \"$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:12136: checking for $ac_func" >&5
+echo "configure:13291: 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 12141 "configure"
+#line 13296 "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:12164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13319: \"$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:12189: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:13344: 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 12197 "configure"
+#line 13352 "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:12208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13363: \"$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_create in -l$THREADS_LIB""... $ac_c" 1>&6
-echo "configure:12321: checking for pthread_create in -l$THREADS_LIB" >&5
+echo "configure:13476: 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 12329 "configure"
+#line 13484 "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:12340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13495: \"$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:12363: checking for pthread_create in -lc_r" >&5
+echo "configure:13518: 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 12371 "configure"
+#line 13526 "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:12382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13537: \"$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:12406: checking for sys/prctl.h" >&5
+echo "configure:13561: 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 12411 "configure"
+#line 13566 "configure"
#include "confdefs.h"
#include <sys/prctl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13571: \"$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:12456: checking for $ac_func" >&5
+echo "configure:13611: 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 12461 "configure"
+#line 13616 "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:12484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13639: \"$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:12514: checking for $ac_hdr" >&5
+echo "configure:13669: 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 12519 "configure"
+#line 13674 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13679: \"$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:12552: checking for sched_yield in -l$THREADS_LINK" >&5
+echo "configure:13707: 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 12560 "configure"
+#line 13715 "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:12571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13726: \"$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:12593: checking for sched_yield in -l"posix4"" >&5
-ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
+echo "configure:13748: checking for sched_yield in -lposix4" >&5
+ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-l"posix4" $LIBS"
+LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12601 "configure"
+#line 13756 "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:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13767: \"$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:12643: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+echo "configure:13798: 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 12651 "configure"
+#line 13806 "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:12662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13817: \"$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:12678: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
+echo "configure:13833: 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 12686 "configure"
+#line 13841 "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:12697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13852: \"$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:12713: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
+echo "configure:13868: 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 12721 "configure"
+#line 13876 "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:12732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13887: \"$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=1
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:12751: checking for sched_get_priority_max in -l"posix4"" >&5
-ac_lib_var=`echo "posix4"'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
+echo "configure:13906: checking for sched_get_priority_max in -lposix4" >&5
+ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-l"posix4" $LIBS"
+LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12759 "configure"
+#line 13914 "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:12770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13925: \"$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:12817: checking for pthread_cancel in -l$THREADS_LINK" >&5
+echo "configure:13972: 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 12825 "configure"
+#line 13980 "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:12836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:12862: checking for pthread_cleanup_push/pop" >&5
+echo "configure:14017: 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 12868 "configure"
+#line 14023 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:12878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_pthread_cleanup_push=yes
echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
-echo "configure:12906: checking for pthread_mutexattr_t" >&5
+echo "configure:14061: 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 12912 "configure"
+#line 14067 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:12922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_pthread_mutexattr_t=yes
else
echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
-echo "configure:12949: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+echo "configure:14104: 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 12955 "configure"
+#line 14110 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:12964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_pthread_rec_mutex_init=yes
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:13019: checking if -D_REENTRANT is needed" >&5
+echo "configure:14174: 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"
if test "$wxUSE_MAC" = 1 ; then
TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__POWERPC__ -DTARGET_CARBON"
CFLAGS="${CFLAGS} -fno-common -fpascal-strings"
- CPPFLAGS="${CPPFLAGS} -fno-common -fpascal-strings"
+ CPPFLAGS="${CPPFLAGS} -cpp-precomp -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:13063: checking for $ac_word" >&5
+echo "configure:14218: 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
# 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:13093: checking for $ac_word" >&5
+echo "configure:14248: 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
ZLIB_LINK=
ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:13230: checking for zlib.h" >&5
+echo "configure:14385: 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 13235 "configure"
+#line 14390 "configure"
#include "confdefs.h"
#include <zlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14395: \"$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:13257: checking for deflate in -lz" >&5
+echo "configure:14412: 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 13265 "configure"
+#line 14420 "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:13276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14431: \"$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:13323: checking for png.h" >&5
+echo "configure:14478: 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 13328 "configure"
+#line 14483 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14488: \"$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:13350: checking for png_check_sig in -lpng" >&5
+echo "configure:14505: 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 13358 "configure"
+#line 14513 "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:13369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14524: \"$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:13414: checking for jpeglib.h" >&5
+echo "configure:14569: 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 13419 "configure"
+#line 14574 "configure"
#include "confdefs.h"
#include <jpeglib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14579: \"$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:13441: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:14596: 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 13449 "configure"
+#line 14604 "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:13460: \"$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_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:13502: checking for tiffio.h" >&5
+echo "configure:14657: 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 13507 "configure"
+#line 14662 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14667: \"$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:13529: checking for TIFFError in -ltiff" >&5
+echo "configure:14684: 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 13537 "configure"
+#line 14692 "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:13548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14703: \"$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:13590: checking for freetype.h" >&5
+echo "configure:14745: 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 13595 "configure"
+#line 14750 "configure"
#include "confdefs.h"
#include <freetype.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14755: \"$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:13617: checking for FT_Render_Glyph in -lfreetype" >&5
+echo "configure:14772: 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 13625 "configure"
+#line 14780 "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:13636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14791: \"$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:13670: checking for GL/gl.h" >&5
+echo "configure:14825: 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 13675 "configure"
+#line 14830 "configure"
#include "confdefs.h"
#include <GL/gl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14835: \"$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:13706: checking for glFlush in -lGL" >&5
+echo "configure:14861: 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 13714 "configure"
+#line 14869 "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:13725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14880: \"$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:13747: checking for glFlush in -lMesaGL" >&5
+echo "configure:14902: 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 13755 "configure"
+#line 14910 "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:13766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
+if test "$wxUSE_TIMER" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TIMER 1
+EOF
+
+fi
+
if test "$wxUSE_WAVE" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_WAVE 1
fi
+if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_CMDLINE_PARSER 1
+EOF
+
+fi
+
+if test "$wxUSE_STOPWATCH" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_STOPWATCH 1
+EOF
+
+fi
+
+if test "$wxUSE_DATETIME" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_DATETIME 1
+EOF
+
+fi
+
+if test "$wxUSE_TIMEDATE" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TIMEDATE 1
+EOF
+
+fi
+
if test "$wxUSE_FILE" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_FILE 1
fi
+if test "$wxUSE_FFILE" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_FFILE 1
+EOF
+
+fi
+
if test "$wxUSE_FILESYSTEM" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_FILESYSTEM 1
fi
-if test "$wxUSE_TIMEDATE" = "yes"; then
+if test "$wxUSE_DATETIME" = "yes"; then
for ac_func in strptime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13976: checking for $ac_func" >&5
+echo "configure:15173: 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 13981 "configure"
+#line 15178 "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:14004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15201: \"$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:14030: checking for timezone variable in <time.h>" >&5
+echo "configure:15227: 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 14036 "configure"
+#line 15233 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:14048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15245: \"$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 14059 "configure"
+#line 15256 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:14071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15268: \"$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 14082 "configure"
+#line 15279 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:14094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15291: \"$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:14129: checking for $ac_func" >&5
+echo "configure:15326: 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 14134 "configure"
+#line 15331 "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:14157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15354: \"$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:14184: checking for tm_gmtoff in struct tm" >&5
+echo "configure:15381: 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 14190 "configure"
+#line 15387 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:14202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15399: \"$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:14231: checking for $ac_func" >&5
+echo "configure:15428: 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 14236 "configure"
+#line 15433 "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:14259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15456: \"$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:14286: checking whether gettimeofday takes two arguments" >&5
+echo "configure:15483: 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 14301 "configure"
+#line 15498 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:14315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15512: \"$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 14323 "configure"
+#line 15520 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:14336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15533: \"$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:14382: checking for socket" >&5
+echo "configure:15579: 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 14387 "configure"
+#line 15584 "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:14410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15607: \"$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:14428: checking for socket in -lsocket" >&5
+echo "configure:15625: 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 14436 "configure"
+#line 15633 "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:14447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15644: \"$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:14480: checking what is the type of the third argument of getsockname" >&5
+echo "configure:15677: 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 14495 "configure"
+#line 15692 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:14508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15705: \"$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 14516 "configure"
+#line 15713 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:14529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15726: \"$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 14537 "configure"
+#line 15734 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:14550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15747: \"$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:14612: checking for $ac_hdr" >&5
+echo "configure:15809: 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 14617 "configure"
+#line 15814 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15819: \"$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:14678: checking for $ac_func" >&5
+echo "configure:15875: 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 14683 "configure"
+#line 15880 "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:14706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15903: \"$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:14734: checking for dlopen in -ldl" >&5
+echo "configure:15931: 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 14742 "configure"
+#line 15939 "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:14753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15950: \"$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:14782: checking for $ac_func" >&5
+echo "configure:15979: 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 14787 "configure"
+#line 15984 "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:14810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16007: \"$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:14838: checking for dld in -lshl_load" >&5
+echo "configure:16035: 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 14846 "configure"
+#line 16043 "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:14857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16054: \"$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:14896: checking for $ac_func" >&5
+echo "configure:16093: 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 14901 "configure"
+#line 16098 "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:14924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16121: \"$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:14949: checking for dlerror in -ldl" >&5
+echo "configure:16146: 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 14957 "configure"
+#line 16154 "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:14968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
+if test "$wxUSE_FONTMAP" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_FONTMAP 1
+EOF
+
+fi
+
if test "$wxUSE_UNICODE" = "yes" ; then
cat >> confdefs.h <<\EOF
#define wxUSE_UNICODE 1
if test "$wxUSE_CLIPBOARD" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_CLIPBOARD 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
EOF
fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15197: checking for $ac_hdr" >&5
+echo "configure:16405: 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 15202 "configure"
+#line 16410 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
done
- if test "$ac_cv_header_ole2_h" = "yes" ; then
+ if test "$ac_cv_header_ole2_h" = "yes" ; then
if test "$GCC" = yes ; then
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
fi
+USES_CONTROLS=0
+if test "$wxUSE_CONTROLS" = "yes"; then
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_ACCEL" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_ACCEL 1
EOF
+ USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BUTTON" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_BUTTON 1
+EOF
+
+ USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BMPBUTTON" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_BMPBUTTON 1
+EOF
+
+ USES_CONTROLS=1
+fi
+
+if test "$wxUSE_CALCTRL" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_CALENDARCTRL 1
+EOF
+
+ USES_CONTROLS=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar"
fi
if test "$wxUSE_CARET" = "yes"; then
#define wxUSE_CARET 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
fi
#define wxUSE_COMBOBOX 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_CHOICE" = "yes"; then
#define wxUSE_CHOICE 1
EOF
-fi
-
-if test "$wxUSE_BMPBUTTON" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_BMPBUTTON 1
-EOF
-
+ USES_CONTROLS=1
fi
if test "$wxUSE_CHECKBOX" = "yes"; then
#define wxUSE_CHECKBOX 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_CHECKLST" = "yes"; then
#define wxUSE_CHECKLISTBOX 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
fi
#define wxUSE_GAUGE 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_NEW_GRID" = "yes"; then
#define wxUSE_NEW_GRID 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
fi
#define wxUSE_GRID 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
fi
#define wxUSE_LISTBOX 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_LISTCTRL" = "yes"; then
#define wxUSE_LISTCTRL 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
else
echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2
#define wxUSE_NOTEBOOK 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
fi
#define wxUSE_RADIOBOX 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_RADIOBTN" = "yes"; then
#define wxUSE_RADIOBTN 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_SASH" = "yes"; then
#define wxUSE_SCROLLBAR 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
fi
#define wxUSE_SLIDER 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_SPINBTN" = "yes"; then
#define wxUSE_SPINBTN 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_SPINCTRL" = "yes"; then
#define wxUSE_SPINCTRL 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_SPLITTER" = "yes"; then
#define wxUSE_STATBMP 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_STATBOX" = "yes"; then
#define wxUSE_STATBOX 1
EOF
+ USES_CONTROLS=1
+fi
+
+if test "$wxUSE_STATTEXT" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_STATTEXT 1
+EOF
+
+ USES_CONTROLS=1
fi
if test "$wxUSE_STATLINE" = "yes"; then
#define wxUSE_STATLINE 1
EOF
+ USES_CONTROLS=1
fi
fi
#define wxUSE_STATUSBAR 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
fi
+if test "$wxUSE_TEXTCTRL" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTCTRL 1
+EOF
+
+ USES_CONTROLS=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
+fi
+
if test "$wxUSE_TOGGLEBTN" = "yes"; then
- cat >> confdefs.h <<\EOF
+ if test "$wxUSE_MAC" = 1; then
+ echo "configure: warning: Toggle button is not yet supported under Mac OS X" 1>&2
+ wxUSE_TOGGLEBTN=no
+ fi
+
+ if test "$wxUSE_TOGGLEBTN" = "yes"; then
+ cat >> confdefs.h <<\EOF
#define wxUSE_TOGGLEBTN 1
EOF
+ USES_CONTROLS=1
+ fi
fi
if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
EOF
wxUSE_TOOLBAR="yes"
+ USES_CONTROLS=1
fi
if test "$wxUSE_TOOLBAR" = "yes"; then
#define wxUSE_TOOLBAR 1
EOF
+ USES_CONTROLS=1
if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
wxUSE_TOOLBAR_NATIVE="yes"
fi
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
-fi
-
-if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
- cat >> confdefs.h <<\EOF
+ if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
+ cat >> confdefs.h <<\EOF
#define wxUSE_TOOLBAR_NATIVE 1
EOF
+ USES_CONTROLS=1
+ fi
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
fi
if test "$wxUSE_TOOLTIPS" = "yes"; then
#define wxUSE_TREECTRL 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
else
echo "configure: warning: wxTreeCtrl requires wxImageList and won't be compiled without it" 1>&2
fi
fi
-
-
-if test "$wxUSE_DIRDLG" = "yes"; then
- if test "$wxUSE_CONSTRAINTS" != "yes"; then
- echo "configure: warning: wxDirDialog requires constraints so it won't be compiled without them" 1>&2
- else
- if test "$wxUSE_TREECTRL" != "yes"; then
- echo "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2
- else
- cat >> confdefs.h <<\EOF
-#define wxUSE_DIRDLG 1
+if test "$USES_CONTROLS" = 1; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_CONTROLS 1
EOF
- fi
- fi
fi
-if test "$wxUSE_TEXTDLG" = "yes"; then
+
+
+if test "$wxUSE_MENUS" = "yes"; then
cat >> confdefs.h <<\EOF
-#define wxUSE_TEXTDLG 1
+#define wxUSE_MENUS 1
EOF
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
fi
-if test "$wxUSE_STARTUP_TIPS" = "yes"; then
- if test "$wxUSE_CONSTRAINTS" != "yes"; then
- echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2
- else
- cat >> confdefs.h <<\EOF
-#define wxUSE_STARTUP_TIPS 1
+if test "$wxUSE_METAFILE" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1
EOF
- fi
fi
-if test "$wxUSE_PROGRESSDLG" = "yes"; then
- if test "$wxUSE_CONSTRAINTS" != "yes"; then
- echo "configure: warning: wxProgressDialog requires constraints so it won't be compiled without them" 1>&2
- else
- cat >> confdefs.h <<\EOF
-#define wxUSE_PROGRESSDLG 1
+if test "$wxUSE_MIMETYPE" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_MIMETYPE 1
EOF
- fi
fi
if test "$wxUSE_MINIFRAME" = "yes"; then
fi
+if test "$wxUSE_CHOICEDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_CHOICEDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_COLOURDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_COLOURDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_FILEDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_FILEDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_FONTDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_FONTDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_DIRDLG" = "yes"; then
+ if test "$wxUSE_CONSTRAINTS" != "yes"; then
+ echo "configure: warning: wxDirDialog requires constraints so it won't be compiled without them" 1>&2
+ else
+ if test "$wxUSE_TREECTRL" != "yes"; then
+ echo "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
+#define wxUSE_DIRDLG 1
+EOF
+
+ fi
+ fi
+fi
+
+if test "$wxUSE_MSGDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_MSGDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_NUMBERDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_NUMBERDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_PROGRESSDLG" = "yes"; then
+ if test "$wxUSE_CONSTRAINTS" != "yes"; then
+ echo "configure: warning: wxProgressDialog requires constraints so it won't be compiled without them" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
+#define wxUSE_PROGRESSDLG 1
+EOF
+
+ fi
+fi
+
+if test "$wxUSE_STARTUP_TIPS" = "yes"; then
+ if test "$wxUSE_CONSTRAINTS" != "yes"; then
+ echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
+#define wxUSE_STARTUP_TIPS 1
+EOF
+
+ fi
+fi
+
+if test "$wxUSE_TEXTDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTDLG 1
+EOF
+
+fi
+
+
if test "$cross_compiling" = "yes"; then
OSINFO="\"$host\""
else
if test "$wxUSE_GUI" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag \
- drawing dynamic event font fractal image menu \
- minimal richedit"
+ drawing dynamic event font fractal image \
+ minimal richedit widgets"
+
+ if test "$wxUSE_UNIVERSAL" = "yes" ; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ"
+ fi
CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
else
+
+
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:15804: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:17164: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
if test -d include; then
if test -d include/wx; then
- if test -d include/wx/${TOOLKIT_DIR}; then
- if test -f include/wx/${TOOLKIT_DIR}/setup.h; then
- mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h
+ if test -d include/wx/${SETUPH_DIR}; then
+ if test -f include/wx/${SETUPH_DIR}/setup.h; then
+ mv -f include/wx/${SETUPH_DIR}/setup.h setup.h
fi
fi
fi
wx_cv_program_ext=$PROGRAM_EXT
wx_cv_target_library=$WX_TARGET_LIBRARY
wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
+ export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \
+ wx_cv_target_library wx_cv_target_libtype
subdirs="demos samples utils contrib"
fi
s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
s%@USE_GUI@%$USE_GUI%g
s%@AFMINSTALL@%$AFMINSTALL%g
+s%@SETUPH_DIR@%$SETUPH_DIR%g
s%@TOOLKIT@%$TOOLKIT%g
s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g
s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
s%@TOOLKIT_NAME@%$TOOLKIT_NAME%g
s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
+s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g
s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
s%@ALL_OBJECTS@%$ALL_OBJECTS%g
s%@ALL_DEPFILES@%$ALL_DEPFILES%g
EOF
cat >> $CONFIG_STATUS <<EOF
- TOOLKIT_DIR="${TOOLKIT_DIR}"
+ SETUPH_DIR="${SETUPH_DIR}"
TOOLKIT_NAME="${TOOLKIT_NAME}"
LN_S="${LN_S}"
EOF
cat >> $CONFIG_STATUS <<\EOF
- chmod +x wx-config
- mv wx-config wx${TOOLKIT_NAME}-config
- ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+ if test ! -f wx${TOOLKIT_NAME}-config; then
+ chmod +x wx-config
+ mv wx-config wx${TOOLKIT_NAME}-config
+ ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+ fi
if test ! -d lib; then
if test ! -d include/wx; then
mkdir include/wx
fi
- if test ! -d include/wx/${TOOLKIT_DIR}; then
- mkdir include/wx/${TOOLKIT_DIR}
+ if test ! -d include/wx/${SETUPH_DIR}; then
+ mkdir include/wx/${SETUPH_DIR}
fi
if test -f setup.h; then
- cp -fp setup.h include/wx/${TOOLKIT_DIR}/setup.h
+ cp -fp setup.h include/wx/${SETUPH_DIR}/setup.h
fi
projects / wxWidgets.git / blobdiff