Mercurial > vim

changeset 5423:d59a0b8e5584 v7.4.062

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.062 Problem: Configure check for AvailabilityMacros.h is wrong. Solution: Use AC_CHECK_HEADERS().
author Bram Moolenaar <bram@vim.org>
date Sun, 03 Nov 2013 20:26:31 +0100
parents b756610d1647
children ed761b26334f
files src/auto/configure src/configure.in src/version.c
diffstat 3 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
-fi
-
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVAILABILITYMACROS_H 1
+_ACEOF
+
+fi
+
+done
 
 
 
--- 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)
--- 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,