#! /bin/sh
# From configure.in Id: configure.in.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.0.
+# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.1.
#
# Report bugs to <wx-dev@lists.wxwidgets.org>.
#
# Identity of this package.
PACKAGE_NAME='wxWidgets'
PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.8.0'
-PACKAGE_STRING='wxWidgets 2.8.0'
+PACKAGE_VERSION='2.8.1'
+PACKAGE_STRING='wxWidgets 2.8.1'
PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
ac_unique_file="wx-config.in"
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures wxWidgets 2.8.0 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.8.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wxWidgets 2.8.0:";;
+ short | recursive ) echo "Configuration of wxWidgets 2.8.1:";;
esac
cat <<\_ACEOF
--enable-radiobtn use wxRadioButton class
--enable-sash use wxSashWindow class
--enable-scrollbar use wxScrollBar class and scrollable windows
+ --enable-searchctrl use wxSearchCtrl class
--enable-slider use wxSlider class
--enable-spinbtn use wxSpinButton class
--enable-spinctrl use wxSpinCtrl class
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-wxWidgets configure 2.8.0
+wxWidgets configure 2.8.1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wxWidgets $as_me 2.8.0, which was
+It was created by wxWidgets $as_me 2.8.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
wx_major_version_number=2
wx_minor_version_number=8
-wx_release_number=0
+wx_release_number=1
wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
DEFAULT_wxUSE_RADIOBTN=no
DEFAULT_wxUSE_SASH=no
DEFAULT_wxUSE_SCROLLBAR=no
+ DEFAULT_wxUSE_SEARCHCTRL=no
DEFAULT_wxUSE_SLIDER=no
DEFAULT_wxUSE_SPINBTN=no
DEFAULT_wxUSE_SPINCTRL=no
DEFAULT_wxUSE_RADIOBTN=yes
DEFAULT_wxUSE_SASH=yes
DEFAULT_wxUSE_SCROLLBAR=yes
+ DEFAULT_wxUSE_SEARCHCTRL=yes
DEFAULT_wxUSE_SLIDER=yes
DEFAULT_wxUSE_SPINBTN=yes
DEFAULT_wxUSE_SPINCTRL=yes
DEFAULT_wxUSE_RADIOBTN=yes
DEFAULT_wxUSE_SASH=yes
DEFAULT_wxUSE_SCROLLBAR=yes
+ DEFAULT_wxUSE_SEARCHCTRL=yes
DEFAULT_wxUSE_SLIDER=yes
DEFAULT_wxUSE_SPINBTN=yes
DEFAULT_wxUSE_SPINCTRL=yes
DEFAULT_wxUSE_RADIOBTN=no
DEFAULT_wxUSE_SASH=no
DEFAULT_wxUSE_SCROLLBAR=no
+ DEFAULT_wxUSE_SEARCHCTRL=no
DEFAULT_wxUSE_SLIDER=no
DEFAULT_wxUSE_SPINBTN=no
DEFAULT_wxUSE_SPINCTRL=no
fi
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-searchctrl or --disable-searchctrl was given.
+if test "${enable_searchctrl+set}" = set; then
+ enableval="$enable_searchctrl"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
+ else
+ ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_SEARCHCTRL" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_searchctrl='wxUSE_SEARCHCTRL='$DEFAULT_wxUSE_SEARCHCTRL
+
+fi;
+
+ eval "$ac_cv_use_searchctrl"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_SEARCHCTRL" = yes; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
+
+
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6
fi
-if test -n "$ac_tool_prefix"; then
+if test "x$SUNCXX" != xyes; then
+ if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
AR="$ac_cv_prog_AR"
fi
-if test "x$AR" = "x" ; then
- { { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5
+ if test "x$AR" = "x" ; then
+ { { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5
echo "$as_me: error: ar is needed to build wxWidgets" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# Find a good install program. We prefer a C program (faster),
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
+ if test -r $ac_dir/libX11.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
int main (void)
{
char buffer[128];
- snprintf (buffer, 128, "%2\$d %3\$d %1\$d", 1, 2, 3);
+ snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3);
if (strcmp ("2 3 1", buffer) == 0)
exit (0);
exit (1);
fi
if test "$wxUSE_DATAOBJ" = "yes"; then
- if test "$wxUSE_MGL" = 1; then
- { echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under MGL... disabled" >&5
-echo "$as_me: WARNING: wxDataObject not yet supported under MGL... disabled" >&2;}
+ if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+ { echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5
+echo "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;}
wxUSE_DATAOBJ=no
else
cat >>confdefs.h <<\_ACEOF
fi
if test "$wxUSE_CLIPBOARD" = "yes"; then
- if test "$wxUSE_MGL" = 1; then
- { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under MGL... disabled" >&5
-echo "$as_me: WARNING: Clipboard not yet supported under MGL... disabled" >&2;}
+ if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+ { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5
+echo "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;}
wxUSE_CLIPBOARD=no
fi
fi
fi
- if test "$wxUSE_MOTIF" = 1; then
- { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under Motif... disabled" >&5
-echo "$as_me: WARNING: Drag and drop not yet supported under Motif... disabled" >&2;}
- wxUSE_DRAG_AND_DROP=no
- fi
-
- if test "$wxUSE_X11" = 1; then
- { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under X11... disabled" >&5
-echo "$as_me: WARNING: Drag and drop not yet supported under X11... disabled" >&2;}
- wxUSE_DRAG_AND_DROP=no
- fi
-
- if test "$wxUSE_MGL" = 1; then
- { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under MGL... disabled" >&5
-echo "$as_me: WARNING: Drag and drop not yet supported under MGL... disabled" >&2;}
+ if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
+ "$wxUSE_DFB" = 1; then
+ { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5
+echo "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;}
wxUSE_DRAG_AND_DROP=no
fi
fi
if test "$wxUSE_DISPLAY" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
+ { echo "$as_me:$LINENO: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5
+echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;}
+ wxUSE_DISPLAY=no
+ else
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_DISPLAY 1
_ACEOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
+ fi
fi
if test "$wxUSE_DETECT_SM" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
fi
+if test "$wxUSE_SEARCHCTRL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_SEARCHCTRL 1
+_ACEOF
+
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_SLIDER" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_SLIDER 1
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <Carbon/Carbon.h>
+
+ #include <Carbon/Carbon.h>
+ #include <WebKit/WebKit.h>
+
#include <WebKit/HIWebView.h>
_ACEOF
fi
if test "$wxUSE_PALETTE" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_DFB" = 1; then
+ { echo "$as_me:$LINENO: WARNING: wxPalette not yet supported under DFB... disabled" >&5
+echo "$as_me: WARNING: wxPalette not yet supported under DFB... disabled" >&2;}
+ wxUSE_PALETTE=no
+ else
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_PALETTE 1
_ACEOF
+ fi
fi
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
if test "x$SUNCXX" = "xyes"; then
- AR=$CXX
+ AR=${AR:-"$CXX"}
- AROPTIONS="-xar -o"
+ AROPTIONS=${AROPTIONS:-"-xar -o"}
else
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
} >&5
cat >&5 <<_CSEOF
-This file was extended by wxWidgets $as_me 2.8.0, which was
+This file was extended by wxWidgets $as_me 2.8.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-wxWidgets config.status 2.8.0
+wxWidgets config.status 2.8.1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
projects / wxWidgets.git / blobdiff