diff --git a/src/auto/configure b/src/auto/configure index 75f76a6301dc10f55e735e405f0822cc8f5289e6..bb079f0fc0bbc3c79c313ffb9398143625e30a06 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 ee70682b221ba2e014be44af0d24accefe49e562..df28a246b792906a639d5fd54d9fb2a6f1fd4c40 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 5ef4c228cca890326713f7b2235f64f676eb7629..229672a30b72fd10a67389790c24c5c0769687e1 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 62, /**/ 61, /**/