#! /bin/sh
-# From configure.in Id.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for wxWidgets 2.9.5.
+# Generated by GNU Autoconf 2.69 for wxWidgets 3.0.0.
#
# Report bugs to <wx-dev@lists.wxwidgets.org>.
#
# Identity of this package.
PACKAGE_NAME='wxWidgets'
PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.9.5'
-PACKAGE_STRING='wxWidgets 2.9.5'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='wxWidgets 3.0.0'
PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
PACKAGE_URL=''
LIBWXMACRES
WX_RESOURCES_MACOSX_DATA
WX_RESOURCES_MACOSX_ASCII
-RESPROGRAMOBJ
-RESFLAGS
RESCOMP
WX_VERSION_TAG
DMALLOC_LIBS
TOOLCHAIN_NAME
TOOLKIT_DIR
TOOLKIT
-WIN32INSTALL
-AFMINSTALL
USE_GUI
WX_LIBRARY_BASENAME_GUI
WX_LIBRARY_BASENAME_NOGUI
COND_USE_EXCEPTIONS_0
COND_USE_CAIRO_1
COND_UNICODE_1
+COND_TOOLKIT_X11_WXUNIV_1
+COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1
COND_TOOLKIT_X11_USE_GUI_1
COND_TOOLKIT_X11
COND_TOOLKIT_WINCE_WXUNIV_0
enable_notifmsg
enable_odcombobox
enable_popupwin
+enable_prefseditor
enable_radiobox
enable_radiobtn
enable_richmsgdlg
# 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.9.5 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 3.0.0 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.9.5:";;
+ short | recursive ) echo "Configuration of wxWidgets 3.0.0:";;
esac
cat <<\_ACEOF
--enable-notifmsg use wxNotificationMessage class
--enable-odcombobox use wxOwnerDrawnComboBox class
--enable-popupwin use wxPopUpWindow class
+ --enable-prefseditor use wxPreferencesEditor class
--enable-radiobox use wxRadioBox class
--enable-radiobtn use wxRadioButton class
--enable-richmsgdlg use wxRichMessageDialog class
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-wxWidgets configure 2.9.5
+wxWidgets configure 3.0.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 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.9.5, which was
+It was created by wxWidgets $as_me 3.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
fi
-wx_major_version_number=2
-wx_minor_version_number=9
-wx_release_number=5
+wx_major_version_number=3
+wx_minor_version_number=0
+wx_release_number=0
wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
$as_echo "#define TARGET_CARBON 1" >>confdefs.h
- DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
+ DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1
;;
*-*-beos* )
$as_echo "$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-prefseditor" >&5
+$as_echo_n "checking for --${enablestring:-enable}-prefseditor... " >&6; }
+ # Check whether --enable-prefseditor was given.
+if test "${enable_prefseditor+set}" = set; then :
+ enableval=$enable_prefseditor;
+ if test "$enableval" = yes; then
+ wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=yes'
+ else
+ wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=no'
+ fi
+
+else
+
+ wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=${'DEFAULT_wxUSE_PREFERENCES_EDITOR":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_prefseditor"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_PREFERENCES_EDITOR = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_PREFERENCES_EDITOR
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
USE_WIN32=1
$as_echo "#define __WIN32__ 1" >>confdefs.h
- $as_echo "#define __WIN95__ 1" >>confdefs.h
-
$as_echo "#define __WINDOWS__ 1" >>confdefs.h
$as_echo "#define __GNUWIN32__ 1" >>confdefs.h
LIBS="$LIBS -lcExt"
fi
- else
- RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc/libc version" >&5
$as_echo_n "checking for gcc/libc version... " >&6; }
wxUSE_OMF=yes
enable_omf=yes
fi
- ;;
- *)
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp() in string.h" >&5
-$as_echo_n "checking for strcasecmp() in string.h... " >&6; }
-if ${ac_cv_string_strcasecmp+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <string.h>
-
-int
-main ()
-{
-
- strcasecmp("foo", "bar");
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_string_strcasecmp=yes
-else
- ac_cv_string_strcasecmp=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_string_strcasecmp" >&5
-$as_echo "$ac_cv_string_strcasecmp" >&6; }
-
- if test x"$ac_cv_string_strcasecmp" = "xyes"; then
- $as_echo "#define HAVE_STRCASECMP_IN_STRING_H 1" >>confdefs.h
-
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp() in strings.h" >&5
-$as_echo_n "checking for strcasecmp() in strings.h... " >&6; }
-if ${ac_cv_strings_strcasecmp+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <strings.h>
-
-int
-main ()
-{
-
- strcasecmp("foo", "bar");
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_strings_strcasecmp=yes
-else
- ac_cv_strings_strcasecmp=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strings_strcasecmp" >&5
-$as_echo "$ac_cv_strings_strcasecmp" >&6; }
-
- if test x"$ac_cv_strings_strcasecmp" = "xyes"; then
- $as_echo "#define HAVE_STRCASECMP_IN_STRINGS_H 1" >>confdefs.h
-
- else
- as_fn_error $? "No case-insensitive string comparison function found." "$LINENO" 5
- fi
- fi
-
;;
esac
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-
+ break
fi
done
-AFMINSTALL=
-WIN32INSTALL=
-
TOOLKIT=
TOOLKIT_INCLUDE=
WIDGET_SET=
LIBS="$LIBS -lkernel32 -luser32"
esac
- RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
- RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
-
- WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
-
- WIN32INSTALL=win32install
+ WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
fi
if test "$wxUSE_GUI" = "yes"; then
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
- AFMINSTALL=afminstall
TOOLKIT=GTK
GUIDIST=GTK_DIST
wxUSE_UNIVERSAL="yes"
- AFMINSTALL=afminstall
TOOLKIT=MICROWIN
GUIDIST=MICROWIN_DIST
GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
- AFMINSTALL=afminstall
COMPILED_X_PROGRAM=0
fi
fi
-for ac_func in wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp
+for ac_func in wcsftime
+do :
+ ac_fn_c_check_func "$LINENO" "wcsftime" "ac_cv_func_wcsftime"
+if test "x$ac_cv_func_wcsftime" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_WCSFTIME 1
+_ACEOF
+
+fi
+done
+
+
+if test "$wxUSE_MAC" != 1; then
+ for ac_func in strnlen wcsdup wcsnlen wcscasecmp wcsncasecmp
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
fi
done
+fi
if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
fi
fi
+if test "$wxUSE_PREFERENCES_EDITOR" = "yes"; then
+ $as_echo "#define wxUSE_PREFERENCES_EDITOR 1" >>confdefs.h
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS prefseditor"
+fi
+
if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Dialup manager not supported on this platform... disabled" >&5
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
- erase event exec font image minimal preferences render \
+ erase event exec font image minimal render \
shaped svg taborder vscroll widgets wrapsizer"
if test "$wxUSE_MONOLITHIC" != "yes"; then
;;
powerpc-apple-macos* | \
- *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
+ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
*-*-mirbsd* | \
*-*-sunos4* | \
*-*-osf* | \
case "${BAKEFILE_HOST}" in
*-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
- *-*-k*bsd*-gnu | *-*-mirbsd* )
+ *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
if test "x$SUNCXX" = "xyes"; then
SONAME_FLAG="-h "
else
COND_TOOLKIT_X11_USE_GUI_1=""
fi
+ COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"
+ if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+ COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""
+ fi
+
+ COND_TOOLKIT_X11_WXUNIV_1="#"
+ if test "x$TOOLKIT" = "xX11" -a "x$WXUNIV" = "x1" ; then
+ COND_TOOLKIT_X11_WXUNIV_1=""
+ fi
+
COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then
COND_UNICODE_1=""
fi
-if test "$wxUSE_MAC" = 1 ; then
+if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then
if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then
if test "x$disable_macosx_deps" = "xyes"; then
sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp
- mv temp bk-deps
+ mv temp bk-deps
chmod +x bk-deps
fi
fi
-
-
-
-
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by wxWidgets $as_me 2.9.5, which was
+This file was extended by wxWidgets $as_me 3.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-wxWidgets config.status 2.9.5
+wxWidgets config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
projects / wxWidgets.git / blobdiff