patch 9.0.1110: build fails on Mac OS X 10.4/10.5

Problem:    Build fails on Mac OS X 10.4/10.5 .
Solution:   Check if the dispatch/dispatch.h header exists. (Evan Miller,
            closes #11746)

diff --git a/src/auto/configure b/src/auto/configure
index 92826d4d6d6c1b24aa31d05d86aba23484ed14dd..44d83c29fdca1e37a45be67c51dd8286f05960ef 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4816,6 +4816,19 @@ fi
 
 done
 
+# 10.5 and earlier lack dispatch
+for ac_header in dispatch/dispatch.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dispatch/dispatch.h" "ac_cv_header_dispatch_dispatch_h" "$ac_includes_default"
+if test "x$ac_cv_header_dispatch_dispatch_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DISPATCH_DISPATCH_H 1
+_ACEOF
+
+fi
+
+done
+
 
 
 

diff --git a/src/config.h.in b/src/config.h.in
index b77418c1cc3406fcec71f51c9262275d60a84158..6cb43da125b1e620780befcabb3659601f941e52 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -236,6 +236,7 @@
 
 /* Define if you have the header file: */
 #undef HAVE_DIRENT_H
+#undef HAVE_DISPATCH_DISPATCH_H
 #undef HAVE_ERRNO_H
 #undef HAVE_FCNTL_H
 #undef HAVE_FRAME_H

diff --git a/src/configure.ac b/src/configure.ac
index a5beb834dc6c227395117a25b20242e62bef7c94..fc346dc8112b73a832cc9e8073246e6a68e6ebc6 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -314,6 +314,8 @@ 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_HEADERS(AvailabilityMacros.h)
+# 10.5 and earlier lack dispatch
+AC_CHECK_HEADERS(dispatch/dispatch.h)
 
 AC_SUBST(OS_EXTRA_SRC)
 AC_SUBST(OS_EXTRA_OBJ)

diff --git a/src/feature.h b/src/feature.h
index 948539b1b362c1b8169ee83fc4265d49d948c4b5..3255f8abd3639b7db4e144ceb87845074b96f404 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -272,7 +272,8 @@
  */
 #if defined(FEAT_NORMAL) \
        && defined(FEAT_EVAL) \
-       && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) \
+       && ((defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) \
+        && (!defined(MACOS_X) || defined(HAVE_DISPATCH_DISPATCH_H))) \
                || defined(MSWIN))
 # define FEAT_RELTIME
 #endif

diff --git a/src/version.c b/src/version.c
index 773a919789d25acba7ca0070d3e0b26033423c8a..3d2b85175b9b85dd21d4d9f42ef39153486b2713 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1110,
 /**/
     1109,
 /**/