Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename --with-cocoa configure switch to --with-old_cocoa to avoid confusion.

Browse Source 
Change --with-cocoa to be synonym for --with-osx_cocoa, add --with-carbon as a
synonym for --with-osx_carbon for consistency and --with-osx as a synonym for
--with-mac.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-12-13 12:52:42 +00:00
parent f525476870
commit f10f4c8785
2 changed files with 67 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
configure vendored
View File

@@ -1918,8 +1918,11 @@ Optional Packages:
--with-motif use Motif/Lesstif --with-motif use Motif/Lesstif
--with-osx_carbon use Mac OS X (Carbon) --with-osx_carbon use Mac OS X (Carbon)
--with-osx_cocoa use Mac OS X (Cocoa) --with-osx_cocoa use Mac OS X (Cocoa)
--with-mac use Mac OS X (Default) --with-osx use Mac OS X (default port, currently Carbon)
--with-cocoa use Cocoa --with-carbon same as --with-osx_carbon
--with-cocoa same as --with-osx_cocoa
--with-mac same as --with-osx
--with-old_cocoa use old, deprecated, Cocoa port
--with-wine use Wine --with-wine use Wine
--with-msw use MS-Windows --with-msw use MS-Windows
--with-pm use OS/2 Presentation Manager --with-pm use OS/2 Presentation Manager
@@ -2606,7 +2609,7 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0
ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB" ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB"
DEFAULT_wxUSE_COCOA=0 DEFAULT_wxUSE_OLD_COCOA=0
DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_OSX_CARBON=0 DEFAULT_wxUSE_OSX_CARBON=0
DEFAULT_wxUSE_OSX_COCOA=0 DEFAULT_wxUSE_OSX_COCOA=0
@@ -2618,7 +2621,7 @@ DEFAULT_wxUSE_PM=0
DEFAULT_wxUSE_X11=0 DEFAULT_wxUSE_X11=0
DEFAULT_wxUSE_DFB=0 DEFAULT_wxUSE_DFB=0
DEFAULT_DEFAULT_wxUSE_COCOA=0 DEFAULT_DEFAULT_wxUSE_OLD_COCOA=0
DEFAULT_DEFAULT_wxUSE_GTK=0 DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
@@ -3323,15 +3326,33 @@ if test "${with_osx_cocoa+set}" = set; then
fi fi
# Check whether --with-osx was given.
if test "${with_osx+set}" = set; then
withval=$with_osx; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
fi
# Check whether --with-carbon was given.
if test "${with_carbon+set}" = set; then
withval=$with_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
fi
# Check whether --with-cocoa was given.
if test "${with_cocoa+set}" = set; then
withval=$with_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1
fi
# Check whether --with-mac was given. # Check whether --with-mac was given.
if test "${with_mac+set}" = set; then if test "${with_mac+set}" = set; then
withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
fi fi
# Check whether --with-cocoa was given. # Check whether --with-old_cocoa was given.
if test "${with_cocoa+set}" = set; then if test "${with_old_cocoa+set}" = set; then
withval=$with_cocoa; wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1 withval=$with_old_cocoa; wxUSE_OLD_COCOA="$withval" CACHE_OLD_COCOA=1 TOOLKIT_GIVEN=1
fi fi
@@ -3517,7 +3538,7 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
done done
fi fi
NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \ NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+ ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \ + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+ ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
@@ -28503,7 +28524,7 @@ if test "$wxUSE_GUI" = "yes"; then
WXGTK2= WXGTK2=
WXGPE= WXGPE=
if test "$wxUSE_COCOA" = 1 ; then if test "$wxUSE_OLD_COCOA" = 1 ; then
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
{ echo "$as_me:$LINENO: WARNING: Printing not supported under wxCocoa yet, disabled" >&5 { echo "$as_me:$LINENO: WARNING: Printing not supported under wxCocoa yet, disabled" >&5
echo "$as_me: WARNING: Printing not supported under wxCocoa yet, disabled" >&2;} echo "$as_me: WARNING: Printing not supported under wxCocoa yet, disabled" >&2;}
@@ -32951,7 +32972,7 @@ echo "${ECHO_T}none" >&6; }
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__" TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
fi fi
if test "$wxUSE_COCOA" = 1; then if test "$wxUSE_OLD_COCOA" = 1; then
TOOLKIT=COCOA TOOLKIT=COCOA
GUIDIST=COCOA_DIST GUIDIST=COCOA_DIST
fi fi
@@ -33193,7 +33214,7 @@ fi
if test "$wxUSE_DISPLAY" = "yes"; then if test "$wxUSE_DISPLAY" = "yes"; then
if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
{ echo "$as_me:$LINENO: checking for Xinerama" >&5 { echo "$as_me:$LINENO: checking for Xinerama" >&5
echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; } echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; }
@@ -33373,7 +33394,7 @@ echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; }
fi fi
if test "$wxUSE_DETECT_SM" = "yes"; then if test "$wxUSE_DETECT_SM" = "yes"; then
if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; 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 "$as_me:$LINENO: checking for -lSM - X11 session management" >&5
echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6; } echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6; }
@@ -33426,7 +33447,7 @@ USE_OPENGL=0
if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
OPENGL_LIBS="-framework OpenGL -framework AGL" OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32" OPENGL_LIBS="-lopengl32 -lglu32"
@@ -34300,7 +34321,7 @@ TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffi
TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}" TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}" WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
else else
WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
@@ -34313,7 +34334,7 @@ fi
if test "$wxUSE_COCOA" = 1; then if test "$wxUSE_OLD_COCOA" = 1; then
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
@@ -46486,7 +46507,7 @@ _ACEOF
fi fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then if test "$wxUSE_TOGGLEBTN" = "yes"; then
if test "$wxUSE_COCOA" = 1 ; then if test "$wxUSE_OLD_COCOA" = 1 ; then
{ echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5 { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5
echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;} echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;}
wxUSE_TOGGLEBTN=no wxUSE_TOGGLEBTN=no
@@ -46569,7 +46590,7 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit
fi fi
if test "$wxUSE_POPUPWIN" = "yes"; then if test "$wxUSE_POPUPWIN" = "yes"; then
if test "$wxUSE_COCOA" = 1 ; then if test "$wxUSE_OLD_COCOA" = 1 ; then
{ echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5 { echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;} echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;}
else else
@@ -46589,7 +46610,7 @@ _ACEOF
fi fi
if test "$wxUSE_DIALUP_MANAGER" = "yes"; then if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_MGL" = 1; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
{ echo "$as_me:$LINENO: WARNING: Dialup manager not supported on this platform... disabled" >&5 { 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;} echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;}
else else
@@ -46728,7 +46749,7 @@ fi
CPPFLAGS="$old_CPPFLAGS" CPPFLAGS="$old_CPPFLAGS"
elif test "$wxUSE_COCOA" = 1; then elif test "$wxUSE_OLD_COCOA" = 1; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define wxUSE_WEBKIT 1 #define wxUSE_WEBKIT 1
_ACEOF _ACEOF
@@ -47621,13 +47642,13 @@ if test "$wxUSE_MAC" = 1 ; then
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 -framework QuickTime"
fi fi
fi fi
if test "$wxUSE_COCOA" = 1 ; then if test "$wxUSE_OLD_COCOA" = 1 ; then
EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa" EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa"
if test "$wxUSE_MEDIACTRL" = "yes"; then if test "$wxUSE_MEDIACTRL" = "yes"; then
EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime" EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime"
fi fi
fi fi
if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then
EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices" EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
fi fi
@@ -51227,7 +51248,7 @@ echo "$as_me: error: Required windres program not found" >&2;}
RESCOMP="$WINDRES $WINDRES_CPU_DEFINE" RESCOMP="$WINDRES $WINDRES_CPU_DEFINE"
fi fi
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r" WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc" WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"

