diff options
author | Bram Moolenaar <bram@vim.org> | 2013-11-02 21:04:38 +0100 |
---|---|---|
committer | Bram Moolenaar <bram@vim.org> | 2013-11-02 21:04:38 +0100 |
commit | 8af74e7c2d65b2658adbbb2400461180b1b1346a (patch) | |
tree | e8edff69d60efc2462eaf9ef6ed517513c8b18fd | |
parent | 2855e8c656ba0270b1f5e55f24dfd8b0ba07f7f9 (diff) | |
download | vim-8af74e7c2d65b2658adbbb2400461180b1b1346a.tar.gz |
Problem: Mac: Where availability macros are defined depends on the system.
Solution: Add a configure check. (Felix B?nemann)
-rwxr-xr-x | src/auto/configure | 13 | ||||
-rw-r--r-- | src/config.h.in | 3 | ||||
-rw-r--r-- | src/configure.in | 4 | ||||
-rw-r--r-- | src/os_mac.h | 7 | ||||
-rw-r--r-- | src/version.c | 2 |
5 files changed, 26 insertions, 3 deletions
diff --git a/src/auto/configure b/src/auto/configure index 07f794e8..9f43e8de 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -4223,7 +4223,7 @@ rm -f core conftest.err conftest.$ac_objext \ OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp" - # On IRIX 5.3, sys/types and inttypes.h are conflicting. + # On IRIX 5.3, sys/types and inttypes.h are conflicting. for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do : @@ -4241,7 +4241,16 @@ fi done -ac_fn_c_check_header_mongrel "$LINENO" "Carbon/Carbon.h" "ac_cv_header_Carbon_Carbon_h" "$ac_includes_default" +ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default" +if test "x$ac_cv_header_AvailabilityMacros_h" = x""yes; then : + +$as_echo "#define HAVE_AVAILABILITYMACROS_H 1" >>confdefs.h + +fi + + + + ac_fn_c_check_header_mongrel "$LINENO" "Carbon/Carbon.h" "ac_cv_header_Carbon_Carbon_h" "$ac_includes_default" if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then : CARBON=yes fi diff --git a/src/config.h.in b/src/config.h.in index 422fd1fc..a4e216bb 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -442,3 +442,6 @@ /* Define if you want Cygwin to use the WIN32 clipboard, not compatible with X11*/ #undef FEAT_CYGWIN_WIN32_CLIPBOARD + +/* Define if we have AvailabilityMacros.h on Mac OS X */ +#undef HAVE_AVAILABILITYMACROS_H diff --git a/src/configure.in b/src/configure.in index 11e1d63d..73470fc7 100644 --- a/src/configure.in +++ b/src/configure.in @@ -206,6 +206,10 @@ if test "`(uname) 2>/dev/null`" = Darwin; then dnl TODO: use -arch i386 on Intel machines CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp" + dnl Mac OS X 10.9+ no longer include AvailabilityMacros.h in Carbon + dnl so we need to include it to have access to version macros. + AC_CHECK_HEADER(AvailabilityMacros.h, [AC_DEFINE(HAVE_AVAILABILITYMACROS_H, 1, [ Define if we have AvailabilityMacros.h on Mac OS X ])]) + dnl If Carbon is found, assume we don't want X11 dnl unless it was specifically asked for (--with-x) dnl or Motif, Athena or GTK GUI is used. diff --git a/src/os_mac.h b/src/os_mac.h index 78b79c2e..c13a3015 100644 --- a/src/os_mac.h +++ b/src/os_mac.h @@ -16,6 +16,11 @@ # define OPAQUE_TOOLBOX_STRUCTS 0 #endif +/* Include MAC_OS_X_VERSION_* macros */ +#ifdef HAVE_AVAILABILITYMACROS_H +# include <AvailabilityMacros.h> +#endif + /* * Macintosh machine-dependent things. * @@ -263,7 +268,7 @@ #endif /* Some "prep work" definition to be able to compile the MacOS X - * version with os_unix.x instead of os_mac.c. Based on the result + * version with os_unix.c instead of os_mac.c. Based on the result * of ./configure for console MacOS X. */ diff --git a/src/version.c b/src/version.c index c2217252..184aee76 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 55, +/**/ 54, /**/ 53, |