Updating configure.in to work with wxWebKit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9a768b4503
commit
7866e9c949
@ -5610,6 +5610,9 @@ if test "$wxUSE_HTML" = "yes"; then
|
|||||||
AC_DEFINE(wxUSE_HTML)
|
AC_DEFINE(wxUSE_HTML)
|
||||||
USE_HTML=1
|
USE_HTML=1
|
||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
|
||||||
|
if test "$wxUSE_MAC" = 1; then
|
||||||
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_MENUS" = "yes"; then
|
if test "$wxUSE_MENUS" = "yes"; then
|
||||||
@ -5821,7 +5824,7 @@ dnl note that we always link with -lm except for Mac OS X
|
|||||||
dnl extended.c uses floor() and is always linked in
|
dnl extended.c uses floor() and is always linked in
|
||||||
|
|
||||||
if test "$wxUSE_MAC" = 1 ; then
|
if test "$wxUSE_MAC" = 1 ; then
|
||||||
LDFLAGS="$LDFLAGS -framework Carbon -framework System"
|
LDFLAGS="$LDFLAGS -framework Carbon -framework Cocoa -framework WebKit -framework System"
|
||||||
fi
|
fi
|
||||||
if test "$wxUSE_COCOA" = 1 ; then
|
if test "$wxUSE_COCOA" = 1 ; then
|
||||||
LDFLAGS="$LDFLAGS -framework Cocoa -framework System"
|
LDFLAGS="$LDFLAGS -framework Cocoa -framework System"
|
||||||
|
Loading…
Reference in New Issue
Block a user