diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-11-03 20:26:31 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-11-03 20:26:31 +0100 |
| commit | 18e5469b6e73dfbd85ac9831224cd4ec29cbe308 (patch) | |
| tree | aa401da08d64742b3eefb281fc6f9f0e511dfa35 | |
| parent | 39766a7595461b89d1aebff72ac3853225e6a4c5 (diff) | |
| download | vim-18e5469b6e73dfbd85ac9831224cd4ec29cbe308.zip | |
updated for version 7.4.062
Problem: Configure check for AvailabilityMacros.h is wrong.
Solution: Use AC_CHECK_HEADERS().
| -rwxr-xr-x | src/auto/configure | 10 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/auto/configure b/src/auto/configure index 75f76a630..bb079f0fc 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -4263,11 +4263,17 @@ else $as_echo "no" >&6; } fi -ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default" +for ac_header in AvailabilityMacros.h +do : + 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 : - HAVE_AVAILABILITYMACROS_H=1 + cat >>confdefs.h <<_ACEOF +#define HAVE_AVAILABILITYMACROS_H 1 +_ACEOF + fi +done diff --git a/src/configure.in b/src/configure.in index ee70682b2..df28a246b 100644 --- a/src/configure.in +++ b/src/configure.in @@ -230,7 +230,7 @@ fi 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, HAVE_AVAILABILITYMACROS_H=1) +AC_CHECK_HEADERS(AvailabilityMacros.h) AC_SUBST(OS_EXTRA_SRC) AC_SUBST(OS_EXTRA_OBJ) diff --git a/src/version.c b/src/version.c index 5ef4c228c..229672a30 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 */ /**/ + 62, +/**/ 61, /**/ 60, |