X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80367c29a9334496a8dce35a9b4fd1f903e41f8e..e5e10e234e2325fa6e25b23098470c5015e07a01:/configure diff --git a/configure b/configure index edbaf0892a..d9bf770b06 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id: configure.in 65489 2010-09-09 20:59:10Z VZ . +# From configure.in Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.2. +# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.4. # # Report bugs to . # @@ -575,8 +575,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='2.9.2' -PACKAGE_STRING='wxWidgets 2.9.2' +PACKAGE_VERSION='2.9.4' +PACKAGE_STRING='wxWidgets 2.9.4' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' ac_unique_file="wx-config.in" @@ -696,6 +696,18 @@ PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS +Xinerama_CFLAGS +Xinerama_LIBS +Xxf86vm_CFLAGS +Xxf86vm_LIBS +SM_CFLAGS +SM_LIBS +GL_CFLAGS +GL_LIBS +GLU_CFLAGS +GLU_LIBS +MesaGL_CFLAGS +MesaGL_LIBS CFLAGS_VISIBILITY CXXFLAGS_VISIBILITY LIBICONV @@ -715,6 +727,8 @@ HILDON2_CFLAGS HILDON2_LIBS PYTHON COND_PYTHON +WEBKIT_CFLAGS +WEBKIT_LIBS CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS @@ -849,6 +863,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 +COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1 COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1 COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 @@ -860,6 +875,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 +COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1 COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1 COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1 @@ -875,6 +891,7 @@ COND_MONOLITHIC_0_USE_QA_1 COND_MONOLITHIC_0_USE_RIBBON_1 COND_MONOLITHIC_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_USE_STC_1 +COND_MONOLITHIC_0_USE_WEBVIEW_1 COND_MONOLITHIC_0_USE_XRC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 @@ -903,8 +920,6 @@ COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 -COND_PLATFORM_UNIX_1_TOOLKIT_MGL -COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 @@ -939,8 +954,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_MAC -COND_TOOLKIT_MGL -COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 @@ -1079,6 +1092,18 @@ PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS +Xinerama_CFLAGS +Xinerama_LIBS +Xxf86vm_CFLAGS +Xxf86vm_LIBS +SM_CFLAGS +SM_LIBS +GL_CFLAGS +GL_LIBS +GLU_CFLAGS +GLU_LIBS +MesaGL_CFLAGS +MesaGL_LIBS GTKPRINT_CFLAGS GTKPRINT_LIBS LIBGNOMEPRINTUI_CFLAGS @@ -1089,6 +1114,8 @@ HILDON_CFLAGS HILDON_LIBS HILDON2_CFLAGS HILDON2_LIBS +WEBKIT_CFLAGS +WEBKIT_LIBS CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS @@ -1596,7 +1623,7 @@ if test "$ac_init_help" = "long"; then # 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.2 to adapt to many kinds of systems. +\`configure' configures wxWidgets 2.9.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1665,7 +1692,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.9.2:";; + short | recursive ) echo "Configuration of wxWidgets 2.9.4:";; esac cat <<\_ACEOF @@ -1689,9 +1716,11 @@ Optional Features: --enable-debug_cntxt obsolete, don't use: use wxDebugContext --enable-mem_tracing obsolete, don't use: create code with memory tracing --disable-shared create static library instead of shared - --enable-stl use STL for containers + --enable-stl use standard C++ classes for everything + --enable-std_containers use standard C++ container classes --enable-std_iostreams use standard C++ stream classes --enable-std_string use standard C++ string classes + --enable-std_string_conv_in_wxstring provide implicit conversion to std::string in wxString --disable-unicode compile without Unicode support --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only) --enable-utf8 use UTF-8 representation for strings (Unix only) @@ -1705,7 +1734,7 @@ Optional Features: --enable-permissive compile code disregarding strict ANSI --enable-no_deps create code without dependency information --disable-vararg_macros don't use vararg macros, even if they are supported - --enable-universal_binary create universal binary with Mac PPC and i386 (and x86_64 if using Cocoa) architectures + --enable-universal_binary=archs create universal binary for the specified (or all supported) architectures --enable-macosx_arch=ARCH build for just the specified architecture --enable-compat26 enable wxWidgets 2.6 compatibility --disable-compat28 disable wxWidgets 2.8 compatibility @@ -1794,18 +1823,22 @@ Optional Features: --enable-mdidoc use docview architecture with MDI --enable-mediactrl use wxMediaCtrl class --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix - --enable-webkit use wxWebKitCtrl (Mac) --enable-richtext use wxRichTextCtrl --enable-postscript use wxPostscriptDC device context (default for gtk+) --enable-printarch use printing architecture --enable-svg use wxSVGFileDC device context + --enable-webkit use wxWebKitCtrl (Mac-only, use wxWebView instead) + --enable-webview use wxWebView library --enable-graphics_ctx use graphics context 2D drawing API --enable-clipboard use wxClipboard class --enable-dnd use Drag'n'Drop classes - --enable-metafile use win32 metafiles --disable-controls disable compilation of all standard controls + --enable-markup support wxControl::SetLabelMarkup --enable-accel use accelerators --enable-animatectrl use wxAnimationCtrl class + --enable-bannerwindow use wxBannerWindow class + --enable-artstd use standard XPM icons in wxArtProvider + --enable-arttango use Tango icons in wxArtProvider --enable-bmpbutton use wxBitmapButton class --enable-bmpcombobox use wxBitmapComboBox class --enable-button use wxButton class @@ -1845,6 +1878,7 @@ Optional Features: --enable-radiobox use wxRadioBox class --enable-radiobtn use wxRadioButton class --enable-richmsgdlg use wxRichMessageDialog class + --enable-richtooltip use wxRichToolTip class --enable-rearrangectrl use wxRearrangeList/Ctrl/Dialog --enable-sash use wxSashWindow class --enable-scrollbar use wxScrollBar class and scrollable windows @@ -1861,12 +1895,14 @@ Optional Features: --enable-taskbaricon use wxTaskBarIcon class --enable-tbarnative use native wxToolBar class --enable-textctrl use wxTextCtrl class + --enable-timepick use wxTimePickerCtrl class --enable-tipwindow use wxTipWindow class --enable-togglebtn use wxToggleButton class --enable-toolbar use wxToolBar class --enable-toolbook use wxToolbook class --enable-treebook use wxTreebook class --enable-treectrl use wxTreeCtrl class + --enable-treelist use wxTreeListCtrl class --enable-commondlg use all common dialogs --enable-aboutdlg use wxAboutBox --enable-choicedlg use wxChoiceDialog @@ -1889,11 +1925,14 @@ Optional Features: --enable-mousewheel use mousewheel --enable-validators use wxValidator and derived classes --enable-busyinfo use wxBusyInfo + --enable-hotkey use wxWindow::RegisterHotKey() --enable-joystick use wxJoystick - --enable-metafiles use wxMetaFile (Win32 only) + --enable-metafiles use wxMetaFile --enable-dragimage use wxDragImage --enable-accessibility enable accessibility support --enable-uiactionsim use wxUIActionSimulator (experimental) + --enable-dctransform use wxDC::SetTransformMatrix and related + --enable-webview-webkit use wxWebView WebKit backend --enable-palette use wxPalette class --enable-image use wxImage class --enable-gif use gif images (GIF file format) @@ -1908,6 +1947,7 @@ Optional Features: --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only) --enable-uxtheme enable support for Windows XP themed look (Win32 only) --enable-wxdib use wxDIB class (Win32 only) + --enable-webview-ie use wxWebView IE backend (Win32 only) --enable-autoidman use automatic ids management --disable-largefile omit support for large files --disable-gtktest do not try to compile and run a test GTK+ program @@ -1940,7 +1980,6 @@ Optional Packages: --with-wine use Wine --with-msw use MS-Windows --with-pm use OS/2 Presentation Manager - --with-mgl use SciTech MGL --with-directfb use DirectFB --with-microwin use MicroWindows --with-x11 use X11 @@ -2000,6 +2039,23 @@ Some influential environment variables: C compiler flags for PANGOXFT, overriding pkg-config PANGOXFT_LIBS linker flags for PANGOXFT, overriding pkg-config + Xinerama_CFLAGS + C compiler flags for Xinerama, overriding pkg-config + Xinerama_LIBS + linker flags for Xinerama, overriding pkg-config + Xxf86vm_CFLAGS + C compiler flags for Xxf86vm, overriding pkg-config + Xxf86vm_LIBS + linker flags for Xxf86vm, overriding pkg-config + SM_CFLAGS C compiler flags for SM, overriding pkg-config + SM_LIBS linker flags for SM, overriding pkg-config + GL_CFLAGS C compiler flags for GL, overriding pkg-config + GL_LIBS linker flags for GL, overriding pkg-config + GLU_CFLAGS C compiler flags for GLU, overriding pkg-config + GLU_LIBS linker flags for GLU, overriding pkg-config + MesaGL_CFLAGS + C compiler flags for MesaGL, overriding pkg-config + MesaGL_LIBS linker flags for MesaGL, overriding pkg-config GTKPRINT_CFLAGS C compiler flags for GTKPRINT, overriding pkg-config GTKPRINT_LIBS @@ -2019,6 +2075,9 @@ Some influential environment variables: C compiler flags for HILDON2, overriding pkg-config HILDON2_LIBS linker flags for HILDON2, overriding pkg-config + WEBKIT_CFLAGS + C compiler flags for WEBKIT, overriding pkg-config + WEBKIT_LIBS linker flags for WEBKIT, overriding pkg-config CAIRO_CFLAGS C compiler flags for CAIRO, overriding pkg-config CAIRO_LIBS linker flags for CAIRO, overriding pkg-config @@ -2089,7 +2148,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.9.2 +wxWidgets configure 2.9.4 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2103,7 +2162,7 @@ cat >config.log <<_ACEOF 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.2, which was +It was created by wxWidgets $as_me 2.9.4, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2585,7 +2644,7 @@ fi wx_major_version_number=2 wx_minor_version_number=9 -wx_release_number=2 +wx_release_number=4 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -2622,14 +2681,13 @@ USE_ALPHA= NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB" +ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW PM X11 DFB" DEFAULT_wxUSE_OLD_COCOA=0 DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_OSX_CARBON=0 DEFAULT_wxUSE_OSX_COCOA=0 DEFAULT_wxUSE_OSX_IPHONE=0 -DEFAULT_wxUSE_MGL=0 DEFAULT_wxUSE_MICROWIN=0 DEFAULT_wxUSE_MOTIF=0 DEFAULT_wxUSE_MSW=0 @@ -2642,7 +2700,6 @@ DEFAULT_DEFAULT_wxUSE_GTK=0 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0 DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0 -DEFAULT_DEFAULT_wxUSE_MGL=0 DEFAULT_DEFAULT_wxUSE_MICROWIN=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 DEFAULT_DEFAULT_wxUSE_MSW=0 @@ -2879,7 +2936,6 @@ _ACEOF _ACEOF PROGRAM_EXT=".exe" - DEFAULT_DEFAULT_wxUSE_MGL=1 ;; *-pc-os2_emx | *-pc-os2-emx ) @@ -2968,6 +3024,7 @@ esac DEFAULT_wxUSE_ALL_FEATURES=yes +DEFAULT_wxUSE_STD_CONTAINERS=no DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG @@ -2982,10 +3039,13 @@ DEFAULT_wxUSE_ACCESSIBILITY=no DEFAULT_wxUSE_IPV6=no DEFAULT_wxUSE_GSTREAMER8=no +DEFAULT_wxUSE_ARTPROVIDER_TANGO=auto DEFAULT_wxUSE_UNICODE_UTF8=auto DEFAULT_wxUSE_OPENGL=auto DEFAULT_wxUSE_MEDIACTRL=auto DEFAULT_wxUSE_COMPILER_TLS=auto +DEFAULT_wxUSE_HOTKEY=auto +DEFAULT_wxUSE_METAFILE=auto DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no @@ -3282,7 +3342,8 @@ echo "${ECHO_T}$result" >&6; } if test "$wxUSE_ALL_FEATURES" = "no"; then - DEFAULT_wxUSE_MEDIACTRL=no + DEFAULT_wxUSE_ARTPROVIDER_TANGO=no + DEFAULT_wxUSE_MEDIACTRL=no fi @@ -3426,12 +3487,6 @@ if test "${with_pm+set}" = set; then fi -# Check whether --with-mgl was given. -if test "${with_mgl+set}" = set; then - withval=$with_mgl; wxUSE_MGL="$withval" wxUSE_UNIVERSAL="yes" CACHE_MGL=1 TOOLKIT_GIVEN=1 -fi - - # Check whether --with-directfb was given. if test "${with_directfb+set}" = set; then withval=$with_directfb; wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1 @@ -3591,7 +3646,7 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} fi NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \ - + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \ + + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \ + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` case "${host}" in @@ -4437,6 +4492,8 @@ else fi +{ echo "$as_me:$LINENO: result: ${enable_debug-default}" >&5 +echo "${ECHO_T}${enable_debug-default}" >&6; } case "$wxUSE_DEBUG" in yes) @@ -4769,6 +4826,55 @@ fi { echo "$as_me:$LINENO: result: $result" >&5 echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_STL" = "yes"; then + DEFAULT_wxUSE_STD_CONTAINERS=yes + DEFAULT_wxUSE_STD_IOSTREAM=yes + DEFAULT_wxUSE_STD_STRING=yes +fi + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_containers" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-std_containers... $ECHO_C" >&6; } + # Check whether --enable-std_containers was given. +if test "${enable_std_containers+set}" = set; then + enableval=$enable_std_containers; + if test "$enableval" = yes; then + wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=yes' + else + wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=no' + fi + +else + + wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=${'DEFAULT_wxUSE_STD_CONTAINERS":-$defaultval}" + +fi + + + eval "$wx_cv_use_std_containers" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_STD_CONTAINERS = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_STD_CONTAINERS + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= defaultval= @@ -4858,6 +4964,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string_conv_in_wxstring" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-std_string_conv_in_wxstring... $ECHO_C" >&6; } + # Check whether --enable-std_string_conv_in_wxstring was given. +if test "${enable_std_string_conv_in_wxstring+set}" = set; then + enableval=$enable_std_string_conv_in_wxstring; + if test "$enableval" = yes; then + wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=yes' + else + wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=no' + fi + +else + + wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=${'DEFAULT_wxUSE_STD_STRING_CONV_IN_WXSTRING":-$defaultval}" + +fi + + + eval "$wx_cv_use_std_string_conv_in_wxstring" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_STD_STRING_CONV_IN_WXSTRING = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_STD_STRING_CONV_IN_WXSTRING + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring=disable defaultval= if test -z "$defaultval"; then @@ -9300,50 +9450,6 @@ fi echo "${ECHO_T}$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 - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; } - # Check whether --enable-webkit was given. -if test "${enable_webkit+set}" = set; then - enableval=$enable_webkit; - if test "$enableval" = yes; then - wx_cv_use_webkit='wxUSE_WEBKIT=yes' - else - wx_cv_use_webkit='wxUSE_WEBKIT=no' - fi - -else - - wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" - -fi - - - eval "$wx_cv_use_webkit" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_WEBKIT = no; then - result=yes - else - result=no - fi - else - result=$wxUSE_WEBKIT - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -9520,6 +9626,94 @@ fi echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; } + # Check whether --enable-webkit was given. +if test "${enable_webkit+set}" = set; then + enableval=$enable_webkit; + if test "$enableval" = yes; then + wx_cv_use_webkit='wxUSE_WEBKIT=yes' + else + wx_cv_use_webkit='wxUSE_WEBKIT=no' + fi + +else + + wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" + +fi + + + eval "$wx_cv_use_webkit" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_WEBKIT = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_WEBKIT + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webview" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-webview... $ECHO_C" >&6; } + # Check whether --enable-webview was given. +if test "${enable_webview+set}" = set; then + enableval=$enable_webview; + if test "$enableval" = yes; then + wx_cv_use_webview='wxUSE_WEBVIEW=yes' + else + wx_cv_use_webview='wxUSE_WEBVIEW=no' + fi + +else + + wx_cv_use_webview='wxUSE_WEBVIEW=${'DEFAULT_wxUSE_WEBVIEW":-$defaultval}" + +fi + + + eval "$wx_cv_use_webview" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_WEBVIEW = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_WEBVIEW + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + if test "$wxUSE_MAC" != 1; then enablestring= @@ -9657,50 +9851,6 @@ fi echo "${ECHO_T}$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 - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; } - # Check whether --enable-metafile was given. -if test "${enable_metafile+set}" = set; then - enableval=$enable_metafile; - if test "$enableval" = yes; then - wx_cv_use_metafile='wxUSE_METAFILE=yes' - else - wx_cv_use_metafile='wxUSE_METAFILE=no' - fi - -else - - wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" - -fi - - - eval "$wx_cv_use_metafile" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_METAFILE = no; then - result=yes - else - result=no - fi - else - result=$wxUSE_METAFILE - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - DEFAULT_wxUSE_CONTROLS=none @@ -9751,6 +9901,7 @@ echo "${ECHO_T}$result" >&6; } if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_ACCEL=no DEFAULT_wxUSE_ANIMATIONCTRL=no + DEFAULT_wxUSE_BANNERWINDOW=no DEFAULT_wxUSE_BMPBUTTON=no DEFAULT_wxUSE_BUTTON=no DEFAULT_wxUSE_CALCTRL=no @@ -9780,11 +9931,13 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_LISTBOOK=no DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no + DEFAULT_wxUSE_MARKUP=no DEFAULT_wxUSE_NOTEBOOK=no DEFAULT_wxUSE_POPUPWIN=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_RICHMSGDLG=no + DEFAULT_wxUSE_RICHTOOLTIP=no DEFAULT_wxUSE_REARRANGECTRL=no DEFAULT_wxUSE_SASH=no DEFAULT_wxUSE_SCROLLBAR=no @@ -9797,6 +9950,7 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_STATBOX=no DEFAULT_wxUSE_STATLINE=no DEFAULT_wxUSE_STATUSBAR=no + DEFAULT_wxUSE_TIMEPICKCTRL=no DEFAULT_wxUSE_TIPWINDOW=no DEFAULT_wxUSE_TOGGLEBTN=no DEFAULT_wxUSE_TOOLBAR=no @@ -9805,9 +9959,55 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_TREEBOOK=no DEFAULT_wxUSE_TREECTRL=no + DEFAULT_wxUSE_TREELISTCTRL=no fi + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-markup" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-markup... $ECHO_C" >&6; } + # Check whether --enable-markup was given. +if test "${enable_markup+set}" = set; then + enableval=$enable_markup; + if test "$enableval" = yes; then + wx_cv_use_markup='wxUSE_MARKUP=yes' + else + wx_cv_use_markup='wxUSE_MARKUP=no' + fi + +else + + wx_cv_use_markup='wxUSE_MARKUP=${'DEFAULT_wxUSE_MARKUP":-$defaultval}" + +fi + + + eval "$wx_cv_use_markup" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_MARKUP = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_MARKUP + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -9896,6 +10096,138 @@ fi echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bannerwindow" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-bannerwindow... $ECHO_C" >&6; } + # Check whether --enable-bannerwindow was given. +if test "${enable_bannerwindow+set}" = set; then + enableval=$enable_bannerwindow; + if test "$enableval" = yes; then + wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=yes' + else + wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=no' + fi + +else + + wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=${'DEFAULT_wxUSE_BANNERWINDOW":-$defaultval}" + +fi + + + eval "$wx_cv_use_bannerwindow" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_BANNERWINDOW = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_BANNERWINDOW + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-artstd" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-artstd... $ECHO_C" >&6; } + # Check whether --enable-artstd was given. +if test "${enable_artstd+set}" = set; then + enableval=$enable_artstd; + if test "$enableval" = yes; then + wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=yes' + else + wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=no' + fi + +else + + wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=${'DEFAULT_wxUSE_ARTPROVIDER_STD":-$defaultval}" + +fi + + + eval "$wx_cv_use_artstd" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_ARTPROVIDER_STD = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_ARTPROVIDER_STD + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-arttango" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-arttango... $ECHO_C" >&6; } + # Check whether --enable-arttango was given. +if test "${enable_arttango+set}" = set; then + enableval=$enable_arttango; + if test "$enableval" = yes; then + wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=yes' + else + wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=no' + fi + +else + + wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=${'DEFAULT_wxUSE_ARTPROVIDER_TANGO":-$defaultval}" + +fi + + + eval "$wx_cv_use_arttango" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_ARTPROVIDER_TANGO = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_ARTPROVIDER_TANGO + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -11612,6 +11944,50 @@ fi echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richtooltip" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-richtooltip... $ECHO_C" >&6; } + # Check whether --enable-richtooltip was given. +if test "${enable_richtooltip+set}" = set; then + enableval=$enable_richtooltip; + if test "$enableval" = yes; then + wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=yes' + else + wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=no' + fi + +else + + wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=${'DEFAULT_wxUSE_RICHTOOLTIP":-$defaultval}" + +fi + + + eval "$wx_cv_use_richtooltip" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_RICHTOOLTIP = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_RICHTOOLTIP + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -12316,6 +12692,50 @@ fi echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; } + # Check whether --enable-datepick was given. +if test "${enable_datepick+set}" = set; then + enableval=$enable_datepick; + if test "$enableval" = yes; then + wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=yes' + else + wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=no' + fi + +else + + wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=${'DEFAULT_wxUSE_TIMEPICKCTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_datepick" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_TIMEPICKCTRL = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_TIMEPICKCTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -12580,6 +13000,50 @@ fi echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treelist" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-treelist... $ECHO_C" >&6; } + # Check whether --enable-treelist was given. +if test "${enable_treelist+set}" = set; then + enableval=$enable_treelist; + if test "$enableval" = yes; then + wx_cv_use_treelist='wxUSE_TREELISTCTRL=yes' + else + wx_cv_use_treelist='wxUSE_TREELISTCTRL=no' + fi + +else + + wx_cv_use_treelist='wxUSE_TREELISTCTRL=${'DEFAULT_wxUSE_TREELISTCTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_treelist" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_TREELISTCTRL = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_TREELISTCTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= @@ -13552,6 +14016,50 @@ fi echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hotkey" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-hotkey... $ECHO_C" >&6; } + # Check whether --enable-hotkey was given. +if test "${enable_hotkey+set}" = set; then + enableval=$enable_hotkey; + if test "$enableval" = yes; then + wx_cv_use_hotkey='wxUSE_HOTKEY=yes' + else + wx_cv_use_hotkey='wxUSE_HOTKEY=no' + fi + +else + + wx_cv_use_hotkey='wxUSE_HOTKEY=${'DEFAULT_wxUSE_HOTKEY":-$defaultval}" + +fi + + + eval "$wx_cv_use_hotkey" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_HOTKEY = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_HOTKEY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -13772,6 +14280,94 @@ fi echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dctransform" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dctransform... $ECHO_C" >&6; } + # Check whether --enable-dctransform was given. +if test "${enable_dctransform+set}" = set; then + enableval=$enable_dctransform; + if test "$enableval" = yes; then + wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=yes' + else + wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=no' + fi + +else + + wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=${'DEFAULT_wxUSE_DC_TRANSFORM_MATRIX":-$defaultval}" + +fi + + + eval "$wx_cv_use_dctransform" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DC_TRANSFORM_MATRIX = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_DC_TRANSFORM_MATRIX + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webviewwebkit" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-webviewwebkit... $ECHO_C" >&6; } + # Check whether --enable-webviewwebkit was given. +if test "${enable_webviewwebkit+set}" = set; then + enableval=$enable_webviewwebkit; + if test "$enableval" = yes; then + wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=yes' + else + wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=no' + fi + +else + + wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=${'DEFAULT_wxUSE_WEBVIEW_WEBKIT":-$defaultval}" + +fi + + + eval "$wx_cv_use_webviewwebkit" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_WEBVIEW_WEBKIT = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_WEBVIEW_WEBKIT + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= @@ -14392,6 +14988,50 @@ fi echo "${ECHO_T}$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 + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webviewie" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-webviewie... $ECHO_C" >&6; } + # Check whether --enable-webviewie was given. +if test "${enable_webviewie+set}" = set; then + enableval=$enable_webviewie; + if test "$enableval" = yes; then + wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=yes' + else + wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=no' + fi + +else + + wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=${'DEFAULT_wxUSE_WEBVIEW_IE":-$defaultval}" + +fi + + + eval "$wx_cv_use_webviewie" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_WEBVIEW_IE = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_WEBVIEW_IE + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + if test "$wxUSE_MSW" != 1; then DEFAULT_wxUSE_AUTOID_MANAGEMENT=no fi @@ -16958,7 +17598,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_prog_gcc_traditional=no fi -rm -f -r conftest* +rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then @@ -16975,7 +17615,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes fi -rm -f -r conftest* +rm -f conftest* fi fi @@ -18573,62 +19213,46 @@ if test "$wxUSE_MAC" = 1; then retest_macosx_linking=no OSX_ARCH_OPTS="" -if test "x$wxUSE_MAC_ARCH" != xno; then - OSX_ARCH_OPTS="-arch $wxUSE_MAC_ARCH" -fi - if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then - if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then - # Implicitly turn on the new --with-macosx-sdk using the default - # SDK which provides the behavior this option has always had. - if test "x$wxUSE_MACOSX_SDK" = "x"; then - { echo "$as_me:$LINENO: WARNING: Enabling default SDK due to --enable-universal_binary." >&5 -echo "$as_me: WARNING: Enabling default SDK due to --enable-universal_binary." >&2;} - { echo "$as_me:$LINENO: WARNING: If you don't want this, specify --without-macosx-sdk" >&5 -echo "$as_me: WARNING: If you don't want this, specify --without-macosx-sdk" >&2;} - wxUSE_MACOSX_SDK=yes - fi - else - # Complain to user if he specified an argument to --enable-universal_binary - # and also 1) specified --with-macosx-sdk using the default (yes) or - # 2) specified --with-macosx-sdk using a path or 3) specified - # --without-macosx-sdk (no). - if test "x$wxUSE_MACOSX_SDK" != "x" ; then - { { echo "$as_me:$LINENO: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary -See \`config.log' for more details." >&5 -echo "$as_me: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - else - # Put the SDK path into the wxUSE_MACOSX_SDK. We don't have to - # special-case the empty string because the below test simply - # converts "no" to the empty string anyway. - wxUSE_MACOSX_SDK="$wxUSE_UNIVERSAL_BINARY" - { echo "$as_me:$LINENO: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&5 -echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;} - fi - fi - OSX_ARCH_OPTS="-arch ppc -arch i386" - if test "$wxUSE_OSX_COCOA" = 1; then - OSX_ARCH_OPTS="$OSX_ARCH_OPTS -arch x86_64" +if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then + if test "x$wxUSE_MAC_ARCH" != xno; then + { echo "$as_me:$LINENO: WARNING: --enable-macosx_arch is ignored when --enable-universal_binary is used." >&5 +echo "$as_me: WARNING: --enable-macosx_arch is ignored when --enable-universal_binary is used." >&2;} + fi + + if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then + OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY + else OSX_ARCH_OPTS="ppc,i386" + if test "$wxUSE_OSX_COCOA" = 1; then + OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64" fi - { echo "$as_me:$LINENO: checking for universal binary architectures" >&5 -echo $ECHO_N "checking for universal binary architectures... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: $OSX_ARCH_OPTS" >&5 + fi + + { echo "$as_me:$LINENO: checking for architectures to use in universal binary" >&5 +echo $ECHO_N "checking for architectures to use in universal binary... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: $OSX_ARCH_OPTS" >&5 echo "${ECHO_T}$OSX_ARCH_OPTS" >&6; } - retest_macosx_linking=yes + retest_macosx_linking=yes - { echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5 + { echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5 echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} - bk_use_pch=no + bk_use_pch=no +else + if test "x$wxUSE_MAC_ARCH" != xno; then + OSX_ARCH_OPTS=$wxUSE_MAC_ARCH fi +fi + +if test "x$OSX_ARCH_OPTS" != "x"; then + OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'` -CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS" -CFLAGS="$OSX_ARCH_OPTS $CFLAGS" -OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS" -OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS" -LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS" + CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS" + CFLAGS="$OSX_ARCH_OPTS $CFLAGS" + OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS" + OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS" + LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS" +fi if test "x$wxUSE_MACOSX_SDK" = "xno"; then wxUSE_MACOSX_SDK= @@ -18651,10 +19275,7 @@ See \`config.log' for more details." >&2;} { echo "$as_me:$LINENO: result: exists" >&5 echo "${ECHO_T}exists" >&6; } fi - MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK" - eval "CC=\"$CC $MACOSX_SDK_OPTS\"" - eval "CXX=\"$CXX $MACOSX_SDK_OPTS\"" - eval "LD=\"$LD $MACOSX_SDK_OPTS\"" + MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK" retest_macosx_linking=yes fi @@ -18771,18 +19392,24 @@ if test "x$NEEDS_GCC40" == "xyes"; then CCVERSION=`$CC --version | grep 4.[2-9].` if test "x$CCVERSION" != "x"; then echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead." - CC="/usr/bin/gcc-4.0" + CC="gcc-4.0" fi fi if test "x$CXX" = "xg++"; then CCVERSION=`$CXX --version | grep 4.[2-9].` if test "x$CCVERSION" != "x"; then - CXX="/usr/bin/g++-4.0" + CXX="g++-4.0" fi fi fi +if test "x$MACOSX_SDK_OPTS" != "x"; then + eval "CC=\"$CC $MACOSX_SDK_OPTS\"" + eval "CXX=\"$CXX $MACOSX_SDK_OPTS\"" + eval "LD=\"$LD $MACOSX_SDK_OPTS\"" +fi + if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then if test "$wxUSE_OSX_IPHONE" = 1; then MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN" @@ -18935,8 +19562,22 @@ case "${host}" in esac -if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then - CXXFLAGS="-qunique $CXXFLAGS" +if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then + cat >>confdefs.h <<\_ACEOF +#define _GNU_SOURCE 1 +_ACEOF + + + GNU_SOURCE_FLAG="-D_GNU_SOURCE" + CFLAGS="$GNU_SOURCE_FLAG $CFLAGS" +fi + +if test "x$USE_AIX" = "x1"; then + if test "x$XLCXX" = "xyes"; then + CXXFLAGS="-qunique $CXXFLAGS" + fi + + CPPFLAGS="-D_LINUX_SOURCE_COMPAT $CPPFLAGS" fi case "${host}" in @@ -19598,7 +20239,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f -r conftest* +rm -f conftest* fi @@ -19619,7 +20260,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f -r conftest* +rm -f conftest* fi @@ -23919,11 +24560,15 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test "$ac_cv_sizeof_wchar_t" != 0; then - wxUSE_WCHAR_T=yes -else - wxUSE_WCHAR_T=no +if test "$ac_cv_sizeof_wchar_t" = 0; then + { { echo "$as_me:$LINENO: error: wxWidgets requires wchar_t support." >&5 +echo "$as_me: error: wxWidgets requires wchar_t support." >&2;} + { (exit 1); exit 1; }; } fi +cat >>confdefs.h <<\_ACEOF +#define wxUSE_WCHAR_T 1 +_ACEOF + { echo "$as_me:$LINENO: checking for va_copy" >&5 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6; } @@ -23939,20 +24584,27 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF - #include - void foo(char *f, ...) - { - va_list ap1, ap2; - va_start(ap1, f); - va_copy(ap2, ap1); - va_end(ap2); - va_end(ap1); - } - int main() - { - foo("hi", 17); - return 0; - } + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + void foo(char *f, ...) + { + va_list ap1, ap2; + va_start(ap1, f); + va_copy(ap2, ap1); + va_end(ap2); + va_end(ap1); + } + int main() + { + foo("hi", 17); + return 0; + } + _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" @@ -24013,22 +24665,29 @@ else else cat >conftest.$ac_ext <<_ACEOF - #include - int foo(char *f, ...) - { - va_list ap1, ap2; - va_start(ap1, f); - ap2 = ap1; - if ( va_arg(ap1, int) != 17 || va_arg(ap2, int) != 17 ) - return 1; - va_end(ap2); - va_end(ap1); - return 0; - } - int main() - { - return foo("hi", 17); - } + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + int foo(char *f, ...) + { + va_list ap1, ap2; + va_start(ap1, f); + ap2 = ap1; + if ( va_arg(ap1, int) != 17 || va_arg(ap2, int) != 17 ) + return 1; + va_end(ap2); + va_end(ap1); + return 0; + } + int main() + { + return foo("hi", 17); + } + _ACEOF rm -f conftest$ac_exeext if { (ac_try="$ac_link" @@ -24092,7 +24751,8 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + + /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF @@ -24420,11 +25080,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include /* for off_t */ + #include int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -24464,11 +25126,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include +#include /* for off_t */ + #include int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -24515,7 +25179,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac -rm -f -r conftest* +rm -f conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. @@ -24695,8 +25359,8 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } if test $ac_cv_c_bigendian = unknown; then - { echo "$as_me:$LINENO: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5 -echo "$as_me: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;} + { echo "$as_me:$LINENO: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5 +echo "$as_me: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;} fi if test $ac_cv_c_bigendian = yes; then cat >>confdefs.h <<\_ACEOF @@ -24922,7 +25586,7 @@ _ACEOF if test "x$SUNCXX" = xyes; then - CXXFLAGS="-features=tmplife $CXXFLAGS" + CXXFLAGS="-features=tmplife $GNU_SOURCE_FLAG $CXXFLAGS" fi if test "x$SUNCC" = xyes; then @@ -26476,8 +27140,8 @@ SEARCH_INCLUDE="\ \ /usr/openwin/share/include" -{ echo "$as_me:$LINENO: checking for libraries directory" >&5 -echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for libraries directories" >&5 +echo $ECHO_N "checking for libraries directories... $ECHO_C" >&6; } case "${host}" in *-*-irix6* ) @@ -26492,7 +27156,14 @@ else save_LIBS="$LIBS" LIBS="$libc" cat >conftest.$ac_ext <<_ACEOF + + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ int main() { return 0; } + _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" @@ -26529,9 +27200,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi done done - if test "x$wx_cv_std_libpath" = "x"; then - wx_cv_std_libpath="lib" - fi fi @@ -26541,29 +27209,44 @@ fi *-*-solaris2* ) if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then wx_cv_std_libpath="lib/64" - else - wx_cv_std_libpath="lib" fi ;; *-*-linux* ) - if test "$ac_cv_sizeof_void_p" = 8 -a \ - -d "/usr/lib64" -a ! -h "/usr/lib64"; then - wx_cv_std_libpath="lib64" + if test "$ac_cv_sizeof_void_p" = 8; then + if test -d "/usr/lib/`uname -m`-linux-gnu"; then + wx_cv_std_libfullpath="/usr/lib/`uname -m`-linux-gnu" + elif test -d "/usr/lib64" -a ! -h "/usr/lib64"; then + wx_cv_std_libpath="lib64" + fi else - wx_cv_std_libpath="lib" + case "${host}" in + i*86-*-linux* ) + if test -d '/usr/lib/i386-linux-gnu'; then + wx_cv_std_libfullpath='/usr/lib/i386-linux-gnu' + fi + esac fi - ;; - *) - wx_cv_std_libpath="lib"; + if test -n "$wx_cv_std_libfullpath" -a -d "/usr/lib"; then + wx_cv_std_libfullpath="$wx_cv_std_libfullpath /usr/lib" + fi ;; esac -{ echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5 -echo "${ECHO_T}$wx_cv_std_libpath" >&6; } +if test -z "$wx_cv_std_libpath"; then + wx_cv_std_libpath="lib" +fi + +if test -z "$wx_cv_std_libfullpath"; then + wx_cv_std_libfullpath="/usr/$wx_cv_std_libpath" +fi -SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath" + +{ echo "$as_me:$LINENO: result: $wx_cv_std_libfullpath" >&5 +echo "${ECHO_T}$wx_cv_std_libfullpath" >&6; } + +SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath" if test "$build" != "$host" -a "$GCC" = yes; then if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then @@ -26582,7 +27265,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then if test -z "$x_includes" -o "$x_includes" = NONE; then ac_find_includes= -for ac_dir in $SEARCH_INCLUDE /usr/include; +for ac_dir in $SEARCH_INCLUDE /usr/include do if test -f "$ac_dir/X11/Intrinsic.h"; then ac_find_includes=$ac_dir @@ -26595,7 +27278,7 @@ for ac_dir in $SEARCH_INCLUDE /usr/include; if test -z "$x_libraries" -o "$x_libraries" = NONE; then ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libXt.$ac_extension"; then @@ -26685,40 +27368,70 @@ echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi rm -f confcache -if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then - { echo "$as_me:$LINENO: checking for glibc 2.1 or later" >&5 -echo $ECHO_N "checking for glibc 2.1 or later... $ECHO_C" >&6; } -if test "${wx_cv_lib_glibc21+set}" = set; then +have_cos=0 +have_floor=0 + +for ac_func in cos +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* 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 +#endif + int main () { - - #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1) - not glibc 2.1 - #endif - +return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -26727,46 +27440,32 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - - wx_cv_lib_glibc21=yes - + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_lib_glibc21=no - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - + eval "$as_ac_var=no" fi -{ echo "$as_me:$LINENO: result: $wx_cv_lib_glibc21" >&5 -echo "${ECHO_T}$wx_cv_lib_glibc21" >&6; } - if test "$wx_cv_lib_glibc21" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxHAVE_GLIBC2 1 -_ACEOF - fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi - -if test "x$wx_cv_lib_glibc21" = "xyes"; then - if test "$wxUSE_UNICODE" = "yes" -o "$wxUSE_THREADS" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define _GNU_SOURCE 1 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - - fi + have_cos=1 fi +done -have_cos=0 -have_floor=0 -for ac_func in cos +for ac_func in floor do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -26855,12 +27554,24 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - have_cos=1 + have_floor=1 fi done +{ echo "$as_me:$LINENO: checking if floating point functions link without -lm" >&5 +echo $ECHO_N "checking if floating point functions link without -lm... $ECHO_C" >&6; } +if test "$have_cos" = 1 -a "$have_floor" = 1; 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; } + LIBS="$LIBS -lm" + # use different functions to avoid configure caching + have_sin=0 + have_ceil=0 -for ac_func in floor +for ac_func in sin do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -26949,118 +27660,12 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - have_floor=1 + have_sin=1 fi done -{ echo "$as_me:$LINENO: checking if floating point functions link without -lm" >&5 -echo $ECHO_N "checking if floating point functions link without -lm... $ECHO_C" >&6; } -if test "$have_cos" = 1 -a "$have_floor" = 1; 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; } - LIBS="$LIBS -lm" - # use different functions to avoid configure caching - have_sin=0 - have_ceil=0 -for ac_func in sin -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* 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 -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - have_sin=1 -fi -done - - -for ac_func in ceil +for ac_func in ceil do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -27745,27 +28350,20 @@ if test "$wxUSE_LIBPNG" != "no" ; then _ACEOF - if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then - { echo "$as_me:$LINENO: WARNING: wxMGL doesn't work with builtin png library, will use MGL one instead" >&5 -echo "$as_me: WARNING: wxMGL doesn't work with builtin png library, will use MGL one instead" >&2;} - wxUSE_LIBPNG=sys - fi - - if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then + if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then { echo "$as_me:$LINENO: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&5 echo "$as_me: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&2;} wxUSE_LIBPNG=builtin fi - if test "$wxUSE_MGL" != 1 ; then - if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then - { echo "$as_me:$LINENO: checking for png.h > 0.90" >&5 + if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then + { echo "$as_me:$LINENO: checking for png.h > 0.90" >&5 echo $ECHO_N "checking for png.h > 0.90... $ECHO_C" >&6; } if test "${ac_cv_header_png_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - unset ac_cv_header_png_h + unset ac_cv_header_png_h else cat >conftest.$ac_ext <<_ACEOF @@ -27775,17 +28373,17 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include - int main() - { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%s", - PNG_LIBPNG_VER > 90 ? "yes" : "no"); - exit(0); - } + int main() + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%s", + PNG_LIBPNG_VER > 90 ? "yes" : "no"); + exit(0); + } _ACEOF rm -f conftest$ac_exeext @@ -27825,7 +28423,7 @@ fi fi { echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 echo "${ECHO_T}$ac_cv_header_png_h" >&6; } - { echo "$as_me:$LINENO: checking for png.h" >&5 + { echo "$as_me:$LINENO: checking for png.h" >&5 echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } if test "${ac_cv_header_png_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27872,8 +28470,8 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6; } - if test "$ac_cv_header_png_h" = "yes"; then - { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5 + if test "$ac_cv_header_png_h" = "yes"; then + { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5 echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; } if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27938,21 +28536,20 @@ if test $ac_cv_lib_png_png_sig_cmp = yes; then PNG_LINK=" -lpng -lz" fi - fi + fi - if test "x$PNG_LINK" = "x" ; then - if test "$wxUSE_LIBPNG" = "sys" ; then - { { echo "$as_me:$LINENO: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" >&5 + if test "x$PNG_LINK" = "x" ; then + if test "$wxUSE_LIBPNG" = "sys" ; then + { { echo "$as_me:$LINENO: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" >&5 echo "$as_me: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" >&2;} { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: system png library not found or too old, will use built-in instead" >&5 -echo "$as_me: WARNING: system png library not found or too old, will use built-in instead" >&2;} - wxUSE_LIBPNG=builtin - fi else - wxUSE_LIBPNG=sys + { echo "$as_me:$LINENO: WARNING: system png library not found or too old, will use built-in instead" >&5 +echo "$as_me: WARNING: system png library not found or too old, will use built-in instead" >&2;} + wxUSE_LIBPNG=builtin fi + else + wxUSE_LIBPNG=sys fi fi fi @@ -27965,17 +28562,10 @@ if test "$wxUSE_LIBJPEG" != "no" ; then _ACEOF - if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then - { echo "$as_me:$LINENO: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&5 -echo "$as_me: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&2;} - wxUSE_LIBJPEG=sys - fi - - if test "$wxUSE_MGL" != 1 ; then - if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then - { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 + if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then + { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } - if test "${ac_cv_header_jpeglib_h+set}" = set; then + if test "${ac_cv_header_jpeglib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27985,9 +28575,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #undef HAVE_STDLIB_H - #include - #include + #undef HAVE_STDLIB_H + #include + #include int main () @@ -28028,11 +28618,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - { echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 + { echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } - if test "$ac_cv_header_jpeglib_h" = "yes"; then - { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5 + if test "$ac_cv_header_jpeglib_h" = "yes"; then + { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5 echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6; } if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -28097,23 +28687,23 @@ if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then JPEG_LINK=" -ljpeg" fi - fi + fi - if test "x$JPEG_LINK" = "x" ; then - if test "$wxUSE_LIBJPEG" = "sys" ; then - { { echo "$as_me:$LINENO: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&5 + if test "x$JPEG_LINK" = "x" ; then + if test "$wxUSE_LIBJPEG" = "sys" ; then + { { echo "$as_me:$LINENO: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&5 echo "$as_me: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&2;} { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: system jpeg library not found, will use built-in instead" >&5 -echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;} - wxUSE_LIBJPEG=builtin - fi else - wxUSE_LIBJPEG=sys + { echo "$as_me:$LINENO: WARNING: system jpeg library not found, will use built-in instead" >&5 +echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;} + wxUSE_LIBJPEG=builtin + fi + else + wxUSE_LIBJPEG=sys - if test "$wxUSE_MSW" = 1; then - { echo "$as_me:$LINENO: checking for boolean" >&5 + if test "$wxUSE_MSW" = 1; then + { echo "$as_me:$LINENO: checking for boolean" >&5 echo $ECHO_N "checking for boolean... $ECHO_C" >&6; } if test "${ac_cv_type_boolean+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -28174,7 +28764,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF - { echo "$as_me:$LINENO: checking for boolean" >&5 + { echo "$as_me:$LINENO: checking for boolean" >&5 echo $ECHO_N "checking for boolean... $ECHO_C" >&6; } if test "${ac_cv_type_boolean+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -28186,9 +28776,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #undef HAVE_BOOLEAN - #include - #include + #undef HAVE_BOOLEAN + #include + #include typedef boolean ac__type_new_; @@ -28251,9 +28841,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #undef HAVE_BOOLEAN - #include - #include + #undef HAVE_BOOLEAN + #include + #include typedef boolean ac__type_sizeof_; @@ -28293,9 +28883,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #undef HAVE_BOOLEAN - #include - #include + #undef HAVE_BOOLEAN + #include + #include typedef boolean ac__type_sizeof_; @@ -28352,9 +28942,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #undef HAVE_BOOLEAN - #include - #include + #undef HAVE_BOOLEAN + #include + #include typedef boolean ac__type_sizeof_; @@ -28394,9 +28984,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #undef HAVE_BOOLEAN - #include - #include + #undef HAVE_BOOLEAN + #include + #include typedef boolean ac__type_sizeof_; @@ -28463,9 +29053,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #undef HAVE_BOOLEAN - #include - #include + #undef HAVE_BOOLEAN + #include + #include typedef boolean ac__type_sizeof_; @@ -28526,9 +29116,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #undef HAVE_BOOLEAN - #include - #include + #undef HAVE_BOOLEAN + #include + #include typedef boolean ac__type_sizeof_; @@ -28614,14 +29204,13 @@ cat >>confdefs.h <<_ACEOF _ACEOF - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <<_ACEOF #define wxHACK_BOOLEAN wxInt`expr 8 \* $ac_cv_sizeof_boolean` _ACEOF fi - fi fi fi fi @@ -28784,19 +29373,6 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead" fi -if test "$wxUSE_WCHAR_T" != "yes"; then - if test "$wxUSE_EXPAT" != "no"; then - { echo "$as_me:$LINENO: WARNING: wxWidgets requires wchar_t to use expat, disabling" >&5 -echo "$as_me: WARNING: wxWidgets requires wchar_t to use expat, disabling" >&2;} - wxUSE_EXPAT=no - fi - if test "$wxUSE_XML" != "no"; then - { echo "$as_me:$LINENO: WARNING: wxWidgets requires wchar_t to use xml, disabling" >&5 -echo "$as_me: WARNING: wxWidgets requires wchar_t to use xml, disabling" >&2;} - wxUSE_XML=no - fi -fi - if test "$wxUSE_EXPAT" != "no"; then wxUSE_XML=yes cat >>confdefs.h <<\_ACEOF @@ -29282,67 +29858,12 @@ fi LIBS="$LIBS -lkernel32 -luser32" esac - RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + 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__" + WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" WIN32INSTALL=win32install - - { echo "$as_me:$LINENO: checking for pbt.h" >&5 -echo $ECHO_N "checking for pbt.h... $ECHO_C" >&6; } -if test "${ac_cv_header_pbt_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_pbt_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_pbt_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_pbt_h" >&5 -echo "${ECHO_T}$ac_cv_header_pbt_h" >&6; } -if test $ac_cv_header_pbt_h = yes; then - : -else - cat >>confdefs.h <<\_ACEOF -#define NEED_PBT_H 1 -_ACEOF - -fi - - fi if test "$wxUSE_GUI" = "yes"; then @@ -29350,7 +29871,6 @@ if test "$wxUSE_GUI" = "yes"; then GUI_TK_LIBRARY= - WXGTK12= WXGTK127= WXGTK2= WXGPE= @@ -29556,7 +30076,7 @@ main () gtk_major_version, gtk_minor_version, gtk_micro_version); printf ("*** was found! If pkg-config was correct, then it is best\n"); printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n"); printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** required on your system.\n"); printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); @@ -29592,7 +30112,7 @@ main () printf("*** being found. The easiest way to fix this is to remove the old version\n"); printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); printf("*** so that the correct libraries are found at run-time))\n"); } } @@ -29706,7 +30226,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ is incorrectly installed." + echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed." fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ @@ -29723,13 +30243,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ rm -f conf.gtktest - - case "${host}" in - *-*-solaris2* ) - if test "$wxUSE_SHARED" != "yes"; then - GTK_LIBS="$GTK_LIBS -lX11" - fi - esac fi if test -z "$wx_cv_lib_gtk"; then @@ -29880,7 +30393,7 @@ main () gtk_major_version, gtk_minor_version, gtk_micro_version); printf ("*** was found! If gtk-config was correct, then it is best\n"); printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n"); printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** required on your system.\n"); printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); @@ -29919,7 +30432,7 @@ main () printf("*** being found. The easiest way to fix this is to remove the old version\n"); printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); printf("*** so that the correct libraries are found at run-time))\n"); } } @@ -30038,7 +30551,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" + echo "*** exact error that occurred. This usually means GTK was incorrectly installed" echo "*** or that you have moved GTK since it was installed. In the latter case, you" echo "*** may want to edit the gtk-config script: $GTK_CONFIG" fi @@ -30205,7 +30718,7 @@ main () gtk_major_version, gtk_minor_version, gtk_micro_version); printf ("*** was found! If gtk-config was correct, then it is best\n"); printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n"); printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** required on your system.\n"); printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); @@ -30244,7 +30757,7 @@ main () printf("*** being found. The easiest way to fix this is to remove the old version\n"); printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); printf("*** so that the correct libraries are found at run-time))\n"); } } @@ -30363,7 +30876,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" + echo "*** exact error that occurred. This usually means GTK was incorrectly installed" echo "*** or that you have moved GTK since it was installed. In the latter case, you" echo "*** may want to edit the gtk-config script: $GTK_CONFIG" fi @@ -30389,6 +30902,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ if test -z "$wx_cv_lib_gtk"; then wx_cv_lib_gtk=none else + GTK_LIBS="$GTK_LIBS -lX11" + wx_cv_cflags_gtk=$GTK_CFLAGS wx_cv_libs_gtk=$GTK_LIBS fi @@ -30407,10 +30922,8 @@ echo "${ECHO_T}$wx_cv_lib_gtk" >&6; } TOOLKIT_VERSION=2 ;; 1.2.7) WXGTK127=1 - WXGTK12=1 - ;; - 1.2.3) WXGTK12=1 ;; + 1.2*) ;; *) { { echo "$as_me:$LINENO: error: The development files for GTK+ were not found. For GTK+ 2, please ensure that pkg-config is in the path and that gtk+-2.0.pc is @@ -30817,9 +31330,6 @@ done TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY" - - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -DG_DISABLE_CAST_CHECKS" - AFMINSTALL=afminstall TOOLKIT=GTK GUIDIST=GTK_DIST @@ -30829,7 +31339,7 @@ done echo $ECHO_N "checking for gpewidget library... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libgpewidget.$ac_extension"; then @@ -30865,81 +31375,6 @@ echo "${ECHO_T}not found" >&6; } fi fi - if test "$wxUSE_MGL" = 1; then - { echo "$as_me:$LINENO: checking for SciTech MGL library" >&5 -echo $ECHO_N "checking for SciTech MGL library... $ECHO_C" >&6; } - if test "x$MGL_ROOT" = x ; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - { { echo "$as_me:$LINENO: error: Cannot find MGL library. Make sure MGL_ROOT is set." >&5 -echo "$as_me: error: Cannot find MGL library. Make sure MGL_ROOT is set." >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: result: $MGL_ROOT" >&5 -echo "${ECHO_T}$MGL_ROOT" >&6; } - fi - - { echo "$as_me:$LINENO: checking for libmgl location" >&5 -echo $ECHO_N "checking for libmgl location... $ECHO_C" >&6; } - case "${host}" in - *-*-linux* ) - if test "x$wxUSE_SHARED" = xyes ; then - mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc" - else - mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so" - fi - ;; - *-pc-msdosdjgpp ) - mgl_os_candidates="dos32/dj2" - ;; - *) - { { echo "$as_me:$LINENO: error: This system type ${host} is not yet supported by wxMGL." >&5 -echo "$as_me: error: This system type ${host} is not yet supported by wxMGL." >&2;} - { (exit 1); exit 1; }; } - esac - - mgl_lib_type="" - mgl_os="" - - for mgl_os_i in $mgl_os_candidates ; do - if test "x$mgl_os" = x ; then - if test "$wxUSE_DEBUG_FLAG" = yes ; then - if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \ - -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then - mgl_lib_type=debug - mgl_os=$mgl_os_i - fi - fi - if test "x$mgl_lib_type" = x ; then - if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \ - -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then - mgl_lib_type=release - mgl_os=$mgl_os_i - fi - fi - fi - done - - if test "x$mgl_os" = x ; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - { { echo "$as_me:$LINENO: error: Cannot find MGL libraries, make sure they are compiled." >&5 -echo "$as_me: error: Cannot find MGL libraries, make sure they are compiled." >&2;} - { (exit 1); exit 1; }; } - fi - { echo "$as_me:$LINENO: result: \"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&5 -echo "${ECHO_T}\"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&6; } - - wxUSE_UNIVERSAL="yes" - - TOOLKIT_INCLUDE="-I$MGL_ROOT/include" - GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm" - - AFMINSTALL=afminstall - TOOLKIT=MGL - GUIDIST=MGL_DIST - fi - if test "$wxUSE_DFB" = 1; then @@ -31225,7 +31660,7 @@ _ACEOF eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl dylib la dll; do + for ac_extension in a so sl; do if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break @@ -31378,7 +31813,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib la dll; do + for ac_extension in a so sl; do if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 @@ -33024,7 +33459,7 @@ done echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6; } ac_find_includes= -for ac_dir in $SEARCH_INCLUDE /usr/include; +for ac_dir in $SEARCH_INCLUDE /usr/include do if test -f "$ac_dir/Xm/Xm.h"; then ac_find_includes=$ac_dir @@ -33119,7 +33554,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libXm.$ac_extension"; then @@ -33523,7 +33958,7 @@ _ACEOF echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libXpm.$ac_extension"; then @@ -34051,72 +34486,229 @@ fi USE_XINERAMA=0 if test "$wxUSE_DISPLAY" = "yes"; then if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK1" = 1; then - { echo "$as_me:$LINENO: checking for Xinerama" >&5 -echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; - do - for ac_extension in a so sl dylib dll.a; do - if test -f "$ac_dir/libXinerama.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 - fi - done - done - if test "$ac_find_libraries" != "" ; then + fl_pkgname=`echo "Xinerama" | tr [:upper:] [:lower:]` - if test "$ac_find_libraries" = "default location"; then - ac_path_to_link="" + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" else - echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_link="" - else - ac_path_to_link=" -L$ac_find_libraries" - fi + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi - if test "$ac_path_to_link" != " -L/usr/lib" ; then - LDFLAGS="$LDFLAGS $ac_path_to_link" - fi - USE_XINERAMA=1 - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama" - { echo "$as_me:$LINENO: result: yes" >&5 +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 + else + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: WARNING: Xinerama not found; disabling wxDisplay" >&5 -echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} - wxUSE_DISPLAY="no" + PKG_CONFIG="" + fi + +fi 6> /dev/null + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for Xinerama" >&5 +echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$Xinerama_CFLAGS"; then + pkg_cv_Xinerama_CFLAGS="$Xinerama_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Xinerama_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$Xinerama_LIBS"; then + pkg_cv_Xinerama_LIBS="$Xinerama_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Xinerama_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + Xinerama_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` + else + Xinerama_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` fi - elif test "$wxUSE_MSW" = 1; then - { echo "$as_me:$LINENO: checking for ddraw.h" >&5 -echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ddraw_h+set}" = set; then + # Put the nasty error message in config.log where it belongs + echo "$Xinerama_PKG_ERRORS" >&5 + + + if test "x$ac_find_libraries" = "x"; then + if test "xXineramaQueryScreens" != "x"; then + { echo "$as_me:$LINENO: checking for XineramaQueryScreens in -lXinerama" >&5 +echo $ECHO_N "checking for XineramaQueryScreens in -lXinerama... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xinerama_XineramaQueryScreens+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXinerama $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XineramaQueryScreens (); +int +main () +{ +return XineramaQueryScreens (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -34125,74 +34717,94 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_ddraw_h=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xinerama_XineramaQueryScreens=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_ddraw_h=no + ac_cv_lib_Xinerama_XineramaQueryScreens=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5 -echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; } - - - fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 +echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } +if test $ac_cv_lib_Xinerama_XineramaQueryScreens = yes; then + ac_find_libraries="std" fi -if test "$wxUSE_DISPLAY" = "yes"; then - if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then - { echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5 -echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; } + fi + fi + + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do - if test -f "$ac_dir/libXxf86vm.$ac_extension"; then + if test -f "$ac_dir/libXinerama.$ac_extension"; then ac_find_libraries=$ac_dir break 2 fi done done - if test "$ac_find_libraries" != "" ; then - { echo "$as_me:$LINENO: result: yes" >&5 + if test "x$ac_find_libraries" != "x"; 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 + fi -for ac_header in X11/extensions/xf86vmode.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +elif test $pkg_failed = untried; then + + if test "x$ac_find_libraries" = "x"; then + if test "xXineramaQueryScreens" != "x"; then + { echo "$as_me:$LINENO: checking for XineramaQueryScreens in -lXinerama" >&5 +echo $ECHO_N "checking for XineramaQueryScreens in -lXinerama... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xinerama_XineramaQueryScreens+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXinerama $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #if HAVE_X11_XLIB_H - #include - #endif - - -#include <$ac_header> +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XineramaQueryScreens (); +int +main () +{ +return XineramaQueryScreens (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -34201,155 +34813,2238 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xinerama_XineramaQueryScreens=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + ac_cv_lib_Xinerama_XineramaQueryScreens=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" - +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 +echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } +if test $ac_cv_lib_Xinerama_XineramaQueryScreens = yes; then + ac_find_libraries="std" fi -done + fi + fi + + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } + + ac_find_libraries= + for ac_dir in $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libXinerama.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "x$ac_find_libraries" != "x"; 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 + fi + +else + Xinerama_CFLAGS=$pkg_cv_Xinerama_CFLAGS + Xinerama_LIBS=$pkg_cv_Xinerama_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + ac_find_libraries="std" + + eval ac_find_cflags=\$Xinerama_CFLAGS + eval fl_libs=\$Xinerama_LIBS + + for fl_path in $fl_libs + do + if test `echo "$fl_path" | cut -c 1-2` = "-L"; then + ac_find_libraries=`echo "$fl_path" | cut -c 3-` + fi + done + +fi + + if test "$ac_find_libraries" != "" ; then + if test "$ac_find_libraries" != "std" ; then + + if test "$ac_find_libraries" = "default location"; then + ac_path_to_link="" + else + echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_link="" + else + ac_path_to_link=" -L$ac_find_libraries" + fi + fi + + if test "$ac_path_to_link" != " -L/usr/lib" ; then + LDFLAGS="$LDFLAGS $ac_path_to_link" + fi + fi + USE_XINERAMA=1 + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama" + else + { echo "$as_me:$LINENO: WARNING: Xinerama not found; disabling wxDisplay" >&5 +echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} + wxUSE_DISPLAY="no" + fi + elif test "$wxUSE_MSW" = 1; then + { echo "$as_me:$LINENO: checking for ddraw.h" >&5 +echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ddraw_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_ddraw_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_ddraw_h=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5 +echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; } + + + fi +fi + +if test "$wxUSE_DISPLAY" = "yes"; then + if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then + + ac_find_libraries= + + fl_pkgname=`echo "Xxf86vm" | tr [:upper:] [:lower:]` + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; } + PKG_CONFIG="" + fi + +fi 6> /dev/null + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for Xxf86vm" >&5 +echo $ECHO_N "checking for Xxf86vm... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$Xxf86vm_CFLAGS"; then + pkg_cv_Xxf86vm_CFLAGS="$Xxf86vm_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Xxf86vm_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$Xxf86vm_LIBS"; then + pkg_cv_Xxf86vm_LIBS="$Xxf86vm_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Xxf86vm_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + Xxf86vm_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` + else + Xxf86vm_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` + fi + # Put the nasty error message in config.log where it belongs + echo "$Xxf86vm_PKG_ERRORS" >&5 + + + if test "x$ac_find_libraries" = "x"; then + if test "xXF86VidModeQueryExtension" != "x"; then + { echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 +echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXxf86vm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XF86VidModeQueryExtension (); +int +main () +{ +return XF86VidModeQueryExtension (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; } +if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then + ac_find_libraries="std" +fi + + fi + fi + + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } + + ac_find_libraries= + for ac_dir in $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libXxf86vm.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "x$ac_find_libraries" != "x"; 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 + fi + +elif test $pkg_failed = untried; then + + if test "x$ac_find_libraries" = "x"; then + if test "xXF86VidModeQueryExtension" != "x"; then + { echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 +echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXxf86vm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XF86VidModeQueryExtension (); +int +main () +{ +return XF86VidModeQueryExtension (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; } +if test $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension = yes; then + ac_find_libraries="std" +fi + + fi + fi + + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } + + ac_find_libraries= + for ac_dir in $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libXxf86vm.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "x$ac_find_libraries" != "x"; 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 + fi + +else + Xxf86vm_CFLAGS=$pkg_cv_Xxf86vm_CFLAGS + Xxf86vm_LIBS=$pkg_cv_Xxf86vm_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + ac_find_libraries="std" + + eval ac_find_cflags=\$Xxf86vm_CFLAGS + eval fl_libs=\$Xxf86vm_LIBS + + for fl_path in $fl_libs + do + if test `echo "$fl_path" | cut -c 1-2` = "-L"; then + ac_find_libraries=`echo "$fl_path" | cut -c 3-` + fi + done + +fi + + if test "$ac_find_libraries" != "" ; then + +for ac_header in X11/extensions/xf86vmode.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #if HAVE_X11_XLIB_H + #include + #endif + + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" + +fi + +done + + fi + fi +fi + +if test "$wxUSE_DETECT_SM" = "yes"; then + if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then + + ac_find_libraries= + + fl_pkgname=`echo "SM" | tr [:upper:] [:lower:]` + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; } + PKG_CONFIG="" + fi + +fi 6> /dev/null + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for SM" >&5 +echo $ECHO_N "checking for SM... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$SM_CFLAGS"; then + pkg_cv_SM_CFLAGS="$SM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_SM_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$SM_LIBS"; then + pkg_cv_SM_LIBS="$SM_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_SM_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` + else + SM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SM_PKG_ERRORS" >&5 + + + if test "x$ac_find_libraries" = "x"; then + if test "xSmcOpenConnection" != "x"; then + { echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5 +echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6; } +if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lSM $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SmcOpenConnection (); +int +main () +{ +return SmcOpenConnection (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_SM_SmcOpenConnection=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_SM_SmcOpenConnection=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 +echo "${ECHO_T}$ac_cv_lib_SM_SmcOpenConnection" >&6; } +if test $ac_cv_lib_SM_SmcOpenConnection = yes; then + ac_find_libraries="std" +fi + + fi + fi + + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } + + ac_find_libraries= + for ac_dir in $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libSM.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "x$ac_find_libraries" != "x"; 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 + fi + +elif test $pkg_failed = untried; then + + if test "x$ac_find_libraries" = "x"; then + if test "xSmcOpenConnection" != "x"; then + { echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5 +echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6; } +if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lSM $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SmcOpenConnection (); +int +main () +{ +return SmcOpenConnection (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_SM_SmcOpenConnection=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_SM_SmcOpenConnection=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 +echo "${ECHO_T}$ac_cv_lib_SM_SmcOpenConnection" >&6; } +if test $ac_cv_lib_SM_SmcOpenConnection = yes; then + ac_find_libraries="std" +fi + + fi + fi + + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } + + ac_find_libraries= + for ac_dir in $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libSM.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "x$ac_find_libraries" != "x"; 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 + fi + +else + SM_CFLAGS=$pkg_cv_SM_CFLAGS + SM_LIBS=$pkg_cv_SM_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + ac_find_libraries="std" + + eval ac_find_cflags=\$SM_CFLAGS + eval fl_libs=\$SM_LIBS + + for fl_path in $fl_libs + do + if test `echo "$fl_path" | cut -c 1-2` = "-L"; then + ac_find_libraries=`echo "$fl_path" | cut -c 3-` + fi + done + +fi + + if test "$ac_find_libraries" != "" ; then + if test "$ac_find_libraries" != "std" ; then + + if test "$ac_find_libraries" = "default location"; then + ac_path_to_link="" + else + echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_link="" + else + ac_path_to_link=" -L$ac_find_libraries" + fi + fi + + if test "$ac_path_to_link" != " -L/usr/lib" ; then + LDFLAGS="$LDFLAGS $ac_path_to_link" + fi + fi + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM" + else + { echo "$as_me:$LINENO: WARNING: libSM not found; disabling session management detection" >&5 +echo "$as_me: WARNING: libSM not found; disabling session management detection" >&2;} + wxUSE_DETECT_SM="no" + fi + else + wxUSE_DETECT_SM="no" + fi +fi + + + +USE_OPENGL=0 +if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then + + + if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then + OPENGL_LIBS="-framework OpenGL -framework AGL" + elif test "$wxUSE_MSW" = 1; then + OPENGL_LIBS="-lopengl32 -lglu32" + elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK2" = 1 -o "$wxUSE_GTK" = 1; then + + { echo "$as_me:$LINENO: checking for OpenGL headers" >&5 +echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; } + +ac_find_includes= +for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include + do + if test -f "$ac_dir/GL/gl.h"; then + ac_find_includes=$ac_dir + break + fi + done + + if test "$ac_find_includes" != "" ; then + { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5 +echo "${ECHO_T}found in $ac_find_includes" >&6; } + + if test "x$ac_find_includes" = "x/usr/include"; then + ac_path_to_include="" + else + echo "$CPPFLAGS" | grep "\-I$ac_find_includes" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_include="" + else + ac_path_to_include=" -I$ac_find_includes" + fi + fi + + CPPFLAGS="$ac_path_to_include $CPPFLAGS" + else + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + fi + + { echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; } +if test "${ac_cv_header_GL_gl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_GL_gl_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_GL_gl_h=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } +if test $ac_cv_header_GL_gl_h = yes; then + + { echo "$as_me:$LINENO: checking for GL/glu.h" >&5 +echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6; } +if test "${ac_cv_header_GL_glu_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_GL_glu_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_GL_glu_h=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; } +if test $ac_cv_header_GL_glu_h = yes; then + + found_gl=0 + + + ac_find_libraries= + + fl_pkgname=`echo "GL" | tr [:upper:] [:lower:]` + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; } + PKG_CONFIG="" + fi + +fi 6> /dev/null + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for GL" >&5 +echo $ECHO_N "checking for GL... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GL_CFLAGS"; then + pkg_cv_GL_CFLAGS="$GL_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GL_LIBS"; then + pkg_cv_GL_LIBS="$GL_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` + else + GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GL_PKG_ERRORS" >&5 + + + if test "x$ac_find_libraries" = "x"; then + if test "xglBegin" != "x"; then + { echo "$as_me:$LINENO: checking for glBegin in -lGL" >&5 +echo $ECHO_N "checking for glBegin in -lGL... $ECHO_C" >&6; } +if test "${ac_cv_lib_GL_glBegin+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lGL $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char glBegin (); +int +main () +{ +return glBegin (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_GL_glBegin=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_GL_glBegin=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glBegin" >&5 +echo "${ECHO_T}$ac_cv_lib_GL_glBegin" >&6; } +if test $ac_cv_lib_GL_glBegin = yes; then + ac_find_libraries="std" +fi + + fi + fi + + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } + + ac_find_libraries= + for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libGL.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "x$ac_find_libraries" != "x"; 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 + fi + +elif test $pkg_failed = untried; then + + if test "x$ac_find_libraries" = "x"; then + if test "xglBegin" != "x"; then + { echo "$as_me:$LINENO: checking for glBegin in -lGL" >&5 +echo $ECHO_N "checking for glBegin in -lGL... $ECHO_C" >&6; } +if test "${ac_cv_lib_GL_glBegin+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lGL $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char glBegin (); +int +main () +{ +return glBegin (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_GL_glBegin=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_GL_glBegin=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glBegin" >&5 +echo "${ECHO_T}$ac_cv_lib_GL_glBegin" >&6; } +if test $ac_cv_lib_GL_glBegin = yes; then + ac_find_libraries="std" +fi + + fi + fi + + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } + + ac_find_libraries= + for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libGL.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "x$ac_find_libraries" != "x"; 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 + fi + +else + GL_CFLAGS=$pkg_cv_GL_CFLAGS + GL_LIBS=$pkg_cv_GL_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + ac_find_libraries="std" + + eval ac_find_cflags=\$GL_CFLAGS + eval fl_libs=\$GL_LIBS + + for fl_path in $fl_libs + do + if test `echo "$fl_path" | cut -c 1-2` = "-L"; then + ac_find_libraries=`echo "$fl_path" | cut -c 3-` + fi + done + +fi + + if test "$ac_find_libraries" != "" ; then + if test "$ac_find_libraries" != "std" ; then + + if test "$ac_find_libraries" = "default location"; then + ac_path_to_link="" + else + echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_link="" + else + ac_path_to_link=" -L$ac_find_libraries" + fi + fi + + if test "$ac_path_to_link" != " -L/usr/lib" ; then + LDFLAGS_GL="$ac_path_to_link" + fi + fi + + + ac_find_libraries= + + fl_pkgname=`echo "GLU" | tr [:upper:] [:lower:]` + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; } + PKG_CONFIG="" + fi + +fi 6> /dev/null + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for GLU" >&5 +echo $ECHO_N "checking for GLU... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GLU_CFLAGS"; then + pkg_cv_GLU_CFLAGS="$GLU_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLU_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GLU_LIBS"; then + pkg_cv_GLU_LIBS="$GLU_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GLU_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GLU_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` + else + GLU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLU_PKG_ERRORS" >&5 + + + if test "x$ac_find_libraries" = "x"; then + if test "xgluBeginCurve" != "x"; then + { echo "$as_me:$LINENO: checking for gluBeginCurve in -lGLU" >&5 +echo $ECHO_N "checking for gluBeginCurve in -lGLU... $ECHO_C" >&6; } +if test "${ac_cv_lib_GLU_gluBeginCurve+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lGLU $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gluBeginCurve (); +int +main () +{ +return gluBeginCurve (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_GLU_gluBeginCurve=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_GLU_gluBeginCurve=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluBeginCurve" >&5 +echo "${ECHO_T}$ac_cv_lib_GLU_gluBeginCurve" >&6; } +if test $ac_cv_lib_GLU_gluBeginCurve = yes; then + ac_find_libraries="std" +fi + + fi + fi + + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } + + ac_find_libraries= + for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libGLU.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "x$ac_find_libraries" != "x"; 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 + fi + +elif test $pkg_failed = untried; then + + if test "x$ac_find_libraries" = "x"; then + if test "xgluBeginCurve" != "x"; then + { echo "$as_me:$LINENO: checking for gluBeginCurve in -lGLU" >&5 +echo $ECHO_N "checking for gluBeginCurve in -lGLU... $ECHO_C" >&6; } +if test "${ac_cv_lib_GLU_gluBeginCurve+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lGLU $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gluBeginCurve (); +int +main () +{ +return gluBeginCurve (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_GLU_gluBeginCurve=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_GLU_gluBeginCurve=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluBeginCurve" >&5 +echo "${ECHO_T}$ac_cv_lib_GLU_gluBeginCurve" >&6; } +if test $ac_cv_lib_GLU_gluBeginCurve = yes; then + ac_find_libraries="std" +fi + + fi + fi + + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } + + ac_find_libraries= + for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libGLU.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "x$ac_find_libraries" != "x"; 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 + fi + +else + GLU_CFLAGS=$pkg_cv_GLU_CFLAGS + GLU_LIBS=$pkg_cv_GLU_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + ac_find_libraries="std" + + eval ac_find_cflags=\$GLU_CFLAGS + eval fl_libs=\$GLU_LIBS + + for fl_path in $fl_libs + do + if test `echo "$fl_path" | cut -c 1-2` = "-L"; then + ac_find_libraries=`echo "$fl_path" | cut -c 3-` + fi + done + +fi + + if test "$ac_find_libraries" != "" ; then + if test "$ac_find_libraries" != "std" ; then + + if test "$ac_find_libraries" = "default location"; then + ac_path_to_link="" + else + echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_link="" + else + ac_path_to_link=" -L$ac_find_libraries" + fi + fi + + if test "$ac_path_to_link" != " -L/usr/lib" -a \ + "$ac_path_to_link" != "$LDFLAGS_GL" ; then + LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" + fi + fi + + found_gl=1 + OPENGL_LIBS="-lGL -lGLU" + fi + fi + + if test "$found_gl" != 1; then + + ac_find_libraries= + + fl_pkgname=`echo "MesaGL" | tr [:upper:] [:lower:]` + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - else - { echo "$as_me:$LINENO: result: no" >&5 + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - fi - fi fi -if test "$wxUSE_DETECT_SM" = "yes"; then - if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then - { echo "$as_me:$LINENO: checking for -lSM - X11 session management" >&5 -echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6; } - - ac_find_libraries= - for ac_dir in $SEARCH_LIB; - do - for ac_extension in a so sl dylib dll.a; do - if test -f "$ac_dir/libSM.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 - fi - done - done - - if test "$ac_find_libraries" != "" ; then - - if test "$ac_find_libraries" = "default location"; then - ac_path_to_link="" + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" else - echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_link="" - else - ac_path_to_link=" -L$ac_find_libraries" - fi + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi - if test "$ac_path_to_link" != " -L/usr/lib" ; then - LDFLAGS="$LDFLAGS $ac_path_to_link" - fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM" - { echo "$as_me:$LINENO: result: yes" >&5 +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 + else + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: WARNING: libSM not found; disabling session management detection" >&5 -echo "$as_me: WARNING: libSM not found; disabling session management detection" >&2;} - wxUSE_DETECT_SM="no" - fi - else - wxUSE_DETECT_SM="no" - fi -fi - - - -USE_OPENGL=0 -if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then - + PKG_CONFIG="" + fi - if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then - OPENGL_LIBS="-framework OpenGL -framework AGL" - elif test "$wxUSE_MSW" = 1; then - OPENGL_LIBS="-lopengl32 -lglu32" - elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK2" = 1 -o "$wxUSE_GTK" = 1; then +fi 6> /dev/null - { echo "$as_me:$LINENO: checking for OpenGL headers" >&5 -echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; } +pkg_failed=no +{ echo "$as_me:$LINENO: checking for MesaGL" >&5 +echo $ECHO_N "checking for MesaGL... $ECHO_C" >&6; } -ac_find_includes= -for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include; - do - if test -f "$ac_dir/GL/gl.h"; then - ac_find_includes=$ac_dir - break +if test -n "$PKG_CONFIG"; then + if test -n "$MesaGL_CFLAGS"; then + pkg_cv_MesaGL_CFLAGS="$MesaGL_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MesaGL_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi fi - done - - if test "$ac_find_includes" != "" ; then - { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5 -echo "${ECHO_T}found in $ac_find_includes" >&6; } - - if test "x$ac_find_includes" = "x/usr/include"; then - ac_path_to_include="" - else - echo "$CPPFLAGS" | grep "\-I$ac_find_includes" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_include="" +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$MesaGL_LIBS"; then + pkg_cv_MesaGL_LIBS="$MesaGL_LIBS" else - ac_path_to_include=" -I$ac_find_includes" + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\"") >&5 + ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_MesaGL_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null` +else + pkg_failed=yes +fi fi - fi +else + pkg_failed=untried +fi - CPPFLAGS="$ac_path_to_include $CPPFLAGS" + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + MesaGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"` else - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } + MesaGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"` fi + # Put the nasty error message in config.log where it belongs + echo "$MesaGL_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: checking for GL/gl.h" >&5 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_GL_gl_h+set}" = set; then + + if test "x$ac_find_libraries" = "x"; then + if test "xglEnable" != "x"; then + { echo "$as_me:$LINENO: checking for glEnable in -lMesaGL" >&5 +echo $ECHO_N "checking for glEnable in -lMesaGL... $ECHO_C" >&6; } +if test "${ac_cv_lib_MesaGL_glEnable+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lMesaGL $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char glEnable (); +int +main () +{ +return glEnable (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -34358,44 +37053,94 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_GL_gl_h=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_MesaGL_glEnable=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_GL_gl_h=no + ac_cv_lib_MesaGL_glEnable=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_MesaGL_glEnable" >&5 +echo "${ECHO_T}$ac_cv_lib_MesaGL_glEnable" >&6; } +if test $ac_cv_lib_MesaGL_glEnable = yes; then + ac_find_libraries="std" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } -if test $ac_cv_header_GL_gl_h = yes; then - { echo "$as_me:$LINENO: checking for GL/glu.h" >&5 -echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6; } -if test "${ac_cv_header_GL_glu_h+set}" = set; then + fi + fi + + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } + + ac_find_libraries= + for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libMesaGL.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "x$ac_find_libraries" != "x"; 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 + fi + +elif test $pkg_failed = untried; then + + if test "x$ac_find_libraries" = "x"; then + if test "xglEnable" != "x"; then + { echo "$as_me:$LINENO: checking for glEnable in -lMesaGL" >&5 +echo $ECHO_N "checking for glEnable in -lMesaGL... $ECHO_C" >&6; } +if test "${ac_cv_lib_MesaGL_glEnable+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lMesaGL $LIBS" +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char glEnable (); +int +main () +{ +return glEnable (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -34404,120 +37149,75 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_GL_glu_h=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_MesaGL_glEnable=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_GL_glu_h=no + ac_cv_lib_MesaGL_glEnable=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_MesaGL_glEnable" >&5 +echo "${ECHO_T}$ac_cv_lib_MesaGL_glEnable" >&6; } +if test $ac_cv_lib_MesaGL_glEnable = yes; then + ac_find_libraries="std" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5 -echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; } -if test $ac_cv_header_GL_glu_h = yes; then - - found_gl=0 - - { echo "$as_me:$LINENO: checking for -lGL" >&5 -echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; } - ac_find_libraries= - for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib; - do - for ac_extension in a so sl dylib dll.a; do - if test -f "$ac_dir/libGL.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 + fi fi - done - done - - if test "$ac_find_libraries" != "" ; then - { echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5 -echo "${ECHO_T}found in $ac_find_libraries" >&6; } - - - if test "$ac_find_libraries" = "default location"; then - ac_path_to_link="" - else - echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_link="" - else - ac_path_to_link=" -L$ac_find_libraries" - fi - fi - - if test "$ac_path_to_link" != " -L/usr/lib" ; then - LDFLAGS_GL="$ac_path_to_link" - fi - { echo "$as_me:$LINENO: checking for -lGLU" >&5 -echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6; } + if test "x$ac_find_libraries" = "x"; then + { echo "$as_me:$LINENO: checking elsewhere" >&5 +echo $ECHO_N "checking elsewhere... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do - if test -f "$ac_dir/libGLU.$ac_extension"; then + if test -f "$ac_dir/libMesaGL.$ac_extension"; then ac_find_libraries=$ac_dir break 2 fi done done - if test "$ac_find_libraries" != "" ; then + if test "x$ac_find_libraries" != "x"; 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 + fi - if test "$ac_find_libraries" = "default location"; then - ac_path_to_link="" - else - echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_link="" - else - ac_path_to_link=" -L$ac_find_libraries" - fi - fi +else + MesaGL_CFLAGS=$pkg_cv_MesaGL_CFLAGS + MesaGL_LIBS=$pkg_cv_MesaGL_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } - if test "$ac_path_to_link" != " -L/usr/lib" -a \ - "$ac_path_to_link" != "$LDFLAGS_GL"; then - LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" - fi + ac_find_libraries="std" - found_gl=1 - OPENGL_LIBS="-lGL -lGLU" - { 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 - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi + eval ac_find_cflags=\$MesaGL_CFLAGS + eval fl_libs=\$MesaGL_LIBS - if test "$found_gl" != 1; then - { echo "$as_me:$LINENO: checking for -lMesaGL" >&5 -echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6; } + for fl_path in $fl_libs + do + if test `echo "$fl_path" | cut -c 1-2` = "-L"; then + ac_find_libraries=`echo "$fl_path" | cut -c 3-` + fi + done - ac_find_libraries= - for ac_dir in $SEARCH_LIB; - do - for ac_extension in a so sl dylib dll.a; do - if test -f "$ac_dir/libMesaGL.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 - fi - done - done +fi if test "$ac_find_libraries" != "" ; then + if test "$ac_find_libraries" != "std" ; then if test "$ac_find_libraries" = "default location"; then ac_path_to_link="" @@ -34531,13 +37231,11 @@ echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6; } fi fi - LDFLAGS_GL="$LDFLAGS$ac_path_to_link" - OPENGL_LIBS="-lMesaGL -lMesaGLU" - { 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; } + if test "$ac_path_to_link" != " -L/usr/lib" ; then + LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link" + fi + fi + OPENGL_LIBS="-lMesaGL -lMesaGLU" fi fi @@ -34728,6 +37426,11 @@ cat >>conftest.$ac_ext <<_ACEOF error this platform has no visibility; #endif + /* at the time of Xcode 4.1 / Clang 3, Clang++ still didn't have the bugs sorted out: */ + #if defined(__clang__) + clang compiler is still broken w.r.t. visibility; + #endif + extern __attribute__((__visibility__("hidden"))) int hiddenvar; extern __attribute__((__visibility__("default"))) int exportedvar; extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); @@ -35093,16 +37796,16 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" cat <change-install-names #!/bin/sh -libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` +libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` for i in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i} + ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i} for dep in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i} + ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i} done done EOF chmod +x change-install-names - DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib" + DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}" fi HEADER_PAD_OPTION="-headerpad_max_install_names" @@ -35901,14 +38604,8 @@ _ACEOF fi -if test "$wxUSE_WCHAR_T" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_WCHAR_T 1 -_ACEOF - - - WCSLEN_FOUND=0 - WCHAR_LINK= +WCSLEN_FOUND=0 +WCHAR_LINK= for ac_func in wcslen do @@ -36004,9 +38701,9 @@ fi done - if test "$WCSLEN_FOUND" = 0; then - if test "$TOOLKIT" = "MSW"; then - { echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5 +if test "$WCSLEN_FOUND" = 0; then + if test "$TOOLKIT" = "MSW"; then + { echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5 echo $ECHO_N "checking for wcslen in -lmsvcrt... $ECHO_C" >&6; } if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -36071,8 +38768,8 @@ if test $ac_cv_lib_msvcrt_wcslen = yes; then WCHAR_OK=1 fi - else - { echo "$as_me:$LINENO: checking for wcslen in -lw" >&5 + else + { echo "$as_me:$LINENO: checking for wcslen in -lw" >&5 echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6; } if test "${ac_cv_lib_w_wcslen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -36135,186 +38832,28 @@ fi echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6; } if test $ac_cv_lib_w_wcslen = yes; then - WCHAR_LINK=" -lw" - WCSLEN_FOUND=1 + WCHAR_LINK=" -lw" + WCSLEN_FOUND=1 fi - fi - fi - - if test "$WCSLEN_FOUND" = 1; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_WCSLEN 1 -_ACEOF - fi - - - - - - -for ac_func in wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* 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 -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +if test "$WCSLEN_FOUND" = 1; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_WCSLEN 1 _ACEOF fi -done - - - if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then - CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" - fi - { echo "$as_me:$LINENO: checking for mbstate_t" >&5 -echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; } -if test "${ac_cv_type_mbstate_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -typedef mbstate_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_mbstate_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_mbstate_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5 -echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; } -if test $ac_cv_type_mbstate_t = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_MBSTATE_T 1 -_ACEOF -for ac_func in wcsrtombs +for ac_func in wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -36407,16 +38946,171 @@ _ACEOF fi done + +if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then + CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" fi +{ echo "$as_me:$LINENO: checking for mbstate_t" >&5 +echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; } +if test "${ac_cv_type_mbstate_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - { echo "$as_me:$LINENO: WARNING: Wide character support is unavailable" >&5 -echo "$as_me: WARNING: Wide character support is unavailable" >&2;} + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +typedef mbstate_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_mbstate_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_mbstate_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5 +echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; } +if test $ac_cv_type_mbstate_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_MBSTATE_T 1 +_ACEOF + + +for ac_func in wcsrtombs +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* 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 +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + fi + for ac_func in snprintf vsnprintf vsscanf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -36524,7 +39218,7 @@ if test "${wx_cv_func_vsnprintf_decl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -36533,12 +39227,6 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include - #ifdef __MSL__ - #if __MSL__ >= 0x6000 - namespace std {} - using namespace std; - #endif - #endif int main () @@ -40241,6 +42929,102 @@ echo "${ECHO_T}${flag}" >&6; } if test "$wxUSE_THREADS" = "yes" ; then +for ac_func in pthread_setconcurrency +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* 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 +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_PTHREAD_SET_CONCURRENCY 1 +_ACEOF + +else + + for ac_func in thr_setconcurrency do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -40329,8 +43113,18 @@ echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_THR_SETCONCURRENCY 1 _ACEOF +else + { echo "$as_me:$LINENO: WARNING: Setting thread concurrency will not work properly" >&5 +echo "$as_me: WARNING: Setting thread concurrency will not work properly" >&2;} +fi +done + + fi done @@ -41933,8 +44727,9 @@ int main () { - char *name = "www.gnu.org"; - (void)gethostbyname_r(name) /* ; */ + char *name = "www.gnu.org"; + (void)gethostbyname_r(name) /* ; */ + ; return 0; @@ -41958,6 +44753,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_func_which_gethostbyname_r=no + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -41985,12 +44781,13 @@ int main () { - char *name = "www.gnu.org"; - struct hostent ret, *retp; - char buf[1024]; - int buflen = 1024; - int my_h_errno; - (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */ + char *name = "www.gnu.org"; + struct hostent ret, *retp; + char buf[1024]; + int buflen = 1024; + int my_h_errno; + (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */ + ; return 0; @@ -42014,6 +44811,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_func_which_gethostbyname_r=six + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -42043,12 +44841,13 @@ int main () { - char *name = "www.gnu.org"; - struct hostent ret; - char buf[1024]; - int buflen = 1024; - int my_h_errno; - (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */ + char *name = "www.gnu.org"; + struct hostent ret; + char buf[1024]; + int buflen = 1024; + int my_h_errno; + (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */ + ; return 0; @@ -42072,6 +44871,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_func_which_gethostbyname_r=five + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -42101,10 +44901,11 @@ int main () { - char *name = "www.gnu.org"; - struct hostent ret; - struct hostent_data data; - (void)gethostbyname_r(name, &ret, &data) /* ; */ + char *name = "www.gnu.org"; + struct hostent ret; + struct hostent_data data; + (void)gethostbyname_r(name, &ret, &data) /* ; */ + ; return 0; @@ -42128,6 +44929,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_func_which_gethostbyname_r=three + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -42606,14 +45408,6 @@ fi if test "$WXGTK2" = 1 ; then cat >>confdefs.h <<_ACEOF #define __WXGTK20__ $WXGTK2 -_ACEOF - - WXGTK12=1 -fi - -if test "$WXGTK12" = 1 ; then - cat >>confdefs.h <<_ACEOF -#define __WXGTK12__ $WXGTK12 _ACEOF fi @@ -42653,6 +45447,8 @@ if test "$wxUSE_DEBUG_FLAG" = "no" ; then if test "$wxUSE_GTK" = 1 ; then if test "x$wxGTK_VERSION" = "x1" ; then CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS" + else + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS" fi fi fi @@ -43491,6 +46287,12 @@ _ACEOF else wxUSE_FSWATCHER=no fi + else + if test "$wxUSE_THREADS" != "yes"; then + { echo "$as_me:$LINENO: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&5 +echo "$as_me: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&2;} + wxUSE_FSWATCHER=no + fi fi if test "$wxUSE_FSWATCHER" = "yes"; then @@ -43542,28 +46344,27 @@ _ACEOF fi if test "$USE_UNIX" = 1 ; then - if test "$wxUSE_MGL" != 1; then - { echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5 + { echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5 echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6; } if test "${ac_cv_header_sys_soundcard+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include int main () { - ioctl(0, SNDCTL_DSP_SPEED, 0); + ioctl(0, SNDCTL_DSP_SPEED, 0); ; return 0; @@ -43593,23 +46394,23 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - saveLibs="$LIBS" - LIBS="$saveLibs -lossaudio" - cat >conftest.$ac_ext <<_ACEOF + saveLibs="$LIBS" + LIBS="$saveLibs -lossaudio" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include int main () { - ioctl(0, SNDCTL_DSP_SPEED, 0); + ioctl(0, SNDCTL_DSP_SPEED, 0); ; return 0; @@ -43639,8 +46440,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - LIBS="$saveLibs" - ac_cv_header_sys_soundcard=no + LIBS="$saveLibs" + ac_cv_header_sys_soundcard=no fi @@ -43657,7 +46458,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi { echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard" >&5 echo "${ECHO_T}$ac_cv_header_sys_soundcard" >&6; } - fi if test "$ac_cv_header_sys_soundcard" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -43965,7 +46765,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means SDL was incorrectly installed" + echo "*** exact error that occurred. This usually means SDL was incorrectly installed" echo "*** or that you have moved SDL since it was installed. In the latter case, you" echo "*** may want to edit the sdl-config script: $SDL_CONFIG" fi @@ -43989,12 +46789,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ WITH_PLUGIN_SDL=1 fi fi - else - if test "$wxUSE_MGL" = 1; then - { echo "$as_me:$LINENO: WARNING: wxSound not supported in MGL under DOS... disabled" >&5 -echo "$as_me: WARNING: wxSound not supported in MGL under DOS... disabled" >&2;} - wxUSE_SOUND="no" - fi fi fi @@ -44282,15 +47076,25 @@ fi echo "$LIBGNOMEPRINTUI_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 + if test "$wxUSE_GTKPRINT" = yes; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + else + { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;} + fi wxUSE_LIBGNOMEPRINT="no" elif test $pkg_failed = untried; then - { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 + if test "$wxUSE_GTKPRINT" = yes; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + else + { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;} + fi wxUSE_LIBGNOMEPRINT="no" @@ -44756,6 +47560,31 @@ _ACEOF fi +if test "$wxUSE_HOTKEY" = "yes"; then + if test "$wxUSE_MSW" != 1 -a "$wxUSE_OSX_COCOA" != 1 -a "$wxUSE_OSX_CARBON" != 1; then + { echo "$as_me:$LINENO: WARNING: Hot keys not supported by the current toolkit, disabled" >&5 +echo "$as_me: WARNING: Hot keys not supported by the current toolkit, disabled" >&2;} + wxUSE_HOTKEY=no + fi +elif test "$wxUSE_HOTKEY" = "auto"; then + if test "$wxUSE_MSW" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OSX_CARBON" = 1; then + wxUSE_HOTKEY=yes + fi +fi +if test "$wxUSE_HOTKEY" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_HOTKEY 1 +_ACEOF + +fi + +if test "$wxUSE_STD_CONTAINERS" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_STD_CONTAINERS 1 +_ACEOF + +fi + if test "$wxUSE_STD_IOSTREAM" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_STD_IOSTREAM 1 @@ -44770,6 +47599,13 @@ _ACEOF fi +if test "$wxUSE_STD_STRING_CONV_IN_WXSTRING" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_STD_STRING_CONV_IN_WXSTRING 1 +_ACEOF + +fi + if test "$wxUSE_STDPATHS" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_STDPATHS 1 @@ -45627,14 +48463,6 @@ _ACEOF fi -if test "$wxUSE_SOCKETS" = "yes"; then - if test "$wxUSE_MGL" = 1; then - { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5 -echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;} - wxUSE_SOCKETS="no" - fi -fi - if test "$wxUSE_SOCKETS" = "yes"; then if test "$TOOLKIT" != "MSW"; then { echo "$as_me:$LINENO: checking for socket" >&5 @@ -46389,7 +49217,6 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; } fi else - if test "$wxUSE_MGL" != 1; then for ac_header in linux/joystick.h do @@ -46448,7 +49275,6 @@ fi done - fi fi if test "$wxUSE_JOYSTICK" = "yes"; then @@ -46675,6 +49501,23 @@ if test "$wxUSE_METAFILE" = "yes"; then echo "$as_me: WARNING: wxMetafile is not available on this system... disabled" >&2;} wxUSE_METAFILE=no fi +elif test "$wxUSE_METAFILE" = "auto"; then + if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then + wxUSE_METAFILE=yes + fi +fi + +if test "$wxUSE_METAFILE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_METAFILE 1 +_ACEOF + + if test "$wxUSE_MSW" = 1; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ENH_METAFILE 1 +_ACEOF + + fi fi @@ -46811,18 +49654,6 @@ echo "$as_me: WARNING: Some features disabled because OLE headers not found" >&2 wxUSE_DATAOBJ=no wxUSE_OLE=no fi - - if test "$wxUSE_METAFILE" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_METAFILE 1 -_ACEOF - - - cat >>confdefs.h <<\_ACEOF -#define wxUSE_ENH_METAFILE 1 -_ACEOF - - fi fi if test "$wxUSE_IPC" = "yes"; then @@ -46842,16 +49673,10 @@ _ACEOF fi if test "$wxUSE_DATAOBJ" = "yes"; then - 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 + cat >>confdefs.h <<\_ACEOF #define wxUSE_DATAOBJ 1 _ACEOF - fi else { echo "$as_me:$LINENO: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&5 echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&2;} @@ -46860,7 +49685,7 @@ echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disab fi if test "$wxUSE_CLIPBOARD" = "yes"; then - if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then + if test "$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 @@ -46875,16 +49700,7 @@ _ACEOF fi if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then - if test "$wxUSE_GTK" = 1; then - if test "$WXGTK12" != 1; then - { echo "$as_me:$LINENO: WARNING: Drag and drop is only supported under GTK+ 1.2... disabled" >&5 -echo "$as_me: WARNING: Drag and drop is only supported under GTK+ 1.2... disabled" >&2;} - wxUSE_DRAG_AND_DROP=no - fi - fi - - if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \ - "$wxUSE_DFB" = 1; then + if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 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 @@ -46929,12 +49745,26 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction" fi +if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_DC_TRANSFORM_MATRIX 1 +_ACEOF + +fi + USES_CONTROLS=0 if test "$wxUSE_CONTROLS" = "yes"; then USES_CONTROLS=1 fi +if test "$wxUSE_MARKUP" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_MARKUP 1 +_ACEOF + +fi + if test "$wxUSE_ACCEL" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_ACCEL 1 @@ -46952,6 +49782,13 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate" fi +if test "$wxUSE_BANNERWINDOW" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_BANNERWINDOW 1 +_ACEOF + +fi + if test "$wxUSE_BUTTON" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_BUTTON 1 @@ -47100,7 +49937,7 @@ _ACEOF fi if test "$wxUSE_DISPLAY" = "yes"; then - if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then + if test "$wxUSE_DFB" = 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 @@ -47277,6 +50114,13 @@ _ACEOF fi +if test "$wxUSE_RICHTOOLTIP" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_RICHTOOLTIP 1 +_ACEOF + +fi + if test "$wxUSE_SASH" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SASH 1 @@ -47398,6 +50242,14 @@ _ACEOF fi +if test "$wxUSE_TIMEPICKCTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TIMEPICKCTRL 1 +_ACEOF + + USES_CONTROLS=1 +fi + if test "$wxUSE_TOGGLEBTN" = "yes"; then if test "$wxUSE_OLD_COCOA" = 1 ; then { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5 @@ -47481,6 +50333,15 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit fi fi +if test "$wxUSE_TREELISTCTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TREELISTCTRL 1 +_ACEOF + + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelist" +fi + if test "$wxUSE_POPUPWIN" = "yes"; then if test "$wxUSE_OLD_COCOA" = 1 ; then { echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5 @@ -47502,7 +50363,7 @@ _ACEOF fi if test "$wxUSE_DIALUP_MANAGER" = "yes"; then - if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then + if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then { echo "$as_me:$LINENO: WARNING: Dialup manager not supported on this platform... disabled" >&5 echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;} else @@ -47542,6 +50403,30 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" fi +if test "$wxUSE_ARTPROVIDER_STD" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ARTPROVIDER_STD 1 +_ACEOF + +fi + +if test "$wxUSE_ARTPROVIDER_TANGO" = "auto"; then + if test "$wxUSE_GTK" != 1; then + if test "$wxUSE_LIBPNG" != no -a \ + "$wxUSE_IMAGE" = yes -a \ + "$wxUSE_STREAMS" = yes; then + wxUSE_ARTPROVIDER_TANGO="yes" + fi + fi +fi + +if test "$wxUSE_ARTPROVIDER_TANGO" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ARTPROVIDER_TANGO 1 +_ACEOF + +fi + if test "$wxUSE_DRAGIMAGE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_DRAGIMAGE 1 @@ -47763,13 +50648,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu" fi -if test "$wxUSE_METAFILE" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_METAFILE 1 -_ACEOF - -fi - if test "$wxUSE_MIMETYPE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_MIMETYPE 1 @@ -47794,6 +50672,10 @@ fi if test "$wxUSE_TASKBARICON" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_TASKBARICON 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TASKBARICON_BALLOONS 1 _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" @@ -47835,6 +50717,190 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext" fi +if test "$wxUSE_WEBVIEW" = "yes"; then + USE_WEBVIEW_WEBKIT=0 + if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then + if test "$wxUSE_GTK" = 1; then + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for WEBKIT" >&5 +echo $ECHO_N "checking for WEBKIT... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$WEBKIT_CFLAGS"; then + pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"webkit-1.0 >= 1.3.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "webkit-1.0 >= 1.3.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit-1.0 >= 1.3.1" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$WEBKIT_LIBS"; then + pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"webkit-1.0 >= 1.3.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "webkit-1.0 >= 1.3.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit-1.0 >= 1.3.1" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit-1.0 >= 1.3.1"` + else + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit-1.0 >= 1.3.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$WEBKIT_PKG_ERRORS" >&5 + + + { echo "$as_me:$LINENO: WARNING: webkitgtk not found." >&5 +echo "$as_me: WARNING: webkitgtk not found." >&2;} + +elif test $pkg_failed = untried; then + + { echo "$as_me:$LINENO: WARNING: webkitgtk not found." >&5 +echo "$as_me: WARNING: webkitgtk not found." >&2;} + +else + WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS + WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + USE_WEBVIEW_WEBKIT=1 + CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS" + +fi + elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then + old_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-x objective-c++ $CPPFLAGS" + { echo "$as_me:$LINENO: checking for WebKit/HIWebView.h" >&5 +echo $ECHO_N "checking for WebKit/HIWebView.h... $ECHO_C" >&6; } +if test "${ac_cv_header_WebKit_HIWebView_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_WebKit_HIWebView_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_WebKit_HIWebView_h=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_WebKit_HIWebView_h" >&5 +echo "${ECHO_T}$ac_cv_header_WebKit_HIWebView_h" >&6; } +if test $ac_cv_header_WebKit_HIWebView_h = yes; then + + USE_WEBVIEW_WEBKIT=1 + WEBKIT_LINK="-framework WebKit" + +else + + { echo "$as_me:$LINENO: WARNING: WebKit headers not found" >&5 +echo "$as_me: WARNING: WebKit headers not found" >&2;} + +fi + + + CPPFLAGS="$old_CPPFLAGS" + fi + fi + + wxUSE_WEBVIEW="no" + if test "$wxUSE_GTK" = 1 -o "$wxUSE_MAC" = 1; then + if test "$USE_WEBVIEW_WEBKIT" = 1; then + wxUSE_WEBVIEW="yes" + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WEBVIEW_WEBKIT 1 +_ACEOF + + else + { echo "$as_me:$LINENO: WARNING: WebKit not available, disabling wxWebView" >&5 +echo "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;} + fi + elif test "$wxUSE_MSW" = 1; then + if test "$wxUSE_WEBVIEW_IE" = "yes"; then + wxUSE_WEBVIEW="yes" + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WEBVIEW_IE 1 +_ACEOF + + fi + fi +fi + +if test "$wxUSE_WEBVIEW" = "yes"; then + USE_WEBVIEW=1 + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WEBVIEW 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview" +else + USE_WEBVIEW=0 +fi + if test "$wxUSE_IMAGE" = "yes" ; then cat >>confdefs.h <<\_ACEOF @@ -48143,7 +51209,7 @@ echo "${ECHO_T}$wx_cv_lib_gdiplus" >&6; } if test "$wx_cv_lib_gdiplus" = "yes"; then wx_has_graphics=1 fi - elif test "$wxUSE_GTK" = 1; then + elif test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then pkg_failed=no { echo "$as_me:$LINENO: checking for CAIRO" >&5 @@ -48217,6 +51283,120 @@ else echo "${ECHO_T}yes" >&6; } wx_has_graphics=1 fi + if test "$wx_has_graphics" = 1; then + save_LIBS="$LIBS" + LIBS="$LIBS $CAIRO_LIBS" + +for ac_func in cairo_push_group +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* 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 +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + LIBS="$save_LIBS" + if test "$ac_cv_func_cairo_push_group" = "no"; then + wx_has_graphics=0 + { echo "$as_me:$LINENO: WARNING: Cairo library is too old and misses cairo_push_group()" >&5 +echo "$as_me: WARNING: Cairo library is too old and misses cairo_push_group()" >&2;} + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_CAIRO 1 +_ACEOF + + + if test "$wxUSE_GTK" != 1; then + CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS" + fi + fi + fi else wx_has_graphics=1 fi @@ -48256,12 +51436,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_GST_CFLAGS="$GST_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION gconf-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0" 2>/dev/null` + pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION" 2>/dev/null` else pkg_failed=yes fi @@ -48274,12 +51454,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_GST_LIBS="$GST_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION gconf-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0" 2>/dev/null` + pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION" 2>/dev/null` else pkg_failed=yes fi @@ -48298,9 +51478,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0"` + GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION"` else - GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0"` + GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION"` fi # Put the nasty error message in config.log where it belongs echo "$GST_PKG_ERRORS" >&5 @@ -48517,6 +51697,10 @@ if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_STC" = "yes" ; then BUILT_WX_LIBS="stc $BUILT_WX_LIBS" fi + if test "$wxUSE_WEBVIEW" = "yes" ; then + STD_GUI_LIBS="webview $STD_GUI_LIBS" + BUILT_WX_LIBS="webview $BUILT_WX_LIBS" + fi if test "$wxUSE_XRC" = "yes" ; then STD_GUI_LIBS="xrc $STD_GUI_LIBS" BUILT_WX_LIBS="xrc $BUILT_WX_LIBS" @@ -48535,7 +51719,67 @@ if test "$wxUSE_MAC" = 1 ; then if test "$wxUSE_OSX_IPHONE" = 1; then EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore" else - EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime" + EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL" + + + if test "$cross_compiling" != "no"; then + wx_cv_target_x86_64=no + else + { echo "$as_me:$LINENO: checking if we target only x86_64" >&5 +echo $ECHO_N "checking if we target only x86_64... $ECHO_C" >&6; } +if test "${wx_cv_target_x86_64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +int main() { return 0; } +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + if file conftest$ac_exeext|grep -q 'i386\|ppc'; then + wx_cv_target_x86_64=no + else + wx_cv_target_x86_64=yes + fi + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_target_x86_64" >&5 +echo "${ECHO_T}$wx_cv_target_x86_64" >&6; } + fi + + if test "$wx_cv_target_x86_64" != "yes"; then + EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime" + fi fi fi fi @@ -49474,20 +52718,7 @@ else fi - { echo "$as_me:$LINENO: checking for command to install directories" >&5 -echo $ECHO_N "checking for command to install directories... $ECHO_C" >&6; } - INSTALL_TEST_DIR=acbftest$$ - $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1 - if test $? = 0 -a -d $INSTALL_TEST_DIR; then - rmdir $INSTALL_TEST_DIR - INSTALL_DIR='$(INSTALL) -d' - { echo "$as_me:$LINENO: result: $INSTALL -d" >&5 -echo "${ECHO_T}$INSTALL -d" >&6; } - else INSTALL_DIR="mkdir -p" - { echo "$as_me:$LINENO: result: mkdir -p" >&5 -echo "${ECHO_T}mkdir -p" >&6; } - fi LDFLAGS_GUI= @@ -50962,10 +54193,10 @@ fi - BAKEFILE_BAKEFILE_M4_VERSION="0.2.8" + BAKEFILE_BAKEFILE_M4_VERSION="0.2.9" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.8" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9" @@ -51312,6 +54543,11 @@ EOF COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="" fi + COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="" + fi + COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="" @@ -51367,6 +54603,11 @@ EOF COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="" fi + COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="" + fi + COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="" @@ -51442,6 +54683,11 @@ EOF COND_MONOLITHIC_0_USE_STC_1="" fi + COND_MONOLITHIC_0_USE_WEBVIEW_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then + COND_MONOLITHIC_0_USE_WEBVIEW_1="" + fi + COND_MONOLITHIC_0_USE_XRC_1="#" if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then COND_MONOLITHIC_0_USE_XRC_1="" @@ -51582,16 +54828,6 @@ EOF COND_PLATFORM_UNIX_1="" fi - COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#" - if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then - COND_PLATFORM_UNIX_1_TOOLKIT_MGL="" - fi - - COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#" - if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then - COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="" - fi - COND_PLATFORM_UNIX_1_USE_GUI_1="#" if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then COND_PLATFORM_UNIX_1_USE_GUI_1="" @@ -51762,16 +54998,6 @@ EOF COND_TOOLKIT_MAC="" fi - COND_TOOLKIT_MGL="#" - if test "x$TOOLKIT" = "xMGL" ; then - COND_TOOLKIT_MGL="" - fi - - COND_TOOLKIT_MGL_USE_GUI_1="#" - if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then - COND_TOOLKIT_MGL_USE_GUI_1="" - fi - COND_TOOLKIT_MOTIF="#" if test "x$TOOLKIT" = "xMOTIF" ; then COND_TOOLKIT_MOTIF="" @@ -52150,7 +55376,7 @@ echo "$as_me: error: Required windres program not found" >&2;} { (exit 1); exit 1; }; } fi - RESCOMP="$WINDRES $WINDRES_CPU_DEFINE" + RESCOMP="$WINDRES" fi if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then @@ -52279,17 +55505,17 @@ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS" case "${host}" in *-*-solaris2* ) if test "$GCC" = yes; then - CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'` - LIBS=`echo $LIBS | sed 's/-mt//'` - EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'` + CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//g'` + LIBS=`echo $LIBS | sed 's/-mt//g'` + EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//g'` fi ;; *-*-linux* ) if test "x$SUNCXX" = xyes; then - CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//'` - LIBS=`echo $LIBS | sed 's/-pthread//'` - EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//'` + CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//g'` + LIBS=`echo $LIBS | sed 's/-pthread//g'` + EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//g'` fi ;; esac @@ -52998,7 +56224,7 @@ exec 6>&1 # 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.2, which was +This file was extended by wxWidgets $as_me 2.9.4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -53051,7 +56277,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wxWidgets config.status 2.9.2 +wxWidgets config.status 2.9.4 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -53325,23 +56551,23 @@ PANGOFT2_CFLAGS!$PANGOFT2_CFLAGS$ac_delim PANGOFT2_LIBS!$PANGOFT2_LIBS$ac_delim PANGOXFT_CFLAGS!$PANGOXFT_CFLAGS$ac_delim PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim +Xinerama_CFLAGS!$Xinerama_CFLAGS$ac_delim +Xinerama_LIBS!$Xinerama_LIBS$ac_delim +Xxf86vm_CFLAGS!$Xxf86vm_CFLAGS$ac_delim +Xxf86vm_LIBS!$Xxf86vm_LIBS$ac_delim +SM_CFLAGS!$SM_CFLAGS$ac_delim +SM_LIBS!$SM_LIBS$ac_delim +GL_CFLAGS!$GL_CFLAGS$ac_delim +GL_LIBS!$GL_LIBS$ac_delim +GLU_CFLAGS!$GLU_CFLAGS$ac_delim +GLU_LIBS!$GLU_LIBS$ac_delim +MesaGL_CFLAGS!$MesaGL_CFLAGS$ac_delim +MesaGL_LIBS!$MesaGL_LIBS$ac_delim CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim LIBICONV!$LIBICONV$ac_delim GXX_VERSION!$GXX_VERSION$ac_delim SDL_CONFIG!$SDL_CONFIG$ac_delim -SDL_CFLAGS!$SDL_CFLAGS$ac_delim -SDL_LIBS!$SDL_LIBS$ac_delim -GTKPRINT_CFLAGS!$GTKPRINT_CFLAGS$ac_delim -GTKPRINT_LIBS!$GTKPRINT_LIBS$ac_delim -LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim -LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim -GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim -GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim -HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim -HILDON_LIBS!$HILDON_LIBS$ac_delim -HILDON2_CFLAGS!$HILDON2_CFLAGS$ac_delim -HILDON2_LIBS!$HILDON2_LIBS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -53383,8 +56609,22 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +SDL_CFLAGS!$SDL_CFLAGS$ac_delim +SDL_LIBS!$SDL_LIBS$ac_delim +GTKPRINT_CFLAGS!$GTKPRINT_CFLAGS$ac_delim +GTKPRINT_LIBS!$GTKPRINT_LIBS$ac_delim +LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim +LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim +GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim +GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim +HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim +HILDON_LIBS!$HILDON_LIBS$ac_delim +HILDON2_CFLAGS!$HILDON2_CFLAGS$ac_delim +HILDON2_LIBS!$HILDON2_LIBS$ac_delim PYTHON!$PYTHON$ac_delim COND_PYTHON!$COND_PYTHON$ac_delim +WEBKIT_CFLAGS!$WEBKIT_CFLAGS$ac_delim +WEBKIT_LIBS!$WEBKIT_LIBS$ac_delim CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim CAIRO_LIBS!$CAIRO_LIBS$ac_delim GST_CFLAGS!$GST_CFLAGS$ac_delim @@ -53466,20 +56706,6 @@ SHARED_LD_CC!$SHARED_LD_CC$ac_delim SHARED_LD_CXX!$SHARED_LD_CXX$ac_delim SHARED_LD_MODULE_CC!$SHARED_LD_MODULE_CC$ac_delim SHARED_LD_MODULE_CXX!$SHARED_LD_MODULE_CXX$ac_delim -PIC_FLAG!$PIC_FLAG$ac_delim -WINDOWS_IMPLIB!$WINDOWS_IMPLIB$ac_delim -USE_SOVERSION!$USE_SOVERSION$ac_delim -USE_SOVERLINUX!$USE_SOVERLINUX$ac_delim -USE_SOVERSOLARIS!$USE_SOVERSOLARIS$ac_delim -USE_SOVERCYGWIN!$USE_SOVERCYGWIN$ac_delim -USE_MACVERSION!$USE_MACVERSION$ac_delim -USE_SOTWOSYMLINKS!$USE_SOTWOSYMLINKS$ac_delim -SONAME_FLAG!$SONAME_FLAG$ac_delim -DEPS_TRACKING!$DEPS_TRACKING$ac_delim -BK_DEPS!$BK_DEPS$ac_delim -WINDRES!$WINDRES$ac_delim -REZ!$REZ$ac_delim -SETFILE!$SETFILE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -53521,6 +56747,20 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PIC_FLAG!$PIC_FLAG$ac_delim +WINDOWS_IMPLIB!$WINDOWS_IMPLIB$ac_delim +USE_SOVERSION!$USE_SOVERSION$ac_delim +USE_SOVERLINUX!$USE_SOVERLINUX$ac_delim +USE_SOVERSOLARIS!$USE_SOVERSOLARIS$ac_delim +USE_SOVERCYGWIN!$USE_SOVERCYGWIN$ac_delim +USE_MACVERSION!$USE_MACVERSION$ac_delim +USE_SOTWOSYMLINKS!$USE_SOTWOSYMLINKS$ac_delim +SONAME_FLAG!$SONAME_FLAG$ac_delim +DEPS_TRACKING!$DEPS_TRACKING$ac_delim +BK_DEPS!$BK_DEPS$ac_delim +WINDRES!$WINDRES$ac_delim +REZ!$REZ$ac_delim +SETFILE!$SETFILE$ac_delim OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim GCC_PCH!$GCC_PCH$ac_delim ICC_PCH!$ICC_PCH$ac_delim @@ -53560,6 +56800,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1$ac_de COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim +COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim @@ -53571,6 +56812,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1$ac_de COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim +COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim @@ -53586,6 +56828,7 @@ COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim COND_MONOLITHIC_0_USE_RIBBON_1!$COND_MONOLITHIC_0_USE_RIBBON_1$ac_delim COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim +COND_MONOLITHIC_0_USE_WEBVIEW_1!$COND_MONOLITHIC_0_USE_WEBVIEW_1$ac_delim COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim COND_MONOLITHIC_1!$COND_MONOLITHIC_1$ac_delim COND_MONOLITHIC_1_SHARED_0!$COND_MONOLITHIC_1_SHARED_0$ac_delim @@ -53601,23 +56844,6 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOL COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0$ac_delim -COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim -COND_PLATFORM_MACOSX_1_USE_OPENGL_1!$COND_PLATFORM_MACOSX_1_USE_OPENGL_1$ac_delim -COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim -COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim -COND_PLATFORM_MAC_0!$COND_PLATFORM_MAC_0$ac_delim -COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim -COND_PLATFORM_MSDOS_0!$COND_PLATFORM_MSDOS_0$ac_delim -COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim -COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim -COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim -COND_PLATFORM_UNIX_1!$COND_PLATFORM_UNIX_1$ac_delim -COND_PLATFORM_UNIX_1_TOOLKIT_MGL!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL$ac_delim -COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1$ac_delim -COND_PLATFORM_UNIX_1_USE_GUI_1!$COND_PLATFORM_UNIX_1_USE_GUI_1$ac_delim -COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -53659,6 +56885,21 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1$ac_delim +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0$ac_delim +COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim +COND_PLATFORM_MACOSX_1_USE_OPENGL_1!$COND_PLATFORM_MACOSX_1_USE_OPENGL_1$ac_delim +COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim +COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim +COND_PLATFORM_MAC_0!$COND_PLATFORM_MAC_0$ac_delim +COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim +COND_PLATFORM_MSDOS_0!$COND_PLATFORM_MSDOS_0$ac_delim +COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim +COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim +COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim +COND_PLATFORM_UNIX_1!$COND_PLATFORM_UNIX_1$ac_delim +COND_PLATFORM_UNIX_1_USE_GUI_1!$COND_PLATFORM_UNIX_1_USE_GUI_1$ac_delim +COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim COND_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_WIN32_1_SHARED_0$ac_delim @@ -53691,8 +56932,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__U COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim -COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim -COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim COND_TOOLKIT_MOTIF_USE_GUI_1!$COND_TOOLKIT_MOTIF_USE_GUI_1$ac_delim COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0$ac_delim @@ -53743,19 +56982,6 @@ COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1!$COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1$ac_delim COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim COND_USE_STC_1!$COND_USE_STC_1$ac_delim -COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim -COND_USE_THREADS_1!$COND_USE_THREADS_1$ac_delim -COND_USE_XRC_1!$COND_USE_XRC_1$ac_delim -COND_WINDOWS_IMPLIB_1!$COND_WINDOWS_IMPLIB_1$ac_delim -COND_WITH_PLUGIN_SDL_1!$COND_WITH_PLUGIN_SDL_1$ac_delim -COND_WXUNIV_0!$COND_WXUNIV_0$ac_delim -COND_WXUNIV_1!$COND_WXUNIV_1$ac_delim -COND_WXUSE_EXPAT_BUILTIN!$COND_WXUSE_EXPAT_BUILTIN$ac_delim -COND_WXUSE_LIBJPEG_BUILTIN!$COND_WXUSE_LIBJPEG_BUILTIN$ac_delim -COND_WXUSE_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_BUILTIN$ac_delim -COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim -COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim -COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -53797,6 +57023,19 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim +COND_USE_THREADS_1!$COND_USE_THREADS_1$ac_delim +COND_USE_XRC_1!$COND_USE_XRC_1$ac_delim +COND_WINDOWS_IMPLIB_1!$COND_WINDOWS_IMPLIB_1$ac_delim +COND_WITH_PLUGIN_SDL_1!$COND_WITH_PLUGIN_SDL_1$ac_delim +COND_WXUNIV_0!$COND_WXUNIV_0$ac_delim +COND_WXUNIV_1!$COND_WXUNIV_1$ac_delim +COND_WXUSE_EXPAT_BUILTIN!$COND_WXUSE_EXPAT_BUILTIN$ac_delim +COND_WXUSE_LIBJPEG_BUILTIN!$COND_WXUSE_LIBJPEG_BUILTIN$ac_delim +COND_WXUSE_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_BUILTIN$ac_delim +COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim +COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim +COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim COND_wxUSE_EXPAT_builtin!$COND_wxUSE_EXPAT_builtin$ac_delim COND_wxUSE_LIBJPEG_builtin!$COND_wxUSE_LIBJPEG_builtin$ac_delim COND_wxUSE_LIBPNG_builtin!$COND_wxUSE_LIBPNG_builtin$ac_delim @@ -53850,7 +57089,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5