45
configure.in
View File

@@ -107,7 +107,7 @@ ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB"
dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
dnl which are either yes or no dnl which are either yes or no
DEFAULT_wxUSE_COCOA=0 DEFAULT_wxUSE_OLD_COCOA=0
DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_OSX_CARBON=0 DEFAULT_wxUSE_OSX_CARBON=0
DEFAULT_wxUSE_OSX_COCOA=0 DEFAULT_wxUSE_OSX_COCOA=0
@@ -122,7 +122,7 @@ DEFAULT_wxUSE_DFB=0
dnl these are the values which are really default for the given platform: dnl these are the values which are really default for the given platform:
dnl they're used if no --with-<toolkit> options were given to detect the dnl they're used if no --with-<toolkit> options were given to detect the
dnl toolkit to use by default for the target platform dnl toolkit to use by default for the target platform
DEFAULT_DEFAULT_wxUSE_COCOA=0 DEFAULT_DEFAULT_wxUSE_OLD_COCOA=0
DEFAULT_DEFAULT_wxUSE_GTK=0 DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
@@ -453,10 +453,13 @@ dnl we use AC_ARG_WITH and not WX_ARG_WITH for the toolkit options as they
dnl shouldn't default to wxUSE_ALL_FEATURES dnl shouldn't default to wxUSE_ALL_FEATURES
AC_ARG_WITH(gtk, [[ --with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(gtk, [[ --with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(osx_carbon, [ --with-osx_carbon use Mac OS X (Carbon) ], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(osx_carbon, [ --with-osx_carbon use Mac OS X (Carbon)], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(osx_cocoa, [ --with-osx_cocoa use Mac OS X (Cocoa) ], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(osx_cocoa, [ --with-osx_cocoa use Mac OS X (Cocoa)], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mac, [ --with-mac use Mac OS X (Default) ], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(osx, [ --with-osx use Mac OS X (default port, currently Carbon)], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(cocoa, [ --with-cocoa use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(carbon, [ --with-carbon same as --with-osx_carbon], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(cocoa, [ --with-cocoa same as --with-osx_cocoa], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mac, [ --with-mac same as --with-osx], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(old_cocoa, [ --with-old_cocoa use old, deprecated, Cocoa port], [wxUSE_OLD_COCOA="$withval" CACHE_OLD_COCOA=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(wine, [ --with-wine use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1]) AC_ARG_WITH(wine, [ --with-wine use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
AC_ARG_WITH(msw, [ --with-msw use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(msw, [ --with-msw use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(pm, [ --with-pm use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(pm, [ --with-pm use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
@@ -518,7 +521,7 @@ if test "$wxUSE_GUI" = "yes"; then
dnl we suppose that expr is available (maybe there is a better way to do dnl we suppose that expr is available (maybe there is a better way to do
dnl this? what about using ALL_TOOLKITS? TODO) dnl this? what about using ALL_TOOLKITS? TODO)
NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \ NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+ ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \ + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+ ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
@@ -2788,7 +2791,7 @@ if test "$wxUSE_GUI" = "yes"; then
WXGTK2= WXGTK2=
WXGPE= WXGPE=
if test "$wxUSE_COCOA" = 1 ; then if test "$wxUSE_OLD_COCOA" = 1 ; then
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
AC_MSG_WARN([Printing not supported under wxCocoa yet, disabled]) AC_MSG_WARN([Printing not supported under wxCocoa yet, disabled])
wxUSE_PRINTING_ARCHITECTURE=no wxUSE_PRINTING_ARCHITECTURE=no
@@ -3522,7 +3525,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__" TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
fi fi
if test "$wxUSE_COCOA" = 1; then if test "$wxUSE_OLD_COCOA" = 1; then
TOOLKIT=COCOA TOOLKIT=COCOA
GUIDIST=COCOA_DIST GUIDIST=COCOA_DIST
fi fi
@@ -3633,7 +3636,7 @@ if test "$wxUSE_DISPLAY" = "yes"; then
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Xinerama (for unix ) - Brian Victor dnl Xinerama (for unix ) - Brian Victor
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
AC_MSG_CHECKING([for Xinerama]) AC_MSG_CHECKING([for Xinerama])
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama) WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
@@ -3679,7 +3682,7 @@ dnl ---------------------------------------------------------------------------
dnl X11 session management dnl X11 session management
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
if test "$wxUSE_DETECT_SM" = "yes"; then if test "$wxUSE_DETECT_SM" = "yes"; then
if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
AC_MSG_CHECKING([for -lSM - X11 session management]) AC_MSG_CHECKING([for -lSM - X11 session management])
WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM) WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM)
if test "$ac_find_libraries" != "" ; then if test "$ac_find_libraries" != "" ; then
@@ -3709,7 +3712,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
dnl look in glcanvas.h for the list of platforms supported by wxGlCanvas: dnl look in glcanvas.h for the list of platforms supported by wxGlCanvas:
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
OPENGL_LIBS="-framework OpenGL -framework AGL" OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32" OPENGL_LIBS="-lopengl32 -lglu32"
@@ -3970,7 +3973,7 @@ dnl library link name
dnl These just save us from exporting lib_{unicode,flavour}_suffix. dnl These just save us from exporting lib_{unicode,flavour}_suffix.
dnl If we ever need to do that, we won't need to keep these. dnl If we ever need to do that, we won't need to keep these.
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}" WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
else else
WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
@@ -3983,7 +3986,7 @@ fi
if test "$wxUSE_COCOA" = 1; then if test "$wxUSE_OLD_COCOA" = 1; then
AC_LANG_SAVE AC_LANG_SAVE
AC_WX_LANG_OBJECTIVEC AC_WX_LANG_OBJECTIVEC
dnl Recent AppKit/NSEvent.h include parts of IOKit which eventually dnl Recent AppKit/NSEvent.h include parts of IOKit which eventually
@@ -6901,7 +6904,7 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then
fi fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then if test "$wxUSE_TOGGLEBTN" = "yes"; then
if test "$wxUSE_COCOA" = 1 ; then if test "$wxUSE_OLD_COCOA" = 1 ; then
AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled]) AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
wxUSE_TOGGLEBTN=no wxUSE_TOGGLEBTN=no
fi fi
@@ -6959,7 +6962,7 @@ if test "$wxUSE_TREECTRL" = "yes"; then
fi fi
if test "$wxUSE_POPUPWIN" = "yes"; then if test "$wxUSE_POPUPWIN" = "yes"; then
if test "$wxUSE_COCOA" = 1 ; then if test "$wxUSE_OLD_COCOA" = 1 ; then
AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled]) AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
else else
if test "$wxUSE_PM" = 1; then if test "$wxUSE_PM" = 1; then
@@ -6974,7 +6977,7 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
fi fi
if test "$wxUSE_DIALUP_MANAGER" = "yes"; then if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_MGL" = 1; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
AC_MSG_WARN([Dialup manager not supported on this platform... disabled]) AC_MSG_WARN([Dialup manager not supported on this platform... disabled])
else else
AC_DEFINE(wxUSE_DIALUP_MANAGER) AC_DEFINE(wxUSE_DIALUP_MANAGER)
@@ -7042,7 +7045,7 @@ if test "$wxUSE_WEBKIT" = "yes"; then
#include <WebKit/WebKit.h> #include <WebKit/WebKit.h>
]) ])
CPPFLAGS="$old_CPPFLAGS" CPPFLAGS="$old_CPPFLAGS"
elif test "$wxUSE_COCOA" = 1; then elif test "$wxUSE_OLD_COCOA" = 1; then
AC_DEFINE(wxUSE_WEBKIT) AC_DEFINE(wxUSE_WEBKIT)
else else
wxUSE_WEBKIT=no wxUSE_WEBKIT=no
@@ -7533,13 +7536,13 @@ if test "$wxUSE_MAC" = 1 ; then
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 -framework QuickTime"
fi fi
fi fi
if test "$wxUSE_COCOA" = 1 ; then if test "$wxUSE_OLD_COCOA" = 1 ; then
EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa" EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa"
if test "$wxUSE_MEDIACTRL" = "yes"; then if test "$wxUSE_MEDIACTRL" = "yes"; then
EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime" EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime"
fi fi
fi fi
if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then
EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices" EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
fi fi
@@ -7922,7 +7925,7 @@ if test "$wxUSE_MSW" = 1 ; then
RESCOMP="$WINDRES $WINDRES_CPU_DEFINE" RESCOMP="$WINDRES $WINDRES_CPU_DEFINE"
fi fi
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
dnl base name of the resource file for wxMac must be the same dnl base name of the resource file for wxMac must be the same
dnl as library installation base name (-install_name) dnl as library installation base name (-install_name)
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r" WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"