Revision
25
Author
robert@fledge.watson.org
Date
2009-09-14 11:28:24 -0700 (Mon, 14 Sep 2009)

Log Message

Add private header checks for two XNU headers needed to build on Mac OS X.
We have to expand the autoconf include path, not just the build-time one,
for this to work.

Modified Paths

Diff

Modified: trunk/configure.ac (24 => 25)


--- trunk/configure.ac	2009-09-14 16:32:24 UTC (rev 24)
+++ trunk/configure.ac	2009-09-14 18:28:24 UTC (rev 25)
@@ -16,7 +16,9 @@
 AC_ARG_WITH([apple-libc-source],
   [AS_HELP_STRING([--with-apple-libc-source],
     [Specify path to Apple Libc source])],
-  [APPLE_LIBC_SOURCE_PATH=-I${withval}/pthreads],
+  [apple_libc_source_path=${withval}/pthreads
+    APPLE_LIBC_SOURCE_PATH=-I$apple_libc_source_path
+    CPPFLAGS="$CPPFLAGS -I$apple_libc_source_path"],
   [APPLE_LIBC_SOURCE_PATH=]
 )
 AC_SUBST([APPLE_LIBC_SOURCE_PATH])
@@ -24,7 +26,9 @@
 AC_ARG_WITH([apple-xnu-source],
   [AS_HELP_STRING([--with-apple-xnu-source],
     [Specify path to Apple XNU source])],
-  [APPLE_XNU_SOURCE_PATH=-I${withval}/libkern ],
+  [apple_xnu_source_path=${withval}/libkern
+    APPLE_XNU_SOURCE_PATH=-I$apple_xnu_source_path
+    CPPFLAGS="$CPPFLAGS -I$apple_xnu_source_path"],
   [APPLE_XNU_SOURCE_PATH=]
 )
 AC_SUBST([APPLE_XNU_SOURCE_PATH])
@@ -118,7 +122,7 @@
 # Checks for header files.
 #
 AC_HEADER_STDC
-AC_CHECK_HEADERS([Availability.h pthread_np.h malloc/malloc.h])
+AC_CHECK_HEADERS([Availability.h pthread_machdep.h pthread_np.h malloc/malloc.h libkern/OSCrossEndian.h libkern/OSAtomic.h])
 
 #
 # We use the availability of mach.h to decide whether to compile in all sorts