summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/auto/configure10
-rw-r--r--src/configure.in2
-rw-r--r--src/version.c2
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,