WX_ARG_FEATURE(mdidoc, [ --enable-mdidoc use docview architecture with MDI], wxUSE_MDI_ARCHITECTURE)
WX_ARG_FEATURE(mediactrl, [ --enable-mediactrl use wxMediaCtrl class], wxUSE_MEDIACTRL)
WX_ARG_FEATURE(gstreamer8, [ --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix], wxUSE_GSTREAMER8)
-WX_ARG_FEATURE(webkit, [ --enable-webkit use wxWebKitCtrl (Mac)], wxUSE_WEBKIT)
WX_ARG_FEATURE(richtext, [ --enable-richtext use wxRichTextCtrl], wxUSE_RICHTEXT)
WX_ARG_FEATURE(postscript, [ --enable-postscript use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT)
WX_ARG_FEATURE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
WX_ARG_FEATURE(svg, [ --enable-svg use wxSVGFileDC device context], wxUSE_SVG)
+WX_ARG_FEATURE(webkit, [ --enable-webkit use wxWebKitCtrl (Mac-only, use wxWebView instead)], wxUSE_WEBKIT)
+WX_ARG_FEATURE(webview, [ --enable-webview use wxWebView library], wxUSE_WEBVIEW)
dnl wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter
dnl can't be disabled, don't even provide an option to do it
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
WX_ARG_FEATURE(taskbaricon, [ --enable-taskbaricon use wxTaskBarIcon class], wxUSE_TASKBARICON)
WX_ARG_FEATURE(tbarnative, [ --enable-tbarnative use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
WX_ARG_FEATURE(textctrl, [ --enable-textctrl use wxTextCtrl class], wxUSE_TEXTCTRL)
+WX_ARG_FEATURE(datepick, [ --enable-timepick use wxTimePickerCtrl class], wxUSE_TIMEPICKCTRL)
WX_ARG_FEATURE(tipwindow, [ --enable-tipwindow use wxTipWindow class], wxUSE_TIPWINDOW)
WX_ARG_FEATURE(togglebtn, [ --enable-togglebtn use wxToggleButton class], wxUSE_TOGGLEBTN)
WX_ARG_FEATURE(toolbar, [ --enable-toolbar use wxToolBar class], wxUSE_TOOLBAR)
WX_ARG_FEATURE(accessibility,[ --enable-accessibility enable accessibility support], wxUSE_ACCESSIBILITY)
WX_ARG_FEATURE(uiactionsim, [ --enable-uiactionsim use wxUIActionSimulator (experimental)], wxUSE_UIACTIONSIMULATOR)
WX_ARG_FEATURE(dctransform, [ --enable-dctransform use wxDC::SetTransformMatrix and related], wxUSE_DC_TRANSFORM_MATRIX)
+WX_ARG_FEATURE(webviewwebkit,[ --enable-webview-webkit use wxWebView WebKit backend], wxUSE_WEBVIEW_WEBKIT)
dnl ---------------------------------------------------------------------------
dnl support for image formats that do not rely on external library
WX_ARG_FEATURE(ownerdrawn, [ --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only)], wxUSE_OWNER_DRAWN)
WX_ARG_FEATURE(uxtheme, [ --enable-uxtheme enable support for Windows XP themed look (Win32 only)], wxUSE_UXTHEME)
WX_ARG_FEATURE(wxdib, [ --enable-wxdib use wxDIB class (Win32 only)], wxUSE_DIB)
+WX_ARG_FEATURE(webviewie, [ --enable-webview-ie use wxWebView IE backend (Win32 only)], wxUSE_WEBVIEW_IE)
dnl this one is not really MSW-specific but it exists mainly to be turned off
dnl under MSW, it should be off by default on the other platforms
dnl try to find out the standard lib locations for the systems with multiple
dnl ABIs
-AC_MSG_CHECKING([for libraries directory])
+AC_MSG_CHECKING([for libraries directories])
case "${host}" in
*-*-irix6* )
fi
done
done
- if test "x$wx_cv_std_libpath" = "x"; then
- wx_cv_std_libpath="lib"
- fi
]
)
;;
dnl use ../lib or ../lib/64 depending on the size of void*
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* )
- dnl use ../lib or ../lib64 depending on the size of void*
- if test "$ac_cv_sizeof_void_p" = 8 -a \
- -d "/usr/lib64" -a ! -h "/usr/lib64"; then
- wx_cv_std_libpath="lib64"
+ dnl Recent Debian versions (as of 2011) use new approach to multiarch
+ dnl and put the libraries under /usr/lib/arch-linux-gnu. Annoyingly,
+ dnl "arch" here is not `uname -m` because it is "i386" even when uname
+ dnl returns e.g. "i686". So we need to test for it explicitly.
+ 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";
+ dnl And on top of all this, some packages haven't been updated for
+ dnl full multiarch support yet so we still need to look in /usr/lib
+ dnl too as well.
+ if test -n "$wx_cv_std_libfullpath" -a -d "/usr/lib"; then
+ wx_cv_std_libfullpath="$wx_cv_std_libfullpath /usr/lib"
+ fi
;;
esac
-AC_MSG_RESULT($wx_cv_std_libpath)
+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"
+
+AC_MSG_RESULT($wx_cv_std_libfullpath)
+
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath"
dnl Cross compiling with gcc?
if test "$build" != "$host" -a "$GCC" = yes; then
AC_DEFINE(wxUSE_RICHEDIT2)
fi
+if test "$wxUSE_TIMEPICKCTRL" = "yes"; then
+ AC_DEFINE(wxUSE_TIMEPICKCTRL)
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_TOGGLEBTN" = "yes"; then
if test "$wxUSE_OLD_COCOA" = 1 ; then
AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
fi
fi
-if test "$wxUSE_TREECTRL" = "yes"; then
+if test "$wxUSE_TREELISTCTRL" = "yes"; then
AC_DEFINE(wxUSE_TREELISTCTRL)
USES_CONTROLS=1
fi
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
+ AC_MSG_CHECKING([for webkitgtk libraries])
+ WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],webkitgtk-1.0)
+ if test "$ac_find_libraries" != "" ; then
+ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+ if test "$ac_path_to_link" != " -L/usr/lib" ; then
+ LDFLAGS="$LDFLAGS $ac_path_to_link"
+ fi
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
+ AC_MSG_RESULT([yes])
+
+ AC_MSG_CHECKING(for webkitgtk headers)
+ WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/webkit-1.0], webkit/webkit.h)
+ if test "$ac_find_includes" != "" ; then
+ AC_MSG_RESULT(found in $ac_find_includes)
+ WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
+ CPPFLAGS="$ac_path_to_include $CPPFLAGS"
+
+ dnl we also depend on libsoup
+ AC_MSG_CHECKING(for libsoup headers)
+ WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/libsoup-2.4], libsoup/soup.h)
+ if test "$ac_find_includes" != "" ; then
+ AC_MSG_RESULT(found in $ac_find_includes)
+ WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
+ CPPFLAGS="$ac_path_to_include $CPPFLAGS"
+
+ USE_WEBVIEW_WEBKIT=1
+ else
+ AC_MSG_RESULT([not found])
+ AC_MSG_WARN([libsoup headers not found; disabling WebKit backend])
+ fi
+ else
+ AC_MSG_RESULT([not found])
+ AC_MSG_WARN([WebKit headers not found; disabling WebKit backend])
+ fi
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_WARN([WebKit libraries not found; disabling WebKit backend])
+ fi
+ elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+ dnl Under Mac we always have the libraries but check for the
+ dnl headers
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="-x objective-c++ $CPPFLAGS"
+ AC_CHECK_HEADER([WebKit/HIWebView.h],
+ [
+ USE_WEBVIEW_WEBKIT=1
+ WEBKIT_LINK="-framework WebKit"
+ ],
+ [
+ AC_MSG_WARN([WebKit headers not found])
+ ],
+ [
+ #include <Carbon/Carbon.h>
+ #include <WebKit/WebKit.h>
+ ])
+ 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"
+ AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
+ else
+ AC_MSG_WARN([WebKit not available, disabling wxWebView])
+ fi
+ elif test "$wxUSE_MSW" = 1; then
+ if test "wxUSE_WEBVIEW_IE" = "yes"; then
+ dnl TODO: Check for the required headers/libraries under Windows
+ dnl too and do the right thing automatically there too.
+ wxUSE_WEBVIEW="yes"
+ AC_DEFINE(wxUSE_WEBVIEW_IE)
+ fi
+ fi
+fi
+
+if test "$wxUSE_WEBVIEW" = "yes"; then
+ USE_WEBVIEW=1
+ AC_DEFINE(wxUSE_WEBVIEW)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
+else
+ USE_WEBVIEW=0
+fi
+
dnl ---------------------------------------------------------------------------
dnl wxImage options
dnl ---------------------------------------------------------------------------
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"
projects / wxWidgets.git / blobdiff