-
-
-
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13
+# Generated automatically using autoconf version 2.14
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
--with-cygwin use Cygwin for MS-Windows"
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-gtk-prefix=PFX Prefix where GTK is installed"
ac_help="$ac_help
--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed"
ac_help="$ac_help
---with-dmalloc use dmalloc library (www.letters.com/dmalloc)"
-ac_help="$ac_help
---with-zlib use zlib for LZW compression"
-ac_help="$ac_help
--with-libpng use libpng (PNG image format)"
ac_help="$ac_help
--with-libjpeg use libjpeg (JPEG file format)"
ac_help="$ac_help
+--with-libtiff use libtiff (TIFF file format)"
+ac_help="$ac_help
--with-opengl use OpenGL (or Mesa)"
ac_help="$ac_help
+--with-dmalloc use dmalloc library (www.letters.com/dmalloc)"
+ac_help="$ac_help
+--with-zlib use zlib for LZW compression"
+ac_help="$ac_help
--with-odbc use the IODBC and wxODBC classes"
ac_help="$ac_help
--enable-shared create shared library code"
ac_help="$ac_help
--enable-spinbtn use wxSpinButton class"
ac_help="$ac_help
+--enable-spinctrl use wxSpinCtrl class"
+ac_help="$ac_help
--enable-splitter use wxSplitterWindow class"
ac_help="$ac_help
--enable-statbmp use wxStaticBitmap class"
ac_help="$ac_help
--enable-toolbar use wxToolBar class"
ac_help="$ac_help
+--enable-tbarnative use native wxToolBar class"
+ac_help="$ac_help
+--enable-tbarsmpl use wxToolBarSimple class"
+ac_help="$ac_help
--enable-treectrl use wxTreeCtrl class"
ac_help="$ac_help
--enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.13"
+ echo "configure generated by autoconf version 2.14"
exit 0 ;;
-with-* | --with-*)
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:829: checking host system type" >&5
+echo "configure:836: 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:850: checking target system type" >&5
+echo "configure:857: 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:868: checking build system type" >&5
+echo "configure:875: checking build system type" >&5
build_alias=$build
case "$build_alias" in
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=10
+WX_RELEASE_NUMBER=13
WX_INTERFACE_AGE=0
WX_BINARY_AGE=0
USE_UNIX=1
+USE_WIN32=0
+USE_BEOS=0
+
USE_LINUX=
USE_SGI=
USE_HPUX=
USE_MINGW=
USE_DATA_GENERAL=
-ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE"
+NEEDS_D_REENTRANT_FOR_R_FUNCS=0
+
+ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE PM"
DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_MOTIF=0
DEFAULT_wxUSE_MSW=0
DEFAULT_wxUSE_WINE=0
+DEFAULT_wxUSE_PM=0
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=0
DEFAULT_DEFAULT_wxUSE_WINE=0
+DEFAULT_DEFAULT_wxUSE_PM=0
case "${host}" in
*-hp-hpux* )
USE_HPUX=1
DEFAULT_DEFAULT_wxUSE_MOTIF=1
+ NEEDS_D_REENTRANT_FOR_R_FUNCS=1
cat >> confdefs.h <<\EOF
#define __HPUX__ 1
EOF
EOF
DEFAULT_DEFAULT_wxUSE_MOTIF=1
+ NEEDS_D_REENTRANT_FOR_R_FUNCS=1
;;
*-*-sunos4* )
USE_SUN=1
DEFAULT_DEFAULT_wxUSE_MOTIF=1
;;
- *-*-cygwin32* )
+ *-*-cygwin32* | *-*-mingw32* )
USE_UNIX=0
+ USE_WIN32=1
cat >> confdefs.h <<\EOF
#define __WIN32__ 1
EOF
#define WINVER 0x0400
EOF
+ PROGRAM_EXT=".exe"
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
- *-*-mingw32* )
- USE_UNIX=0
- cat >> confdefs.h <<\EOF
-#define __WIN32__ 1
-EOF
-
- cat >> confdefs.h <<\EOF
-#define __WIN95__ 1
-EOF
-
- cat >> confdefs.h <<\EOF
-#define __WINDOWS__ 1
-EOF
-
- cat >> confdefs.h <<\EOF
-#define __GNUWIN32__ 1
-EOF
-
- cat >> confdefs.h <<\EOF
-#define STRICT 1
-EOF
+ *-pc-os2_emx )
cat >> confdefs.h <<\EOF
-#define WINVER 0x0400
+#define __EMX__ 1
EOF
- DEFAULT_DEFAULT_wxUSE_MSW=1
+ PROGRAM_EXT=".exe"
+ DEFAULT_DEFAULT_wxUSE_PM=1
;;
- *-pc-os2_emx )
+ *-*-beos* )
+ USE_BEOS=1
cat >> confdefs.h <<\EOF
-#define __EMX__ 1
+#define __BEOS__ 1
EOF
;;
esac
if test "$USE_UNIX" = 1 ; then
- wxUSE_UNIX=yes
- cat >> confdefs.h <<\EOF
+ wxUSE_UNIX=yes
+ cat >> confdefs.h <<\EOF
#define __UNIX__ 1
EOF
- SRC_SUBDIRS="$SRC_SUBDIRS unix"
- INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
+
+ SRC_SUBDIRS="$SRC_SUBDIRS unix"
+ INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
+fi
+
+if test "$USE_BEOS" = 1; then
+ SRC_SUBDIRS="$SRC_SUBDIRS be"
+ INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be"
fi
if test "$USE_LINUX" = 1; then
echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
-echo "configure:1164: checking for gettext in -lc" >&5
+echo "configure:1170: 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 1172 "configure"
+#line 1178 "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:1183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
DEFAULT_wxUSE_ZLIB=no
DEFAULT_wxUSE_LIBPNG=no
DEFAULT_wxUSE_LIBJPEG=no
+ DEFAULT_wxUSE_LIBTIFF=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_SCROLLBAR=no
DEFAULT_wxUSE_SLIDER=no
DEFAULT_wxUSE_SPINBTN=no
+ DEFAULT_wxUSE_SPINCTRL=no
DEFAULT_wxUSE_SPLITTER=no
DEFAULT_wxUSE_STATBMP=no
DEFAULT_wxUSE_STATBOX=no
DEFAULT_wxUSE_STATUSBAR=yes
DEFAULT_wxUSE_TABDIALOG=no
DEFAULT_wxUSE_TOOLBAR=no
+ DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+ DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_UNICODE=no
DEFAULT_wxUSE_ZLIB=yes
DEFAULT_wxUSE_LIBPNG=yes
DEFAULT_wxUSE_LIBJPEG=yes
- DEFAULT_wxUSE_ODBC=yes
+ DEFAULT_wxUSE_LIBTIFF=yes
+ DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_FILE=yes
DEFAULT_wxUSE_SERIAL=yes
DEFAULT_wxUSE_JOYSTICK=yes
DEFAULT_wxUSE_DYNLIB_CLASS=yes
- DEFAULT_wxUSE_LONGLONG=no
+ DEFAULT_wxUSE_LONGLONG=yes
DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes
DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes
DEFAULT_wxUSE_COMBOBOX=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
- DEFAULT_wxUSE_NEW_GRID=yes
+ DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_SCROLLBAR=yes
DEFAULT_wxUSE_SLIDER=yes
DEFAULT_wxUSE_SPINBTN=yes
+ DEFAULT_wxUSE_SPINCTRL=yes
DEFAULT_wxUSE_SPLITTER=yes
DEFAULT_wxUSE_STATBMP=yes
DEFAULT_wxUSE_STATBOX=yes
DEFAULT_wxUSE_STATUSBAR=yes
DEFAULT_wxUSE_TABDIALOG=no
DEFAULT_wxUSE_TOOLBAR=yes
+ DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
+ DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TREECTRL=yes
DEFAULT_wxUSE_UNICODE=no
echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6
-echo "configure:1459: checking "for --enable-gui"" >&5
+echo "configure:1473: checking "for --enable-gui"" >&5
no_cache=0
# Check whether --enable-gui or --disable-gui was given.
if test "${enable_gui+set}" = set; then
fi
-if test "$wxUSE_GUI" = "no"; then
- DEFAULT_wxUSE_ZLIB=no
- DEFAULT_wxUSE_LIBPNG=no
- DEFAULT_wxUSE_LIBJPEG=no
- DEFAULT_wxUSE_SOCKETS=no
- DEFAULT_wxUSE_JOYSTICK=no
- DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no
- DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
- DEFAULT_wxUSE_POSTSCRIPT=no
- DEFAULT_wxUSE_X_RESOURCES=no
- DEFAULT_wxUSE_CLIPBOARD=no
- DEFAULT_wxUSE_TOOLTIPS=no
- DEFAULT_wxUSE_DRAG_AND_DROP=no
- DEFAULT_wxUSE_SPLINES=no
- DEFAULT_wxUSE_MDI_ARCHITECTURE=no
- DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
- DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
- DEFAULT_wxUSE_PROLOGIO=no
- DEFAULT_wxUSE_RESOURCES=no
- DEFAULT_wxUSE_CONSTRAINTS=no
- DEFAULT_wxUSE_IPC=no
- DEFAULT_wxUSE_HELP=no
- DEFAULT_wxUSE_WXTREE=no
- DEFAULT_wxUSE_METAFILE=no
- DEFAULT_wxUSE_COMMONDLGS=no
- DEFAULT_wxUSE_DIRDLG=no
- DEFAULT_wxUSE_TEXTDLG=no
- DEFAULT_wxUSE_STARTUP_TIPS=no
- DEFAULT_wxUSE_PROGRESSDLG=no
- DEFAULT_wxUSE_MINIFRAME=no
- DEFAULT_wxUSE_HTML=no
- DEFAULT_wxUSE_FS_INET=no
- DEFAULT_wxUSE_FS_ZIP=no
- DEFAULT_wxUSE_BUSYINFO=no
- DEFAULT_wxUSE_ZIPSTREAM=no
- DEFAULT_wxUSE_VALIDATORS=yes
- DEFAULT_wxUSE_ACCEL=no
- DEFAULT_wxUSE_CARET=no
- DEFAULT_wxUSE_BMPBUTTON=no
- DEFAULT_wxUSE_CHECKBOX=no
- DEFAULT_wxUSE_CHECKLST=no
- DEFAULT_wxUSE_CHOICE=yes
- DEFAULT_wxUSE_COMBOBOX=no
- DEFAULT_wxUSE_GAUGE=no
- DEFAULT_wxUSE_GRID=no
- DEFAULT_wxUSE_NEW_GRID=no
- DEFAULT_wxUSE_IMAGLIST=no
- DEFAULT_wxUSE_LISTBOX=no
- DEFAULT_wxUSE_LISTCTRL=no
- DEFAULT_wxUSE_NOTEBOOK=no
- DEFAULT_wxUSE_RADIOBOX=no
- DEFAULT_wxUSE_RADIOBTN=no
- DEFAULT_wxUSE_SASH=no
- DEFAULT_wxUSE_SCROLLBAR=no
- DEFAULT_wxUSE_SLIDER=no
- DEFAULT_wxUSE_SPINBTN=no
- DEFAULT_wxUSE_SPLITTER=no
- DEFAULT_wxUSE_STATBMP=no
- DEFAULT_wxUSE_STATBOX=no
- DEFAULT_wxUSE_STATLINE=no
- DEFAULT_wxUSE_STATUSBAR=yes
- DEFAULT_wxUSE_TABDIALOG=no
- DEFAULT_wxUSE_TOOLBAR=no
- DEFAULT_wxUSE_TREECTRL=no
- DEFAULT_wxUSE_GIF=no
- DEFAULT_wxUSE_PCX=no
- DEFAULT_wxUSE_PNM=no
-fi
+if test "$wxUSE_GUI" = "yes"; then
# Check whether --with-gtk or --without-gtk was given.
if test "${with_gtk+set}" = set; then
wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1
fi
+# Check whether --with-pm or --without-pm was given.
+if test "${with_pm+set}" = set; then
+ withval="$with_pm"
+ wxUSE_PM="$withval" CACHE_PM=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-dmalloc"""... $ac_c" 1>&6
-echo "configure:1616: checking "for --with-dmalloc"" >&5
+ echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6
+echo "configure:1569: checking "for --with-libpng"" >&5
no_cache=0
- # Check whether --with-dmalloc or --without-dmalloc was given.
-if test "${with_dmalloc+set}" = set; then
- withval="$with_dmalloc"
+ # Check whether --with-libpng or --without-libpng was given.
+if test "${with_libpng+set}" = set; then
+ withval="$with_libpng"
if test "$withval" = yes; then
- ac_cv_use_dmalloc='wxUSE_DMALLOC=yes'
+ ac_cv_use_libpng='wxUSE_LIBPNG=yes'
else
- ac_cv_use_dmalloc='wxUSE_DMALLOC=no'
+ ac_cv_use_libpng='wxUSE_LIBPNG=no'
fi
else
- LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC
+ ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG
fi
- eval "$ac_cv_use_dmalloc"
+ eval "$ac_cv_use_libpng"
if test "$no_cache" != 1; then
- echo $ac_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_libpng >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_DMALLOC" = yes; then
+ if test "$wxUSE_LIBPNG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6
-echo "configure:1655: checking "for --with-zlib"" >&5
+ echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6
+echo "configure:1608: checking "for --with-libjpeg"" >&5
no_cache=0
- # Check whether --with-zlib or --without-zlib was given.
-if test "${with_zlib+set}" = set; then
- withval="$with_zlib"
+ # Check whether --with-libjpeg or --without-libjpeg was given.
+if test "${with_libjpeg+set}" = set; then
+ withval="$with_libjpeg"
if test "$withval" = yes; then
- ac_cv_use_zlib='wxUSE_ZLIB=yes'
+ ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
else
- ac_cv_use_zlib='wxUSE_ZLIB=no'
+ ac_cv_use_libjpeg='wxUSE_LIBJPEG=no'
fi
else
- LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB
+ ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG
fi
- eval "$ac_cv_use_zlib"
+ eval "$ac_cv_use_libjpeg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_ZLIB" = yes; then
+ if test "$wxUSE_LIBJPEG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6
-echo "configure:1694: checking "for --with-libpng"" >&5
+ echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6
+echo "configure:1647: checking "for --with-libtiff"" >&5
no_cache=0
- # Check whether --with-libpng or --without-libpng was given.
-if test "${with_libpng+set}" = set; then
- withval="$with_libpng"
+ # Check whether --with-libtiff or --without-libtiff was given.
+if test "${with_libtiff+set}" = set; then
+ withval="$with_libtiff"
if test "$withval" = yes; then
- ac_cv_use_libpng='wxUSE_LIBPNG=yes'
+ ac_cv_use_libtiff='wxUSE_LIBTIFF=yes'
else
- ac_cv_use_libpng='wxUSE_LIBPNG=no'
+ ac_cv_use_libtiff='wxUSE_LIBTIFF=no'
fi
else
- LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_LIBTIFF" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG
+ ac_cv_use_libtiff='wxUSE_LIBTIFF='$DEFAULT_wxUSE_LIBTIFF
fi
- eval "$ac_cv_use_libpng"
+ eval "$ac_cv_use_libtiff"
if test "$no_cache" != 1; then
- echo $ac_cv_use_libpng >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_libtiff >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_LIBPNG" = yes; then
+ if test "$wxUSE_LIBTIFF" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6
-echo "configure:1733: checking "for --with-libjpeg"" >&5
+ echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6
+echo "configure:1686: checking "for --with-opengl"" >&5
no_cache=0
- # Check whether --with-libjpeg or --without-libjpeg was given.
-if test "${with_libjpeg+set}" = set; then
- withval="$with_libjpeg"
+ # Check whether --with-opengl or --without-opengl was given.
+if test "${with_opengl+set}" = set; then
+ withval="$with_opengl"
if test "$withval" = yes; then
- ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
+ ac_cv_use_opengl='wxUSE_OPENGL=yes'
else
- ac_cv_use_libjpeg='wxUSE_LIBJPEG=no'
+ ac_cv_use_opengl='wxUSE_OPENGL=no'
fi
else
- LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG
+ ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL
fi
- eval "$ac_cv_use_libjpeg"
+ eval "$ac_cv_use_opengl"
if test "$no_cache" != 1; then
- echo $ac_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_opengl >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_LIBJPEG" = yes; then
+ if test "$wxUSE_OPENGL" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6
-echo "configure:1772: checking "for --with-opengl"" >&5
+fi
+
+
+ echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6
+echo "configure:1728: checking "for --with-dmalloc"" >&5
no_cache=0
- # Check whether --with-opengl or --without-opengl was given.
-if test "${with_opengl+set}" = set; then
- withval="$with_opengl"
+ # Check whether --with-dmalloc or --without-dmalloc was given.
+if test "${with_dmalloc+set}" = set; then
+ withval="$with_dmalloc"
if test "$withval" = yes; then
- ac_cv_use_opengl='wxUSE_OPENGL=yes'
+ ac_cv_use_dmalloc='wxUSE_DMALLOC=yes'
else
- ac_cv_use_opengl='wxUSE_OPENGL=no'
+ ac_cv_use_dmalloc='wxUSE_DMALLOC=no'
fi
else
- LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL
+ ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC
fi
- eval "$ac_cv_use_opengl"
+ eval "$ac_cv_use_dmalloc"
if test "$no_cache" != 1; then
- echo $ac_cv_use_opengl >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_OPENGL" = yes; then
+ if test "$wxUSE_DMALLOC" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6
-echo "configure:1811: checking "for --with-odbc"" >&5
+ echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6
+echo "configure:1767: checking "for --with-zlib"" >&5
no_cache=0
- # Check whether --with-odbc or --without-odbc was given.
-if test "${with_odbc+set}" = set; then
- withval="$with_odbc"
+ # Check whether --with-zlib or --without-zlib was given.
+if test "${with_zlib+set}" = set; then
+ withval="$with_zlib"
if test "$withval" = yes; then
- ac_cv_use_odbc='wxUSE_ODBC=yes'
+ ac_cv_use_zlib='wxUSE_ZLIB=yes'
else
- ac_cv_use_odbc='wxUSE_ODBC=no'
+ ac_cv_use_zlib='wxUSE_ZLIB=no'
fi
else
- LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC
+ ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB
fi
- eval "$ac_cv_use_odbc"
+ eval "$ac_cv_use_zlib"
if test "$no_cache" != 1; then
- echo $ac_cv_use_odbc >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_ODBC" = yes; then
+ if test "$wxUSE_ZLIB" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
-
-
-
- echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6
-echo "configure:1853: checking "for --enable-shared"" >&5
+ echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6
+echo "configure:1806: checking "for --with-odbc"" >&5
no_cache=0
- # Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
- enableval="$enable_shared"
-
- if test "$enableval" = yes; then
+ # Check whether --with-odbc or --without-odbc was given.
+if test "${with_odbc+set}" = set; then
+ withval="$with_odbc"
+
+ if test "$withval" = yes; then
+ ac_cv_use_odbc='wxUSE_ODBC=yes'
+ else
+ ac_cv_use_odbc='wxUSE_ODBC=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC
+
+fi
+
+
+ eval "$ac_cv_use_odbc"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_odbc >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_ODBC" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+
+
+
+ echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6
+echo "configure:1848: checking "for --enable-shared"" >&5
+ no_cache=0
+ # Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval="$enable_shared"
+
+ if test "$enableval" = yes; then
ac_cv_use_shared='wxUSE_SHARED=yes'
else
ac_cv_use_shared='wxUSE_SHARED=no'
echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6
-echo "configure:1892: checking "for --enable-optimise"" >&5
+echo "configure:1887: checking "for --enable-optimise"" >&5
no_cache=0
# Check whether --enable-optimise or --disable-optimise was given.
if test "${enable_optimise+set}" = set; then
echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6
-echo "configure:1931: checking "for --enable-debug"" >&5
+echo "configure:1926: checking "for --enable-debug"" >&5
no_cache=0
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6
-echo "configure:1979: checking "for --enable-debug_flag"" >&5
+echo "configure:1974: checking "for --enable-debug_flag"" >&5
no_cache=0
# Check whether --enable-debug_flag or --disable-debug_flag was given.
if test "${enable_debug_flag+set}" = set; then
echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6
-echo "configure:2018: checking "for --enable-debug_info"" >&5
+echo "configure:2013: checking "for --enable-debug_info"" >&5
no_cache=0
# Check whether --enable-debug_info or --disable-debug_info was given.
if test "${enable_debug_info+set}" = set; then
echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6
-echo "configure:2057: checking "for --enable-debug_gdb"" >&5
+echo "configure:2052: checking "for --enable-debug_gdb"" >&5
no_cache=0
# Check whether --enable-debug_gdb or --disable-debug_gdb was given.
if test "${enable_debug_gdb+set}" = set; then
echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6
-echo "configure:2096: checking "for --enable-debug_cntxt"" >&5
+echo "configure:2091: checking "for --enable-debug_cntxt"" >&5
no_cache=0
# Check whether --enable-debug_cntxt or --disable-debug_cntxt was given.
if test "${enable_debug_cntxt+set}" = set; then
echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6
-echo "configure:2135: checking "for --enable-mem_tracing"" >&5
+echo "configure:2130: checking "for --enable-mem_tracing"" >&5
no_cache=0
# Check whether --enable-mem_tracing or --disable-mem_tracing was given.
if test "${enable_mem_tracing+set}" = set; then
echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6
-echo "configure:2174: checking "for --enable-profile"" >&5
+echo "configure:2169: checking "for --enable-profile"" >&5
no_cache=0
# Check whether --enable-profile or --disable-profile was given.
if test "${enable_profile+set}" = set; then
echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6
-echo "configure:2213: checking "for --enable-no_rtti"" >&5
+echo "configure:2208: checking "for --enable-no_rtti"" >&5
no_cache=0
# Check whether --enable-no_rtti or --disable-no_rtti was given.
if test "${enable_no_rtti+set}" = set; then
echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6
-echo "configure:2252: checking "for --enable-no_exceptions"" >&5
+echo "configure:2247: checking "for --enable-no_exceptions"" >&5
no_cache=0
# Check whether --enable-no_exceptions or --disable-no_exceptions was given.
if test "${enable_no_exceptions+set}" = set; then
echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6
-echo "configure:2291: checking "for --enable-permissive"" >&5
+echo "configure:2286: checking "for --enable-permissive"" >&5
no_cache=0
# Check whether --enable-permissive or --disable-permissive was given.
if test "${enable_permissive+set}" = set; then
echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6
-echo "configure:2330: checking "for --enable-no_deps"" >&5
+echo "configure:2325: 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:2371: checking "for --enable-intl"" >&5
+echo "configure:2366: checking "for --enable-intl"" >&5
no_cache=0
# Check whether --enable-intl or --disable-intl was given.
if test "${enable_intl+set}" = set; then
echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6
-echo "configure:2410: checking "for --enable-config"" >&5
+echo "configure:2405: checking "for --enable-config"" >&5
no_cache=0
# Check whether --enable-config or --disable-config was given.
if test "${enable_config+set}" = set; then
fi
+if test "$wxUSE_GUI" = "yes"; then
+
echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6
-echo "configure:2449: checking "for --enable-sockets"" >&5
+echo "configure:2446: 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_t""no" 1>&6
fi
+else
+wxUSE_SOCKETS=no
+fi
+
echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6
-echo "configure:2488: checking "for --enable-dialupman"" >&5
+echo "configure:2489: checking "for --enable-dialupman"" >&5
no_cache=0
# Check whether --enable-dialupman or --disable-dialupman was given.
if test "${enable_dialupman+set}" = set; then
echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6
-echo "configure:2527: checking "for --enable-ipc"" >&5
+echo "configure:2528: 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-apple_ieee"""... $ac_c" 1>&6
-echo "configure:2566: checking "for --enable-apple_ieee"" >&5
+echo "configure:2567: checking "for --enable-apple_ieee"" >&5
no_cache=0
# Check whether --enable-apple_ieee or --disable-apple_ieee was given.
if test "${enable_apple_ieee+set}" = set; then
echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6
-echo "configure:2605: checking "for --enable-timedate"" >&5
+echo "configure:2606: checking "for --enable-timedate"" >&5
no_cache=0
# Check whether --enable-timedate or --disable-timedate was given.
if test "${enable_timedate+set}" = set; then
echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6
-echo "configure:2644: checking "for --enable-wave"" >&5
+echo "configure:2645: checking "for --enable-wave"" >&5
no_cache=0
# Check whether --enable-wave or --disable-wave was given.
if test "${enable_wave+set}" = set; then
echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6
-echo "configure:2683: checking "for --enable-fraction"" >&5
+echo "configure:2684: checking "for --enable-fraction"" >&5
no_cache=0
# Check whether --enable-fraction or --disable-fraction was given.
if test "${enable_fraction+set}" = set; then
echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6
-echo "configure:2722: checking "for --enable-dynlib"" >&5
+echo "configure:2723: checking "for --enable-dynlib"" >&5
no_cache=0
# Check whether --enable-dynlib or --disable-dynlib was given.
if test "${enable_dynlib+set}" = set; then
echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6
-echo "configure:2761: checking "for --enable-longlong"" >&5
+echo "configure:2762: checking "for --enable-longlong"" >&5
no_cache=0
# Check whether --enable-longlong or --disable-longlong was given.
if test "${enable_longlong+set}" = set; then
echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6
-echo "configure:2800: checking "for --enable-log"" >&5
+echo "configure:2801: checking "for --enable-log"" >&5
no_cache=0
# Check whether --enable-log or --disable-log was given.
if test "${enable_log+set}" = set; then
echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6
-echo "configure:2839: checking "for --enable-streams"" >&5
+echo "configure:2840: checking "for --enable-streams"" >&5
no_cache=0
# Check whether --enable-streams or --disable-streams was given.
if test "${enable_streams+set}" = set; then
echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6
-echo "configure:2878: checking "for --enable-file"" >&5
+echo "configure:2879: checking "for --enable-file"" >&5
no_cache=0
# Check whether --enable-file or --disable-file was given.
if test "${enable_file+set}" = set; then
echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6
-echo "configure:2917: checking "for --enable-textfile"" >&5
+echo "configure:2918: checking "for --enable-textfile"" >&5
no_cache=0
# Check whether --enable-textfile or --disable-textfile was given.
if test "${enable_textfile+set}" = set; then
echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6
-echo "configure:2956: checking "for --enable-unicode"" >&5
+echo "configure:2957: checking "for --enable-unicode"" >&5
no_cache=0
# Check whether --enable-unicode or --disable-unicode was given.
if test "${enable_unicode+set}" = set; then
echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6
-echo "configure:2995: checking "for --enable-wcsrtombs"" >&5
+echo "configure:2996: checking "for --enable-wcsrtombs"" >&5
no_cache=0
# Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
if test "${enable_wcsrtombs+set}" = set; then
echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6
-echo "configure:3034: checking "for --enable-wxprintfv"" >&5
+echo "configure:3035: checking "for --enable-wxprintfv"" >&5
no_cache=0
# Check whether --enable-wxprintfv or --disable-wxprintfv was given.
if test "${enable_wxprintfv+set}" = set; then
echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6
-echo "configure:3073: checking "for --enable-joystick"" >&5
+echo "configure:3074: checking "for --enable-joystick"" >&5
no_cache=0
# Check whether --enable-joystick or --disable-joystick was given.
if test "${enable_joystick+set}" = set; then
echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6
-echo "configure:3112: checking "for --enable-std_iostreams"" >&5
+echo "configure:3113: checking "for --enable-std_iostreams"" >&5
no_cache=0
# Check whether --enable-std_iostreams or --disable-std_iostreams was given.
if test "${enable_std_iostreams+set}" = set; then
echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6
-echo "configure:3151: checking "for --enable-fs_inet"" >&5
+echo "configure:3152: checking "for --enable-fs_inet"" >&5
no_cache=0
# Check whether --enable-fs_inet or --disable-fs_inet was given.
if test "${enable_fs_inet+set}" = set; then
echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6
-echo "configure:3190: checking "for --enable-fs_zip"" >&5
+echo "configure:3191: checking "for --enable-fs_zip"" >&5
no_cache=0
# Check whether --enable-fs_zip or --disable-fs_zip was given.
if test "${enable_fs_zip+set}" = set; then
echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6
-echo "configure:3229: checking "for --enable-zipstream"" >&5
+echo "configure:3230: 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-threads"""... $ac_c" 1>&6
-echo "configure:3270: checking "for --enable-threads"" >&5
+echo "configure:3271: checking "for --enable-threads"" >&5
no_cache=0
# Check whether --enable-threads or --disable-threads was given.
if test "${enable_threads+set}" = set; then
echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6
-echo "configure:3309: checking "for --enable-serial"" >&5
+echo "configure:3310: checking "for --enable-serial"" >&5
no_cache=0
# Check whether --enable-serial or --disable-serial was given.
if test "${enable_serial+set}" = set; then
fi
+if test "$wxUSE_GUI" = "yes"; then
+
echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6
-echo "configure:3350: checking "for --enable-docview"" >&5
+echo "configure:3353: checking "for --enable-docview"" >&5
no_cache=0
# Check whether --enable-docview or --disable-docview was given.
if test "${enable_docview+set}" = set; then
echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6
-echo "configure:3389: checking "for --enable-help"" >&5
+echo "configure:3392: checking "for --enable-help"" >&5
no_cache=0
# Check whether --enable-help or --disable-help was given.
if test "${enable_help+set}" = set; then
echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6
-echo "configure:3428: checking "for --enable-constraints"" >&5
+echo "configure:3431: checking "for --enable-constraints"" >&5
no_cache=0
# Check whether --enable-constraints or --disable-constraints was given.
if test "${enable_constraints+set}" = set; then
echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6
-echo "configure:3467: checking "for --enable-printarch"" >&5
+echo "configure:3470: checking "for --enable-printarch"" >&5
no_cache=0
# Check whether --enable-printarch or --disable-printarch was given.
if test "${enable_printarch+set}" = set; then
echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6
-echo "configure:3506: checking "for --enable-mdi"" >&5
+echo "configure:3509: checking "for --enable-mdi"" >&5
no_cache=0
# Check whether --enable-mdi or --disable-mdi was given.
if test "${enable_mdi+set}" = set; then
echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6
-echo "configure:3546: checking "for --enable-postscript"" >&5
+echo "configure:3549: 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:3587: checking "for --enable-prologio"" >&5
+echo "configure:3590: checking "for --enable-prologio"" >&5
no_cache=0
# Check whether --enable-prologio or --disable-prologio was given.
if test "${enable_prologio+set}" = set; then
echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6
-echo "configure:3626: checking "for --enable-resources"" >&5
+echo "configure:3629: 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:3666: checking "for --enable-xresources"" >&5
+echo "configure:3669: 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:3707: checking "for --enable-clipboard"" >&5
+echo "configure:3710: checking "for --enable-clipboard"" >&5
no_cache=0
# Check whether --enable-clipboard or --disable-clipboard was given.
if test "${enable_clipboard+set}" = set; then
echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6
-echo "configure:3746: checking "for --enable-dnd"" >&5
+echo "configure:3749: checking "for --enable-dnd"" >&5
no_cache=0
# Check whether --enable-dnd or --disable-dnd was given.
if test "${enable_dnd+set}" = set; then
echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6
-echo "configure:3786: checking "for --enable-wxtree"" >&5
+echo "configure:3789: 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:3827: checking "for --enable-controls"" >&5
+echo "configure:3830: checking "for --enable-controls"" >&5
no_cache=0
# Check whether --enable-controls or --disable-controls was given.
if test "${enable_controls+set}" = set; then
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
- DEFAULT_wxUSE_NEW_GRID=yes
+ DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_IMAGLIST=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_SCROLLBAR=yes
DEFAULT_wxUSE_SLIDER=yes
DEFAULT_wxUSE_SPINBTN=yes
+ DEFAULT_wxUSE_SPINCTRL=yes
DEFAULT_wxUSE_SPLITTER=yes
DEFAULT_wxUSE_STATBMP=yes
DEFAULT_wxUSE_STATBOX=yes
DEFAULT_wxUSE_STATUSBAR=yes
DEFAULT_wxUSE_TAB_DIALOG=yes
DEFAULT_wxUSE_TOOLBAR=yes
+ DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
+ DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
DEFAULT_wxUSE_TOOLTIPS=yes
DEFAULT_wxUSE_TREECTRL=yes
elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_SCROLLBAR=no
DEFAULT_wxUSE_SLIDER=no
DEFAULT_wxUSE_SPINBTN=no
+ DEFAULT_wxUSE_SPINCTRL=no
DEFAULT_wxUSE_SPLITTER=no
DEFAULT_wxUSE_STATBMP=no
DEFAULT_wxUSE_STATBOX=no
DEFAULT_wxUSE_STATUSBAR=no
DEFAULT_wxUSE_TAB_DIALOG=no
DEFAULT_wxUSE_TOOLBAR=no
+ DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+ DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_TREECTRL=no
fi
echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6
-echo "configure:3929: checking "for --enable-accel"" >&5
+echo "configure:3938: checking "for --enable-accel"" >&5
no_cache=0
# Check whether --enable-accel or --disable-accel was given.
if test "${enable_accel+set}" = set; then
echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6
-echo "configure:3968: checking "for --enable-caret"" >&5
+echo "configure:3977: checking "for --enable-caret"" >&5
no_cache=0
# Check whether --enable-caret or --disable-caret was given.
if test "${enable_caret+set}" = set; then
echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6
-echo "configure:4007: checking "for --enable-bmpbutton"" >&5
+echo "configure:4016: checking "for --enable-bmpbutton"" >&5
no_cache=0
# Check whether --enable-bmpbutton or --disable-bmpbutton was given.
if test "${enable_bmpbutton+set}" = set; then
echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6
-echo "configure:4046: checking "for --enable-checkbox"" >&5
+echo "configure:4055: checking "for --enable-checkbox"" >&5
no_cache=0
# Check whether --enable-checkbox or --disable-checkbox was given.
if test "${enable_checkbox+set}" = set; then
echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6
-echo "configure:4085: checking "for --enable-checklst"" >&5
+echo "configure:4094: checking "for --enable-checklst"" >&5
no_cache=0
# Check whether --enable-checklst or --disable-checklst was given.
if test "${enable_checklst+set}" = set; then
echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6
-echo "configure:4124: checking "for --enable-choice"" >&5
+echo "configure:4133: checking "for --enable-choice"" >&5
no_cache=0
# Check whether --enable-choice or --disable-choice was given.
if test "${enable_choice+set}" = set; then
echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6
-echo "configure:4163: checking "for --enable-combobox"" >&5
+echo "configure:4172: checking "for --enable-combobox"" >&5
no_cache=0
# Check whether --enable-combobox or --disable-combobox was given.
if test "${enable_combobox+set}" = set; then
echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6
-echo "configure:4202: checking "for --enable-gauge"" >&5
+echo "configure:4211: checking "for --enable-gauge"" >&5
no_cache=0
# Check whether --enable-gauge or --disable-gauge was given.
if test "${enable_gauge+set}" = set; then
echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6
-echo "configure:4241: checking "for --enable-grid"" >&5
+echo "configure:4250: checking "for --enable-grid"" >&5
no_cache=0
# Check whether --enable-grid or --disable-grid was given.
if test "${enable_grid+set}" = set; then
echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6
-echo "configure:4280: checking "for --enable-newgrid"" >&5
+echo "configure:4289: checking "for --enable-newgrid"" >&5
no_cache=0
# Check whether --enable-newgrid or --disable-newgrid was given.
if test "${enable_newgrid+set}" = set; then
echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6
-echo "configure:4319: checking "for --enable-imaglist"" >&5
+echo "configure:4328: checking "for --enable-imaglist"" >&5
no_cache=0
# Check whether --enable-imaglist or --disable-imaglist was given.
if test "${enable_imaglist+set}" = set; then
echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6
-echo "configure:4358: checking "for --enable-listbox"" >&5
+echo "configure:4367: checking "for --enable-listbox"" >&5
no_cache=0
# Check whether --enable-listbox or --disable-listbox was given.
if test "${enable_listbox+set}" = set; then
echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6
-echo "configure:4397: checking "for --enable-listctrl"" >&5
+echo "configure:4406: checking "for --enable-listctrl"" >&5
no_cache=0
# Check whether --enable-listctrl or --disable-listctrl was given.
if test "${enable_listctrl+set}" = set; then
echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6
-echo "configure:4436: checking "for --enable-notebook"" >&5
+echo "configure:4445: checking "for --enable-notebook"" >&5
no_cache=0
# Check whether --enable-notebook or --disable-notebook was given.
if test "${enable_notebook+set}" = set; then
echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6
-echo "configure:4475: checking "for --enable-radiobox"" >&5
+echo "configure:4484: checking "for --enable-radiobox"" >&5
no_cache=0
# Check whether --enable-radiobox or --disable-radiobox was given.
if test "${enable_radiobox+set}" = set; then
echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6
-echo "configure:4514: checking "for --enable-radiobtn"" >&5
+echo "configure:4523: checking "for --enable-radiobtn"" >&5
no_cache=0
# Check whether --enable-radiobtn or --disable-radiobtn was given.
if test "${enable_radiobtn+set}" = set; then
echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6
-echo "configure:4553: checking "for --enable-sash"" >&5
+echo "configure:4562: checking "for --enable-sash"" >&5
no_cache=0
# Check whether --enable-sash or --disable-sash was given.
if test "${enable_sash+set}" = set; then
echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6
-echo "configure:4592: checking "for --enable-scrollbar"" >&5
+echo "configure:4601: checking "for --enable-scrollbar"" >&5
no_cache=0
# Check whether --enable-scrollbar or --disable-scrollbar was given.
if test "${enable_scrollbar+set}" = set; then
echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6
-echo "configure:4631: checking "for --enable-slider"" >&5
+echo "configure:4640: checking "for --enable-slider"" >&5
no_cache=0
# Check whether --enable-slider or --disable-slider was given.
if test "${enable_slider+set}" = set; then
echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6
-echo "configure:4670: checking "for --enable-spinbtn"" >&5
+echo "configure:4679: 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:4718: checking "for --enable-spinctrl"" >&5
+ no_cache=0
+ # Check whether --enable-spinctrl or --disable-spinctrl was given.
+if test "${enable_spinctrl+set}" = set; then
+ enableval="$enable_spinctrl"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
+ else
+ ac_cv_use_spinctrl='wxUSE_SPINCTRL=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL
+
+fi
+
+
+ eval "$ac_cv_use_spinctrl"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_SPINCTRL" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6
-echo "configure:4709: checking "for --enable-splitter"" >&5
+echo "configure:4757: checking "for --enable-splitter"" >&5
no_cache=0
# Check whether --enable-splitter or --disable-splitter was given.
if test "${enable_splitter+set}" = set; then
echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6
-echo "configure:4748: checking "for --enable-statbmp"" >&5
+echo "configure:4796: checking "for --enable-statbmp"" >&5
no_cache=0
# Check whether --enable-statbmp or --disable-statbmp was given.
if test "${enable_statbmp+set}" = set; then
echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6
-echo "configure:4787: checking "for --enable-statbox"" >&5
+echo "configure:4835: checking "for --enable-statbox"" >&5
no_cache=0
# Check whether --enable-statbox or --disable-statbox was given.
if test "${enable_statbox+set}" = set; then
echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6
-echo "configure:4826: checking "for --enable-statline"" >&5
+echo "configure:4874: checking "for --enable-statline"" >&5
no_cache=0
# Check whether --enable-statline or --disable-statline was given.
if test "${enable_statline+set}" = set; then
echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6
-echo "configure:4865: checking "for --enable-statusbar"" >&5
+echo "configure:4913: checking "for --enable-statusbar"" >&5
no_cache=0
# Check whether --enable-statusbar or --disable-statusbar was given.
if test "${enable_statusbar+set}" = set; then
echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6
-echo "configure:4904: checking "for --enable-tabdialog"" >&5
+echo "configure:4952: checking "for --enable-tabdialog"" >&5
no_cache=0
# Check whether --enable-tabdialog or --disable-tabdialog was given.
if test "${enable_tabdialog+set}" = set; then
echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6
-echo "configure:4943: checking "for --enable-toolbar"" >&5
+echo "configure:4991: checking "for --enable-toolbar"" >&5
no_cache=0
# Check whether --enable-toolbar or --disable-toolbar was given.
if test "${enable_toolbar+set}" = set; then
fi
+ echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6
+echo "configure:5030: checking "for --enable-tbarnative"" >&5
+ no_cache=0
+ # 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_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+ else
+ ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+ fi
+
+else
+
+ 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_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
+
+fi
+
+
+ eval "$ac_cv_use_tbarnative"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
+ fi
+
+ 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-tbarsmpl"""... $ac_c" 1>&6
+echo "configure:5069: checking "for --enable-tbarsmpl"" >&5
+ no_cache=0
+ # 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_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
+ else
+ ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
+ fi
+
+else
+
+ 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_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
+
+fi
+
+
+ eval "$ac_cv_use_tbarsmpl"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
+ fi
+
+ 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-treectrl"""... $ac_c" 1>&6
-echo "configure:4982: checking "for --enable-treectrl"" >&5
+echo "configure:5108: checking "for --enable-treectrl"" >&5
no_cache=0
# Check whether --enable-treectrl or --disable-treectrl was given.
if test "${enable_treectrl+set}" = set; then
echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6
-echo "configure:5023: checking "for --enable-commondlg"" >&5
+echo "configure:5149: checking "for --enable-commondlg"" >&5
no_cache=0
# Check whether --enable-commondlg or --disable-commondlg was given.
if test "${enable_commondlg+set}" = set; then
echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6
-echo "configure:5062: checking "for --enable-dirdlg"" >&5
+echo "configure:5188: checking "for --enable-dirdlg"" >&5
no_cache=0
# Check whether --enable-dirdlg or --disable-dirdlg was given.
if test "${enable_dirdlg+set}" = set; then
echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6
-echo "configure:5101: checking "for --enable-textdlg"" >&5
+echo "configure:5227: checking "for --enable-textdlg"" >&5
no_cache=0
# Check whether --enable-textdlg or --disable-textdlg was given.
if test "${enable_textdlg+set}" = set; then
echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6
-echo "configure:5140: checking "for --enable-tipdlg"" >&5
+echo "configure:5266: checking "for --enable-tipdlg"" >&5
no_cache=0
# Check whether --enable-tipdlg or --disable-tipdlg was given.
if test "${enable_tipdlg+set}" = set; then
echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6
-echo "configure:5179: checking "for --enable-progressdlg"" >&5
+echo "configure:5305: checking "for --enable-progressdlg"" >&5
no_cache=0
# Check whether --enable-progressdlg or --disable-progressdlg was given.
if test "${enable_progressdlg+set}" = set; then
echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6
-echo "configure:5218: checking "for --enable-miniframe"" >&5
+echo "configure:5344: checking "for --enable-miniframe"" >&5
no_cache=0
# Check whether --enable-miniframe or --disable-miniframe was given.
if test "${enable_miniframe+set}" = set; then
echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6
-echo "configure:5257: checking "for --enable-html"" >&5
+echo "configure:5383: checking "for --enable-html"" >&5
no_cache=0
# Check whether --enable-html or --disable-html was given.
if test "${enable_html+set}" = set; then
echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6
-echo "configure:5296: checking "for --enable-tooltips"" >&5
+echo "configure:5422: checking "for --enable-tooltips"" >&5
no_cache=0
# Check whether --enable-tooltips or --disable-tooltips was given.
if test "${enable_tooltips+set}" = set; then
echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6
-echo "configure:5335: checking "for --enable-splines"" >&5
+echo "configure:5461: checking "for --enable-splines"" >&5
no_cache=0
# Check whether --enable-splines or --disable-splines was given.
if test "${enable_splines+set}" = set; then
echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6
-echo "configure:5374: checking "for --enable-validators"" >&5
+echo "configure:5500: checking "for --enable-validators"" >&5
no_cache=0
# Check whether --enable-validators or --disable-validators was given.
if test "${enable_validators+set}" = set; then
echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6
-echo "configure:5413: checking "for --enable-busyinfo"" >&5
+echo "configure:5539: checking "for --enable-busyinfo"" >&5
no_cache=0
# Check whether --enable-busyinfo or --disable-busyinfo was given.
if test "${enable_busyinfo+set}" = set; then
echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6
-echo "configure:5454: checking "for --enable-gif"" >&5
+echo "configure:5580: checking "for --enable-gif"" >&5
no_cache=0
# Check whether --enable-gif or --disable-gif was given.
if test "${enable_gif+set}" = set; then
echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6
-echo "configure:5493: checking "for --enable-pcx"" >&5
+echo "configure:5619: checking "for --enable-pcx"" >&5
no_cache=0
# Check whether --enable-pcx or --disable-pcx was given.
if test "${enable_pcx+set}" = set; then
echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6
-echo "configure:5532: checking "for --enable-pnm"" >&5
+echo "configure:5658: 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
+fi
+
echo "saving argument cache $wx_arg_cache_file"
mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:5577: checking for toolkit" >&5
+echo "configure:5705: checking for toolkit" >&5
if test "$wxUSE_GUI" = "yes"; then
+if test "$USE_BEOS" = 1; then
+ { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; }
+fi
+
if test "$TOOLKIT_GIVEN" = 1; then
for toolkit in `echo $ALL_TOOLKITS`; do
var=wxUSE_$toolkit
NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
+case "${host}" in
+ *-pc-os2_emx )
+ NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
+ # PATH_IFS is autodetected by OS/2's configure (usually ';')
+ LEX_STEM="lexyy"
+ ;;
+ *)
+ PATH_IFS=':'
+ LEX_STEM="lex.yy"
+ PROGRAM_EXT=
+ ;;
+esac
+
case "$NUM_TOOLKITS" in
1)
;;
done
else
+ PATH_IFS=':'
echo "$ac_t""base only" 1>&6
fi
# 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:5694: checking for $ac_word" >&5
+echo "configure:5840: 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:5724: checking for $ac_word" >&5
+echo "configure:5870: 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:5775: checking for $ac_word" >&5
+echo "configure:5921: 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:5807: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:5953: 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 5818 "configure"
+#line 5964 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:5823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5969: \"$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:5849: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:5995: 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:5854: checking whether we are using GNU C" >&5
+echo "configure:6000: 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:5863: \"$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:6009: \"$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:5882: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:6028: 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:5917: checking how to run the C preprocessor" >&5
+echo "configure:6063: 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 5932 "configure"
+#line 6078 "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:5938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6084: \"$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 5949 "configure"
+#line 6095 "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:5955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6101: \"$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 5966 "configure"
+#line 6112 "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:5972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6118: \"$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:5999: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:6145: 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 6005 "configure"
+#line 6151 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 6023 "configure"
+#line 6169 "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:6059: checking for $ac_word" >&5
+echo "configure:6205: 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:6091: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:6237: 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 6102 "configure"
+#line 6248 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:6107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6253: \"$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:6133: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:6279: 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:6138: checking whether we are using GNU C++" >&5
+echo "configure:6284: 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:6147: \"$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:6293: \"$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:6166: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:6312: 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:6199: checking how to run the C++ preprocessor" >&5
+echo "configure:6345: 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 6212 "configure"
+#line 6358 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6363: \"$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:6255: checking for $ac_word" >&5
+echo "configure:6401: 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:6286: checking for $ac_word" >&5
+echo "configure:6432: 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:6326: checking for a BSD compatible install" >&5
+echo "configure:6472: 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:6382: checking for $ac_word" >&5
+echo "configure:6528: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:6411: checking "make for VPATH support"" >&5
+echo "configure:6557: checking "make for VPATH support"" >&5
cat - << EOF > confMake
check : file
cp \$? \$@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6440: checking for $ac_word" >&5
+echo "configure:6586: 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:6474: checking for $ac_word" >&5
+echo "configure:6620: 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:6508: checking for yywrap in -l$ac_lib" >&5
+echo "configure:6654: 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 6516 "configure"
+#line 6662 "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:6527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6673: \"$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:6551: checking whether ln -s works" >&5
+echo "configure:6697: 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
SEARCH_INCLUDE="\
+ /usr/local/include \
+ \
/usr/Motif-1.2/include \
/usr/Motif-2.1/include \
\
\
/usr/Motif1.2/include \
/usr/dt/include \
+ /usr/openwin/include \
+ \
/usr/include/Xm \
\
/usr/X11R6/include \
+ /usr/X11R6.4/include \
/usr/X11R5/include \
/usr/X11R4/include \
\
- /usr/X11R6/lib \
- /usr/X11R5/lib \
- /usr/X11R4/lib \
- \
/usr/include/X11R6 \
/usr/include/X11R5 \
/usr/include/X11R4 \
/usr/x386/include \
/usr/XFree86/include/X11 \
\
- /usr/include \
- /usr/local/include \
+ X:/XFree86/include \
+ X:/XFree86/include/X11 \
\
/usr/include/gtk \
/usr/local/include/gtk \
/usr/local/x11r5/include \
/usr/lpp/Xamples/include \
\
- /usr/openwin/include \
/usr/openwin/share/include \
- "
+ \
+ /usr/include"
SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
+AFMINSTALL=
+
if test "$wxUSE_GUI" = "yes"; then
+USE_GUI=1
+
TOOLKIT=
TOOLKIT_INCLUDE=
GUI_TK_LINK=
WXGTK12=
+WXGTK13=
WXWINE=
-PROGRAM_EXT=
-
if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
if test "$cross_compiling" = "yes" ; then
echo "configure: warning: Cross compiling --- skipping windows.h check" 1>&2
else
echo $ac_n "checking for Windows headers""... $ac_c" 1>&6
-echo "configure:6714: checking for Windows headers" >&5
+echo "configure:6864: checking for Windows headers" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
fi
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
- LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+
+ if test "$wxUSE_MINGW" = 1; then
+ LDFLAGS="$LDFLAGS -mwindows"
+ fi
TOOLKIT=MSW
GENERICOBJS="\$(MSW_GENERICOBJS)"
UNIXOBJS=
GUIDIST=MSW_DIST
- PROGRAM_EXT=.exe
fi
if test "$wxUSE_GTK" = 1; 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:6766: checking for $ac_word" >&5
+echo "configure:6919: 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
echo "$ac_t""no" 1>&6
fi
- min_gtk_version=1.2.1
+ min_gtk_version=1.2.3
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:6801: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:6954: 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 6814 "configure"
+#line 6967 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
+#include <gtk/gtkfeatures.h>
#include <stdio.h>
int
exit(1);
}
+ if ((GTK_MAJOR_VERSION != gtk_major_version) ||
+ (GTK_MINOR_VERSION != gtk_minor_version) ||
+ (GTK_MICRO_VERSION != gtk_micro_version)) {
+ printf("Headers vs. library version mismatch!\n");
+ exit(1);
+ }
+
if (gtk_minor_version == 1) return FALSE;
return !((gtk_major_version > major) ||
}
EOF
-if { (eval echo configure:6838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
echo "$ac_t""no" 1>&6
GTK_CFLAGS=""
GTK_LIBS=""
- { echo "configure: error: Is gtk-config in path and GTK+ is version 1.2.1 or above?" 1>&2; exit 1; }
+ { echo "configure: error: Is gtk-config in path and GTK+ is version 1.2.3 or above?" 1>&2; exit 1; }
fi
TOOLKIT_INCLUDE="$GTK_CFLAGS"
- GUI_TK_LIBRARY="$GTK_LIBS"
+ GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
TOOLKIT=GTK
+ AFMINSTALL=afminstall
+
GUIOBJS="\$(GTK_GUIOBJS)"
GUIHEADERS="\$(GTK_HEADERS)"
COMMONOBJS="\$(GTK_COMMONOBJS)"
COMMONDEPS="\$(GTK_COMMONDEPS)"
GENERICDEPS="\$(GTK_GENERICDEPS)"
UNIXOBJS="\$(UNIX_OBJS)"
+ UNIXDEPS="\$(UNIX_DEPS)"
GUIDIST=GTK_DIST
+
+echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+echo "configure:7047: 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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lgdk $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7055 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char gdk_im_open();
+
+int main() {
+gdk_im_open()
+; return 0; }
+EOF
+if { (eval echo configure:7066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_XIM 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
fi
if test "$wxUSE_WINE" = 1; then
echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
-echo "configure:6885: checking for WINE includes" >&5
+echo "configure:7094: checking for WINE includes" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
XPM_LINK=""
echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:6906: checking for Xpm library" >&5
+echo "configure:7115: checking for Xpm library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
MESA_LINK=""
echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:6934: checking for Mesa library" >&5
+echo "configure:7143: checking for Mesa library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
COMMONDEPS="\$(MSW_COMMONDEPS)"
GENERICDEPS="\$(MSW_GENERICDEPS)"
UNIXOBJS="\$(UNIX_OBJS)"
+ UNIXDEPS="\$(UNIX_DEPS)"
GUIDIST=MSW_DIST
fi
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:6977: checking for X" >&5
+echo "configure:7187: 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 7039 "configure"
+#line 7249 "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:7044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7254: \"$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 7113 "configure"
+#line 7323 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:7120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7330: \"$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:7226: checking whether -R must be followed by a space" >&5
+echo "configure:7436: 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 7229 "configure"
+#line 7439 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:7236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7446: \"$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 7252 "configure"
+#line 7462 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:7259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7469: \"$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:7291: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:7501: 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 7299 "configure"
+#line 7509 "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:7310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7520: \"$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:7332: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:7542: 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 7340 "configure"
+#line 7550 "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:7351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7561: \"$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:7380: checking for gethostbyname" >&5
+echo "configure:7590: 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 7385 "configure"
+#line 7595 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char gethostbyname();
+char (*f)();
int main() {
#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
choke me
#else
-gethostbyname();
+f = gethostbyname;
#endif
; return 0; }
EOF
-if { (eval echo configure:7408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7619: \"$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:7429: checking for gethostbyname in -lnsl" >&5
+echo "configure:7640: 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 7437 "configure"
+#line 7648 "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:7448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7659: \"$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:7478: checking for connect" >&5
+echo "configure:7689: 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 7483 "configure"
+#line 7694 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char connect();
+char (*f)();
int main() {
#if defined (__stub_connect) || defined (__stub___connect)
choke me
#else
-connect();
+f = connect;
#endif
; return 0; }
EOF
-if { (eval echo configure:7506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7718: \"$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:7527: checking for connect in -lsocket" >&5
+echo "configure:7739: 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 7535 "configure"
+#line 7747 "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:7546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7758: \"$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:7570: checking for remove" >&5
+echo "configure:7782: 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 7575 "configure"
+#line 7787 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char remove();
+char (*f)();
int main() {
#if defined (__stub_remove) || defined (__stub___remove)
choke me
#else
-remove();
+f = remove;
#endif
; return 0; }
EOF
-if { (eval echo configure:7598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7811: \"$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:7619: checking for remove in -lposix" >&5
+echo "configure:7832: 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 7627 "configure"
+#line 7840 "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:7638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7851: \"$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:7662: checking for shmat" >&5
+echo "configure:7875: 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 7667 "configure"
+#line 7880 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char shmat();
+char (*f)();
int main() {
#if defined (__stub_shmat) || defined (__stub___shmat)
choke me
#else
-shmat();
+f = shmat;
#endif
; return 0; }
EOF
-if { (eval echo configure:7690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7904: \"$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:7711: checking for shmat in -lipc" >&5
+echo "configure:7925: 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 7719 "configure"
+#line 7933 "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:7730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7944: \"$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:7763: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:7977: 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 7771 "configure"
+#line 7985 "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:7782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7996: \"$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 "$no_x" = "yes"; then
- { echo "configure: error: X11 libraries not found" 1>&2; exit 1; }
+ { echo "configure: error: X11 not found" 1>&2; exit 1; }
fi
- TOOLKIT_INCLUDE="$X_CFLAGS"
GUI_TK_LIBRARY="$X_LIBS"
+ TOOLKIT_INCLUDE="$X_CFLAGS"
+
+ AFMINSTALL=afminstall
- echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6
-echo "configure:7815: checking for Motif/Lesstif includes" >&5
+
+ echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
+echo "configure:8032: checking for Motif/Lesstif headers" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
fi
echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:7834: checking for Motif/Lesstif library" >&5
+echo "configure:8051: checking for Motif/Lesstif library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
fi
- CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link"
+ 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
fi
echo $ac_n "checking for Xt library""... $ac_c" 1>&6
-echo "configure:7877: checking for Xt library" >&5
+echo "configure:8094: checking for Xt library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
ac_path_to_link="-L$ac_find_libraries"
fi
- CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
echo "$ac_t""found at $ac_find_libraries" 1>&6
else
echo "$ac_t""no" 1>&6
XPM_LINK=""
echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:7909: checking for Xpm library" >&5
+echo "configure:8126: checking for Xpm library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
ac_path_to_link="-L$ac_find_libraries"
fi
- CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
XPM_LINK="-lXpm "
cat >> confdefs.h <<\EOF
#define wxHAVE_LIB_XPM 1
echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
fi
- GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -lm"
+ GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11 -lm"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
TOOLKIT=MOTIF
COMMONDEPS="\$(MOTIF_COMMONDEPS)"
GENERICDEPS="\$(MOTIF_GENERICDEPS)"
UNIXOBJS="\$(UNIX_OBJS)"
+ UNIXDEPS="\$(UNIX_DEPS)"
GUIDIST=MOTIF_DIST
fi
-TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`
+if test "$wxUSE_PM" = 1; then
+ TOOLKIT=PM
+
+ GUIOBJS="\$(PM_GUIOBJS)"
+ GUIHEADERS="\$(PM_HEADERS)"
+ COMMONOBJS="\$(PM_COMMONOBJS)"
+ GENERICOBJS="\$(PM_GENERICOBJS)"
+ GUIDEPS="\$(PM_GUIDEPS)"
+ COMMONDEPS="\$(PM_COMMONDEPS)"
+ GENERICDEPS="\$(PM_GENERICDEPS)"
+ UNIXOBJS=
+ UNIXDEPS=
+ GUIDIST=GTK_DIST
+fi
+
+if test "$TOOLKIT" != "PM" ; then
+ TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
+else
+ TOOLKIT_DIR="os2"
+fi
TOOLKIT_DEF="-D__WX${TOOLKIT}__"
WX_LIBRARY="wx_${TOOLKIT_DIR}"
- ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(JPEGOBJS) \$(PNGOBJS) \$(ZLIBOBJS) \$(IODBCOBJS)"
+ ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)"
+ if test "$wxUSE_LIBJPEG" = "yes" ; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
+ fi
+ if test "$wxUSE_LIBTIFF" = "yes" ; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)"
+ fi
+ if test "$wxUSE_LIBPNG" = "yes" ; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)"
+ fi
+ if test "$wxUSE_ZLIB" = "yes" ; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+ fi
ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)"
ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)"
else
+ USE_GUI=0
+
ALL_OBJECTS="\$(BASE_OBJS)"
ALL_DEPFILES="\${BASE_DEPS}"
ALL_HEADERS="\${BASE_HEADERS}"
PIC_FLAG=
WX_ALL=
WX_ALL_INSTALLED=
+BURNT_LIBRARY_NAME=
-if test "$wxUSE_SHARED" = "yes"; then
- WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
+if test "$wxUSE_SHARED" = "yes"; then
case "${host}" in
*-hp-hpux* )
+ if test "$GCC" = yes ; then
+ SHARED_LD="${CC} -shared -fPIC -o"
+ PIC_FLAG="-fPIC"
+ else
+ SHARED_LD="${CXX} -b -o"
+ PIC_FLAG="+Z"
+ fi
WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
- SHARED_LD="${CXX} -b -o"
- PIC_FLAG="+Z"
WX_ALL=${WX_LIBRARY_NAME_SHARED}
;;
- *-*-linux* )
+
+ *-*-linux* )
SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC"
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
- ;;
+ ;;
*-*-irix5* | *-*-irix6* )
if test "$GCC" = yes ; then
SHARED_LD="${CC} -shared -o"
PIC_FLAG="-fPIC"
else
SHARED_LD="${CXX} -G -o"
- PIC_FLAG="PIC"
+ PIC_FLAG="-KPIC"
fi
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
;;
- *-*-mingw32* )
+ *-*-mingw32* )
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
;;
*-pc-os2_emx )
+ WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+ WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+ ;;
+ *-*-beos* )
+ SHARED_LD="${LD} -shared -o"
+ PIC_FLAG="-fPIC"
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+ WX_ALL="CREATE_LINKS"
;;
*)
{ echo "configure: error: unknown system type ${host}." 1>&2; exit 1; }
esac
+ if test "x$WX_TARGET_LIBRARY" = "x"; then
+ WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
+ fi
else
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_ALL="${WX_LIBRARY_NAME_STATIC}"
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8087: checking for $ac_hdr" >&5
+echo "configure:8355: 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 8092 "configure"
+#line 8360 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8365: \"$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:8127: checking for $ac_hdr" >&5
+echo "configure:8395: 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 8132 "configure"
+#line 8400 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8405: \"$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:8167: checking for $ac_hdr" >&5
+echo "configure:8435: 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 8172 "configure"
+#line 8440 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8445: \"$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:8207: checking for $ac_hdr" >&5
+echo "configure:8475: 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 8212 "configure"
+#line 8480 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8485: \"$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:8247: checking for $ac_hdr" >&5
+echo "configure:8515: 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 8252 "configure"
+#line 8520 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8525: \"$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:8289: checking for $ac_hdr" >&5
+echo "configure:8557: 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 8294 "configure"
+#line 8562 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8567: \"$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:8329: checking for ANSI C header files" >&5
+echo "configure:8597: 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 8334 "configure"
+#line 8602 "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:8342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8610: \"$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 8359 "configure"
+#line 8627 "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 8377 "configure"
+#line 8645 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 8398 "configure"
+#line 8666 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:8409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8677: \"$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:8433: checking for mode_t" >&5
+echo "configure:8701: 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 8438 "configure"
+#line 8706 "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:8466: checking for off_t" >&5
+echo "configure:8734: 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 8471 "configure"
+#line 8739 "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:8499: checking for pid_t" >&5
+echo "configure:8767: 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 8504 "configure"
+#line 8772 "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:8532: checking for size_t" >&5
+echo "configure:8800: 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 8537 "configure"
+#line 8805 "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:8565: checking for uid_t in sys/types.h" >&5
+echo "configure:8833: 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 8570 "configure"
+#line 8838 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:8602: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
+echo "configure:8869: 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 8607 "configure"
+
+ cat > conftest.$ac_ext <<EOF
+#line 8875 "configure"
#include "confdefs.h"
-
+#include <pwd.h>
int main() {
-/* Ultrix mips cc rejects this. */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this. */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this. */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in an arm
- of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this. */
- char *t;
+ char *p;
+ struct passwd *pw;
+ p = pw->pw_gecos;
+
+; return 0; }
+EOF
+if { (eval echo configure:8886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ wx_cv_struct_pw_gecos=yes
+ cat >> confdefs.h <<\EOF
+#define HAVE_PW_GECOS 1
+EOF
+
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ wx_cv_struct_pw_gecos=no
+
+
+fi
+rm -f conftest*
+
+
+fi
+
+echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6
+
+
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:8913: 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 8918 "configure"
+#include "confdefs.h"
+
+int main() {
+
+/* Ultrix mips cc rejects this. */
+typedef int charset[2]; const charset x;
+/* SunOS 4.1.1 cc rejects this. */
+char const *const *ccp;
+char **p;
+/* NEC SVR4.0.2 mips cc rejects this. */
+struct point {int x, y;};
+static struct point const zero = {0,0};
+/* AIX XL C 1.02.0.0 rejects this.
+ It does not let you subtract one const X* pointer from another in an arm
+ of an if-expression whose if-part is not a constant expression */
+const char *g = "string";
+ccp = &g + (g ? g-g : 0);
+/* HPUX 7.0 cc rejects these. */
+++ccp;
+p = (char**) ccp;
+ccp = (char const *const *) p;
+{ /* SCO 3.2v4 cc rejects this. */
+ char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
; return 0; }
EOF
-if { (eval echo configure:8656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8967: \"$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:8677: checking for inline" >&5
+echo "configure:8988: 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 8684 "configure"
+#line 8995 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:8691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9002: \"$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:8718: checking size of char" >&5
+echo "configure:9029: 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 8726 "configure"
+#line 9037 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:8737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9048: \"$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:8757: checking size of short" >&5
+echo "configure:9068: 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 8765 "configure"
+#line 9076 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:8776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9087: \"$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:8796: checking size of int *" >&5
+echo "configure:9107: 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 8804 "configure"
+#line 9115 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:8815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9126: \"$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:8835: checking size of int" >&5
+echo "configure:9146: 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 8843 "configure"
+#line 9154 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:8854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9165: \"$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:8874: checking size of long" >&5
+echo "configure:9185: 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 8882 "configure"
+#line 9193 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:8893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9204: \"$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:8913: checking size of long long" >&5
+echo "configure:9224: 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 8921 "configure"
+#line 9232 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:8932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9243: \"$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 whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:8953: checking whether byte ordering is bigendian" >&5
+echo "configure:9264: 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 8960 "configure"
+#line 9271 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:8971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9282: \"$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 8975 "configure"
+#line 9286 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:8986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9297: \"$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 9006 "configure"
+#line 9317 "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:9019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9330: \"$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:9066: checking for $ac_hdr" >&5
+echo "configure:9377: 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 9071 "configure"
+#line 9382 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:9124: checking if C++ compiler supports bool" >&5
+echo "configure:9435: 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 9139 "configure"
+#line 9450 "configure"
#include "confdefs.h"
; return 0; }
EOF
-if { (eval echo configure:9151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
- echo $ac_n "checking if size_t and int are different types""... $ac_c" 1>&6
-echo "configure:9193: checking if size_t and int are different types" >&5
-if eval "test \"`echo '$''{'wx_cv_cpp_sizet_not_int'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
-
- ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-
- if test "$cross_compiling" = yes; then
- wx_cv_cpp_sizet_not_int=no
-
-else
- cat > conftest.$ac_ext <<EOF
-#line 9212 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
- #include <stdlib.h>
-
- class S
- {
- public:
- S(char *s) { m_s = s; }
-
- char operator[](size_t n) const { return m_s[n]; }
- char operator[](int n) const { return m_s[n]; }
-
- private:
- char *m_s;
- };
-
- int main()
- {
- S s("dummy");
- size_t n1 = 2;
- int n2 = 3;
-
- return s[n1] == s[n2];
- }
-
-EOF
-if { (eval echo configure:9242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- cat >> confdefs.h <<\EOF
-#define wxUSE_SIZE_T_STRING_OPERATOR 1
-EOF
- wx_cv_cpp_sizet_not_int=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- wx_cv_cpp_sizet_not_int=no
-fi
-rm -fr conftest*
-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
-
-
-fi
-
-echo "$ac_t""$wx_cv_cpp_sizet_not_int" 1>&6
-
-
-
echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6
-echo "configure:9273: checking if you need GNU extensions" >&5
+echo "configure:9504: 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 9279 "configure"
+#line 9510 "configure"
#include "confdefs.h"
#include <features.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:9292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9523: \"$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:9317: checking for wcslen in -lc" >&5
+echo "configure:9548: 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 9325 "configure"
+#line 9556 "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:9336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9567: \"$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:9362: checking for wcslen in -lw" >&5
+echo "configure:9593: 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 9370 "configure"
+#line 9601 "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:9381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9612: \"$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:9412: checking for vprintf" >&5
+echo "configure:9643: 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 9417 "configure"
+#line 9648 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char vprintf();
+char (*f)();
int main() {
#if defined (__stub_vprintf) || defined (__stub___vprintf)
choke me
#else
-vprintf();
+f = vprintf;
#endif
; return 0; }
EOF
-if { (eval echo configure:9440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9672: \"$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:9464: checking for _doprnt" >&5
+echo "configure:9696: 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 9469 "configure"
+#line 9701 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char _doprnt();
+char (*f)();
int main() {
#if defined (__stub__doprnt) || defined (__stub____doprnt)
choke me
#else
-_doprnt();
+f = _doprnt;
#endif
; return 0; }
EOF
-if { (eval echo configure:9492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9725: \"$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
for ac_func in vsnprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9520: checking for $ac_func" >&5
+echo "configure:9753: 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 9525 "configure"
+#line 9758 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
+char (*f)();
int main() {
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+f = $ac_func;
#endif
; return 0; }
EOF
-if { (eval echo configure:9548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9782: \"$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 vsscanf""... $ac_c" 1>&6
-echo "configure:9588: checking for vsscanf" >&5
+echo "configure:9822: checking for vsscanf" >&5
if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
else
cat > conftest.$ac_ext <<EOF
-#line 9598 "configure"
+#line 9832 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
}
EOF
-if { (eval echo configure:9625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cat >> confdefs.h <<\EOF
for ac_func in vfork
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9661: checking for $ac_func" >&5
+echo "configure:9895: 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 9900 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+char (*f)();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:9924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+
+for ac_func in timegm
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:9952: 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 9666 "configure"
+#line 9957 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
+char (*f)();
int main() {
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+f = $ac_func;
#endif
; return 0; }
EOF
-if { (eval echo configure:9689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
done
-POSIX4_LINK=
-for ac_func in nanosleep
+HAVE_SOME_SLEEP_FUNC=0
+if test "$USE_BEOS" = 1; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_SLEEP 1
+EOF
+
+ HAVE_SOME_SLEEP_FUNC=1
+fi
+
+if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
+ POSIX4_LINK=
+ for ac_func in nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9718: checking for $ac_func" >&5
+echo "configure:10020: 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 9723 "configure"
+#line 10025 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
+char (*f)();
int main() {
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+f = $ac_func;
#endif
; return 0; }
EOF
-if { (eval echo configure:9746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10049: \"$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:9771: checking for nanosleep in -lposix4" >&5
+echo "configure:10074: 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 9779 "configure"
+#line 10082 "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:9790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define HAVE_NANOSLEEP 1
EOF
- POSIX4_LINK="-lposix4"
-
+ POSIX4_LINK="-lposix4"
+
else
echo "$ac_t""no" 1>&6
- for ac_func in usleep
+ for ac_func in usleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9818: checking for $ac_func" >&5
+echo "configure:10121: 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 9823 "configure"
+#line 10126 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
+char (*f)();
int main() {
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+f = $ac_func;
#endif
; return 0; }
EOF
-if { (eval echo configure:9846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_USLEEP 1
-EOF
-
+
else
echo "$ac_t""no" 1>&6
-echo "configure: warning: wxSleep() function will not work" 1>&2
fi
done
-
+ echo "configure: warning: wxSleep() function will not work" 1>&2
+
+
fi
-
+
+
fi
done
+fi
for ac_func in uname gethostname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9885: checking for $ac_func" >&5
+echo "configure:10189: 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 9890 "configure"
+#line 10194 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
+char (*f)();
int main() {
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+f = $ac_func;
#endif
; return 0; }
EOF
-if { (eval echo configure:9913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10218: \"$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:9941: checking for $ac_func" >&5
+echo "configure:10246: 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 9946 "configure"
+#line 10251 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
+char (*f)();
int main() {
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+f = $ac_func;
#endif
; return 0; }
EOF
-if { (eval echo configure:9969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
done
+INET_LINK=
for ac_func in inet_addr
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9997: checking for $ac_func" >&5
+echo "configure:10304: 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 10002 "configure"
+#line 10309 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
+char (*f)();
int main() {
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+f = $ac_func;
#endif
; return 0; }
EOF
-if { (eval echo configure:10025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
-
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ADDR 1
+EOF
+
else
echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in inet_aton
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10052: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
+echo "configure:10358: 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
else
- cat > conftest.$ac_ext <<EOF
-#line 10057 "configure"
+ ac_save_LIBS="$LIBS"
+LIBS="-lnsl $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10366 "configure"
#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char $ac_func();
+char inet_addr();
int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
+inet_addr()
; return 0; }
EOF
-if { (eval echo configure:10080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10377: \"$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"
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
-fi
+LIBS="$ac_save_LIBS"
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
+ INET_LINK="nsl"
else
echo "$ac_t""no" 1>&6
-fi
-done
-
-echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
-echo "configure:10105: checking for inet_aton in -lresolv" >&5
-ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
+echo "configure:10396: 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
else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10113 "configure"
+#line 10404 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char inet_aton();
+char inet_addr();
int main() {
-inet_aton()
+inet_addr()
; return 0; }
EOF
-if { (eval echo configure:10124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
- LIBS="-lresolv $LIBS"
-
+ INET_LINK="resolv"
+
else
echo "$ac_t""no" 1>&6
fi
+
+fi
+
+
fi
+done
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs. It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already. You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
+for ac_func in inet_aton
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10448: 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 10453 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+char (*f)();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:10477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ATON 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
+echo "configure:10502: 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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-l$INET_LINK $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10510 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char inet_aton();
+
+int main() {
+inet_aton()
+; return 0; }
+EOF
+if { (eval echo configure:10521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ATON 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+fi
+done
+
+
+if test "x$INET_LINK" != "x"; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ADDR 1
+EOF
+
+ INET_LINK="-l$INET_LINK"
+fi
+
+fi
+
+
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs. It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already. You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
case `(ac_space=' '; set | grep ac_space) 2>&1` in
*ac_space=\ *)
# `set' does not quote correctly, so add quotes (double-quote substitution
if test "$wxUSE_WINE" = 1 ; then
echo "configure: warning: Threads are not supported under WINE" 1>&2
wxUSE_THREADS="no"
+ elif test "$USE_BEOS" = 1; then
+ echo "configure: warning: BeOS threads are not yet supported" 1>&2
+ wxUSE_THREADS="no"
fi
fi
if test "$wxUSE_THREADS" = "yes" ; then
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:10220: checking for pthread_create in -lpthread" >&5
+echo "configure:10628: checking for pthread_create in -lpthread" >&5
ac_lib_var=`echo pthread'_'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="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10228 "configure"
+#line 10636 "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:10239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10647: \"$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:10262: checking for pthread_create in -lc_r" >&5
+echo "configure:10670: 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 10270 "configure"
+#line 10678 "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:10281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10689: \"$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:10305: checking for sys/prctl.h" >&5
+echo "configure:10713: 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 10310 "configure"
+#line 10718 "configure"
#include "confdefs.h"
#include <sys/prctl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
fi
if test "$wxUSE_THREADS" = "yes" ; then
+ for ac_func in thr_setconcurrency
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10763: 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 10768 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+char (*f)();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:10792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+
for ac_hdr in sched.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10357: checking for $ac_hdr" >&5
+echo "configure:10822: 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 10362 "configure"
+#line 10827 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10832: \"$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:10395: checking for sched_yield in -l$THREADS_LINK" >&5
+echo "configure:10860: 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 10403 "configure"
+#line 10868 "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:10414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10879: \"$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:10436: checking for sched_yield in -l"posix4"" >&5
+echo "configure:10901: checking for sched_yield in -l"posix4"" >&5
ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l"posix4" $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10444 "configure"
+#line 10909 "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:10455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10920: \"$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_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:10485: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+echo "configure:10950: 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 10493 "configure"
+#line 10958 "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:10504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10969: \"$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 pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6
-echo "configure:10526: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5
+echo "configure:10991: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5
ac_lib_var=`echo "posix4"'_'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"posix4" $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10534 "configure"
+#line 10999 "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:10545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11010: \"$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_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:10575: checking for pthread_cancel in -l$THREADS_LINK" >&5
+echo "configure:11040: 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 10583 "configure"
+#line 11048 "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:10594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11059: \"$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:10620: checking for pthread_cleanup_push/pop" >&5
+echo "configure:11085: 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 10626 "configure"
+#line 11091 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:10636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_pthread_cleanup_push=yes
CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
+else
+ if test "$ac_cv_func_strtok_r" = "yes"; then
+ echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
+echo "configure:11142: 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"
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+ fi
+fi
+
+if test "$WXGTK13" = 1 ; then
+ cat >> confdefs.h <<EOF
+#define __WXGTK13__ $WXGTK13
+EOF
+
+ WXGTK12=1
fi
if test "$WXGTK12" = 1 ; then
fi
DEP_INFO_FLAGS=
+CODE_GEN_FLAGS=
if test "$GCC" = yes ; then
if test "$wxUSE_NO_RTTI" = "yes" ; then
- WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti"
+ CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-rtti"
fi
if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
- WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions"
+ CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-exceptions"
fi
if test "$wxUSE_PERMISSIVE" = "yes" ; then
- CFLAGS="${CFLAGS} -fpermissive"
- CXXFLAGS="${CXXFLAGS} -fpermissive"
+ CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
fi
if test "$wxUSE_NO_DEPS" = "no" ; then
DEP_INFO_FLAGS="-MMD"
JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
fi
+TIFF_INCLUDE=
+if test "$wxUSE_LIBTIFF" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_LIBTIFF 1
+EOF
+
+ TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
+fi
+
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:10803: checking for GL/gl.h" >&5
+echo "configure:11297: 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 10808 "configure"
+#line 11302 "configure"
#include "confdefs.h"
#include <GL/gl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6
-echo "configure:10831: checking for glInitNames in -lGL" >&5
+echo "configure:11325: checking for glInitNames in -lGL" >&5
ac_lib_var=`echo GL'_'glInitNames | 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 wxUSE_OPENGL=0 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10839 "configure"
+#line 11333 "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
glInitNames()
; return 0; }
EOF
-if { (eval echo configure:10850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11344: \"$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 glInitNames in -lMesaGL""... $ac_c" 1>&6
-echo "configure:10877: checking for glInitNames in -lMesaGL" >&5
+echo "configure:11371: checking for glInitNames in -lMesaGL" >&5
ac_lib_var=`echo MesaGL'_'glInitNames | 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 10885 "configure"
+#line 11379 "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
glInitNames()
; return 0; }
EOF
-if { (eval echo configure:10896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11390: \"$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_TIMEDATE" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_TIMEDATE 1
-EOF
-
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
-fi
-
if test "$wxUSE_WAVE" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_WAVE 1
#define wxUSE_ZIPSTREAM 1
EOF
-fi
+fi
+
+if test "$wxUSE_BUSYINFO" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_BUSYINFO 1
+EOF
+
+fi
+
+if test "$wxUSE_STD_IOSTREAM" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_STD_IOSTREAM 1
+EOF
+
+fi
+
+if test "$wxUSE_TEXTFILE" = "yes"; then
+ if test "$wxUSE_FILE" != "yes"; then
+ echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTFILE 1
+EOF
+
+ fi
+fi
+
+if test "$wxUSE_CONFIG" = "yes" ; then
+ if test "$wxUSE_TEXTFILE" != "yes"; then
+ echo "configure: warning: wxConfig requires wxTextFile and it won't be compiled without it" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
+#define wxUSE_CONFIG 1
+EOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
+ fi
+fi
+
+if test "$wxUSE_INTL" = "yes" ; then
+ if test "$wxUSE_FILE" != "yes"; then
+ echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
+#define wxUSE_INTL 1
+EOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
+ fi
+fi
+
+if test "$wxUSE_LOG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_LOG 1
+EOF
+
+fi
+
+if test "$wxUSE_LONGLONG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_LONGLONG 1
+EOF
+
+fi
+
+if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_DIALUP_MANAGER 1
+EOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
+fi
+
+if test "$wxUSE_STREAMS" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_STREAMS 1
+EOF
+
+fi
+
+
+if test "$wxUSE_TIMEDATE" = "yes"; then
+ for ac_func in strptime
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:11577: 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 11582 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+char (*f)();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:11606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+
+ echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
+echo "configure:11632: 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 11638 "configure"
+#include "confdefs.h"
+
+ #include <time.h>
+
+int main() {
+
+ int tz;
+ tz = __timezone;
+
+; return 0; }
+EOF
+if { (eval echo configure:11650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ wx_cv_var_timezone=__timezone
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ cat > conftest.$ac_ext <<EOF
+#line 11661 "configure"
+#include "confdefs.h"
+
+ #include <time.h>
+
+int main() {
+
+ int tz;
+ tz = _timezone;
+
+; return 0; }
+EOF
+if { (eval echo configure:11673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ wx_cv_var_timezone=_timezone
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ cat > conftest.$ac_ext <<EOF
+#line 11684 "configure"
+#include "confdefs.h"
+
+ #include <time.h>
+
+int main() {
+
+ int tz;
+ tz = timezone;
+
+; return 0; }
+EOF
+if { (eval echo configure:11696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ wx_cv_var_timezone=timezone
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ { echo "configure: error: no timezone variable" 1>&2; exit 1; }
+
+fi
+rm -f conftest*
+
+
+fi
+rm -f conftest*
+
+
+fi
+rm -f conftest*
+
+
+fi
+
+echo "$ac_t""$wx_cv_var_timezone" 1>&6
+
+ cat >> confdefs.h <<EOF
+#define WX_TIMEZONE $wx_cv_var_timezone
+EOF
+
+
+ for ac_func in localtime gettimeofday ftime
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:11731: 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 11736 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+char (*f)();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:11760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ break
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+
+ if test "$ac_cv_func_localtime" = "yes"; then
+ echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
+echo "configure:11787: 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 11793 "configure"
+#include "confdefs.h"
+
+ #include <time.h>
+
+int main() {
+
+ struct tm tm;
+ tm.tm_gmtoff++;
+
+; return 0; }
+EOF
+if { (eval echo configure:11805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ wx_cv_struct_tm_has_gmtoff=yes
+ cat >> confdefs.h <<\EOF
+#define WX_GMTOFF_IN_TM 1
+EOF
+
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ wx_cv_struct_tm_has_gmtoff=no
+
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6
+ elif test "$ac_cv_func_gettimeofday" = "yes"; then
+ echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
+echo "configure:11828: 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
+
+
+ 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
+
-if test "$wxUSE_BUSYINFO" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_BUSYINFO 1
-EOF
+ cat > conftest.$ac_ext <<EOF
+#line 11843 "configure"
+#include "confdefs.h"
-fi
+ #include <sys/time.h>
+ #include <unistd.h>
+
+int main() {
-if test "$wxUSE_STD_IOSTREAM" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_STD_IOSTREAM 1
+ struct timeval tv;
+ struct timezone tz;
+ gettimeofday(&tv, &tz);
+
+; return 0; }
EOF
+if { (eval echo configure:11857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_func_gettimeofday_has_2_args=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cat > conftest.$ac_ext <<EOF
+#line 11865 "configure"
+#include "confdefs.h"
-fi
+ #include <sys/time.h>
+ #include <unistd.h>
+
+int main() {
-if test "$wxUSE_TEXTFILE" = "yes"; then
- if test "$wxUSE_FILE" != "yes"; then
- echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2
- else
- cat >> confdefs.h <<\EOF
-#define wxUSE_TEXTFILE 1
+ struct timeval tv;
+ gettimeofday(&tv);
+
+; return 0; }
EOF
+if { (eval echo configure:11878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_func_gettimeofday_has_2_args=no
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ wx_cv_func_gettimeofday_has_2_args=unknown
+
+fi
+rm -f conftest*
+
+fi
+rm -f conftest*
+ ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
- fi
+
fi
-if test "$wxUSE_CONFIG" = "yes" ; then
- if test "$wxUSE_TEXTFILE" != "yes"; then
- echo "configure: warning: wxConfig requires wxTextFile and it won't be compiled without it" 1>&2
- else
- cat >> confdefs.h <<\EOF
-#define wxUSE_CONFIG 1
+echo "$ac_t""$wx_cv_func_gettimeofday_has_2_args" 1>&6
+
+ if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
+ cat >> confdefs.h <<\EOF
+#define WX_GETTIMEOFDAY_NO_TZ 1
EOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
- fi
-fi
+ fi
+ fi
-if test "$wxUSE_INTL" = "yes" ; then
- if test "$wxUSE_FILE" != "yes"; then
- echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2
- else
cat >> confdefs.h <<\EOF
-#define wxUSE_INTL 1
+#define wxUSE_TIMEDATE 1
EOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
- fi
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
fi
-if test "$wxUSE_LOG" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_LOG 1
-EOF
-fi
+if test "$wxUSE_SOCKETS" = "yes"; then
+ echo $ac_n "checking for socket""... $ac_c" 1>&6
+echo "configure:11922: 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 11927 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char socket(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char socket();
+char (*f)();
-if test "$wxUSE_LONGLONG" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_LONGLONG 1
-EOF
+int main() {
-fi
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_socket) || defined (__stub___socket)
+choke me
+#else
+f = socket;
+#endif
-if test "$wxUSE_SOCKETS" = "yes" ; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_SOCKETS 1
+; return 0; }
EOF
-
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
- INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
+if { (eval echo configure:11951: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_socket=no"
fi
-
-if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_DIALUP_MANAGER 1
-EOF
-
+rm -f conftest*
fi
-if test "$wxUSE_STREAMS" = "yes" ; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_STREAMS 1
+if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+echo "configure:11969: 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
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lsocket $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 11977 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char socket();
+
+int main() {
+socket()
+; return 0; }
EOF
+if { (eval echo configure:11988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ INET_LINK="$INET_LINK -lsocket"
+else
+ echo "$ac_t""no" 1>&6
-if test "$wxUSE_SERIAL" = "yes" ; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_SERIAL 1
-EOF
+ echo "configure: warning: socket library not found - sockets will be disabled" 1>&2
+ wxUSE_SOCKETS=no
+
+
+fi
+
fi
+fi
-if test "$wxUSE_SOCKETS" = "yes"; then
+if test "$wxUSE_SOCKETS" = "yes" ; then
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:11112: checking the type of the third argument of getsockname" >&5
+echo "configure:12028: checking the type of the third argument of getsockname" >&5
cat > conftest.$ac_ext <<EOF
-#line 11114 "configure"
+#line 12030 "configure"
#include "confdefs.h"
#include <sys/socket.h>
int main() {
-socklen_t len; getsockname(0, NULL, &len);
+socklen_t len; getsockname(0, 0, &len);
; return 0; }
EOF
-if { (eval echo configure:11121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define SOCKLEN_T socklen_t
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 11132 "configure"
+#line 12048 "configure"
#include "confdefs.h"
#include <sys/socket.h>
int main() {
-size_t len; getsockname(0, NULL, &len);
+size_t len; getsockname(0, 0, &len);
; return 0; }
EOF
-if { (eval echo configure:11139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define SOCKLEN_T size_t
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 11150 "configure"
+#line 12066 "configure"
#include "confdefs.h"
#include <sys/socket.h>
int main() {
-int len; getsockname(0, NULL, &len);
+int len; getsockname(0, 0, &len);
; return 0; }
EOF
-if { (eval echo configure:11157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define SOCKLEN_T int
cat conftest.$ac_ext >&5
rm -rf conftest*
echo "$ac_t""unknown" 1>&6
-
+
fi
rm -f conftest*
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
+
+ cat >> confdefs.h <<\EOF
+#define wxUSE_SOCKETS 1
+EOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
+ INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11192: checking for $ac_hdr" >&5
+echo "configure:12115: 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 11197 "configure"
+#line 12120 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12125: \"$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:11244: checking for $ac_func" >&5
+echo "configure:12167: 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 11249 "configure"
+#line 12172 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
+char (*f)();
int main() {
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+f = $ac_func;
#endif
; return 0; }
EOF
-if { (eval echo configure:11272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12196: \"$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:11300: checking for dlopen in -ldl" >&5
+echo "configure:12224: 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 11308 "configure"
+#line 12232 "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:11319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12243: \"$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:11348: checking for $ac_func" >&5
+echo "configure:12272: 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 11353 "configure"
+#line 12277 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
+char (*f)();
int main() {
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+f = $ac_func;
#endif
; return 0; }
EOF
-if { (eval echo configure:11376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12301: \"$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 "$HAVE_DL_FUNCS" = 0; then
if test "$HAVE_SHL_FUNCS" = 0; then
if test "$USE_UNIX" = 1; then
- echo "configure: warning: "--with-dynlib and --with-odbc will be disabled due to missing shared library support"" 1>&2
- wxUSE_ODBC=no
+ echo "configure: warning: Missing dynamic loading support, several features will be disabled" 1>&2
wxUSE_DYNLIB_CLASS=no
else
- echo "configure: warning: "Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled."" 1>&2
+ echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2
fi
fi
fi
fi
if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define wxUSE_DYNLIB_CLASS 1
EOF
+else
+ wxUSE_ODBC=no
+ wxUSE_SERIAL=no
fi
fi
+if test "$wxUSE_SERIAL" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_SERIAL 1
+EOF
+
+fi
+
+
IODBC_C_SRC=""
if test "$wxUSE_ODBC" = "yes" ; then
cat >> confdefs.h <<\EOF
wxUSE_DRAG_AND_DROP=no
fi
+ if test "$USE_WIN32" = 1; then
+ for ac_hdr in ole2.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12530: 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 12535 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+ if test "x$HAVE_OLE2_H" = x ; then
+ echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2
+ wxUSE_DRAG_AND_DROP=no
+ fi
+ fi
+
if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_DRAG_AND_DROP 1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
fi
+
fi
if test "$wxUSE_SPLINES" = "yes" ; then
#define wxUSE_SCROLLBAR 1
EOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
fi
if test "$wxUSE_SLIDER" = "yes"; then
fi
+if test "$wxUSE_SPINCTRL" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_SPINCTRL 1
+EOF
+
+fi
+
if test "$wxUSE_SPLITTER" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_SPLITTER 1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
fi
+if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR_SIMPLE 1
+EOF
+
+ wxUSE_TOOLBAR="yes"
+fi
+
if test "$wxUSE_TOOLBAR" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_TOOLBAR 1
EOF
+
+ 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
+#define wxUSE_TOOLBAR_NATIVE 1
+EOF
+
+fi
+
if test "$wxUSE_TOOLTIPS" = "yes"; then
if test "$wxUSE_MOTIF" = 1; then
echo "configure: warning: wxTooltip not supported yet under Motif" 1>&2
fi
+OSINFO=`uname -s -r -m`
+OSINFO="\"$OSINFO\""
+cat >> confdefs.h <<EOF
+#define WXWIN_OS_DESCRIPTION $OSINFO
+EOF
+
+
+
GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $LIBPNG_LINK $ZLIB_LINK $TOOLKIT_LINK"
-EXTRA_LIBS="$LIBS $POSIX4_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
+EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
if test "$wxUSE_GUI" = "yes"; then
EXTRA_LIBS="$EXTRA_LIBS $GUILIBS"
fi
LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
-INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TOOLKIT_INCLUDE"
+INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
if test "$GXX" = yes ; then
CXXWARNINGS="-Wall"
fi
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
-CPPFLAGS="-I\${top_srcdir}/include $CPPFLAGS"
-CFLAGS="$CFLAGS $EXTRA_CFLAGS"
-CXXFLAGS="$CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS"
+CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS | sed 's/ \\+/ /g'`
+CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
+
+LDFLAGS="$LDFLAGS $PROFILE"
if test "$wxUSE_GUI" = "yes"; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
- forty fractal image wxpoem"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs drawing dynamic \
+ font fractal image minimal richedit"
+
+ CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
else
SAMPLES_SUBDIRS=""
fi
-SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '`"
+SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
+
+
+
+
+
+
+
+
+
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:12026: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:13056: 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
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.13"
+ echo "$CONFIG_STATUS generated by autoconf version 2.14"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
src/makeprog.env
src/makelib.env
Makefile
+ demos/Makefile
+ demos/bombs/Makefile
+ demos/dbbrowse/Makefile
+ demos/forty/Makefile
+ demos/fractal/Makefile
+ demos/life/Makefile
+ demos/poem/Makefile
samples/Makefile
- samples/bombs/Makefile
samples/caret/Makefile
+ samples/calendar/Makefile
samples/checklst/Makefile
samples/config/Makefile
samples/controls/Makefile
+ samples/console/Makefile
samples/db/Makefile
samples/dialogs/Makefile
samples/docview/Makefile
samples/docvwmdi/Makefile
samples/dnd/Makefile
samples/drawing/Makefile
- samples/forty/Makefile
- samples/fractal/Makefile
+ samples/exec/Makefile
+ samples/font/Makefile
+ samples/grid/Makefile
+ samples/help/Makefile
samples/image/Makefile
samples/internat/Makefile
+ samples/ipc/Makefile
samples/layout/Makefile
samples/listctrl/Makefile
samples/mdi/Makefile
samples/minifram/Makefile
- samples/minimal/Makefile
- samples/nettest/Makefile
+ samples/minimal/Makefile
+ samples/dialup/Makefile
samples/newgrid/Makefile
samples/notebook/Makefile
samples/png/Makefile
samples/printing/Makefile
- samples/proplist/Makefile
+ samples/proplist/Makefile
+ samples/propsize/Makefile
samples/richedit/Makefile
samples/resource/Makefile
samples/sashtest/Makefile
samples/scroll/Makefile
+ samples/scrollsub/Makefile
samples/splitter/Makefile
samples/text/Makefile
samples/thread/Makefile
samples/treectrl/Makefile
samples/typetest/Makefile
samples/validate/Makefile
- samples/wxpoem/Makefile
- samples/wxsocket/Makefile
+ samples/sockets/Makefile
samples/wizard/Makefile
samples/html/Makefile
samples/html/about/Makefile
samples/html/help/Makefile
samples/html/printing/Makefile
+ samples/html/helpview/Makefile
samples/html/test/Makefile
samples/html/zip/Makefile
samples/html/virtual/Makefile
utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
utils/ogl/Makefile
utils/ogl/src/Makefile
+ utils/makegen/Makefile
+ utils/HelpGen/Makefile
+ utils/HelpGen/src/Makefile
+ utils/tex2rtf/Makefile
+ utils/tex2rtf/src/Makefile
+ utils/hhp2cached/Makefile
+ utils/dialoged/Makefile
+ utils/dialoged/src/Makefile
setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
s%@X_PRE_LIBS@%$X_PRE_LIBS%g
s%@X_LIBS@%$X_LIBS%g
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
+s%@LEX_STEM@%$LEX_STEM%g
+s%@PATH_IFS@%$PATH_IFS%g
s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g
s%@WX_MINOR_VERSION_NUMBER@%$WX_MINOR_VERSION_NUMBER%g
s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER%g
s%@SHARED_LD@%$SHARED_LD%g
s%@PIC_FLAG@%$PIC_FLAG%g
s%@DEP_INFO_FLAGS@%$DEP_INFO_FLAGS%g
+s%@CODE_GEN_FLAGS@%$CODE_GEN_FLAGS%g
+s%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%g
s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
+s%@USE_GUI@%$USE_GUI%g
+s%@AFMINSTALL@%$AFMINSTALL%g
s%@TOOLKIT@%$TOOLKIT%g
s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g
s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
s%@USER_SUBDIRS@%$USER_SUBDIRS%g
s%@EXTRA_LIBS@%$EXTRA_LIBS%g
+s%@EXTRADEFS@%$EXTRADEFS%g
s%@LD_LIBS@%$LD_LIBS%g
s%@SET_MAKE@%$SET_MAKE%g
s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g
src/makeprog.env
src/makelib.env
Makefile
+ demos/Makefile
+ demos/bombs/Makefile
+ demos/dbbrowse/Makefile
+ demos/forty/Makefile
+ demos/fractal/Makefile
+ demos/life/Makefile
+ demos/poem/Makefile
samples/Makefile
- samples/bombs/Makefile
samples/caret/Makefile
+ samples/calendar/Makefile
samples/checklst/Makefile
samples/config/Makefile
samples/controls/Makefile
+ samples/console/Makefile
samples/db/Makefile
samples/dialogs/Makefile
samples/docview/Makefile
samples/docvwmdi/Makefile
samples/dnd/Makefile
samples/drawing/Makefile
- samples/forty/Makefile
- samples/fractal/Makefile
+ samples/exec/Makefile
+ samples/font/Makefile
+ samples/grid/Makefile
+ samples/help/Makefile
samples/image/Makefile
samples/internat/Makefile
+ samples/ipc/Makefile
samples/layout/Makefile
samples/listctrl/Makefile
samples/mdi/Makefile
samples/minifram/Makefile
- samples/minimal/Makefile
- samples/nettest/Makefile
+ samples/minimal/Makefile
+ samples/dialup/Makefile
samples/newgrid/Makefile
samples/notebook/Makefile
samples/png/Makefile
samples/printing/Makefile
- samples/proplist/Makefile
+ samples/proplist/Makefile
+ samples/propsize/Makefile
samples/richedit/Makefile
samples/resource/Makefile
samples/sashtest/Makefile
samples/scroll/Makefile
+ samples/scrollsub/Makefile
samples/splitter/Makefile
samples/text/Makefile
samples/thread/Makefile
samples/treectrl/Makefile
samples/typetest/Makefile
samples/validate/Makefile
- samples/wxpoem/Makefile
- samples/wxsocket/Makefile
+ samples/sockets/Makefile
samples/wizard/Makefile
samples/html/Makefile
samples/html/about/Makefile
samples/html/help/Makefile
samples/html/printing/Makefile
+ samples/html/helpview/Makefile
samples/html/test/Makefile
samples/html/zip/Makefile
samples/html/virtual/Makefile
utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
utils/ogl/Makefile
utils/ogl/src/Makefile
+ utils/makegen/Makefile
+ utils/HelpGen/Makefile
+ utils/HelpGen/src/Makefile
+ utils/tex2rtf/Makefile
+ utils/tex2rtf/src/Makefile
+ utils/hhp2cached/Makefile
+ utils/dialoged/Makefile
+ utils/dialoged/src/Makefile
"}
EOF
cat >> $CONFIG_STATUS <<\EOF
EOF
cat >> $CONFIG_STATUS <<EOF
- LN_S="${ac_cv_prog_LN_S}"
TOOLKIT_DIR="${TOOLKIT_DIR}"
if test ! -d include/wx/${TOOLKIT_DIR}; then
mkdir include/wx/${TOOLKIT_DIR}
fi
- cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+ if test -f setup.h; then
+ mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+ fi
exit 0
EOF
projects / wxWidgets.git / blobdiff