diff --git a/ChangeLog b/ChangeLog
index 7a86d2110..19b52ce63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-12-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* configure.in: Use AC_LANG_SOURCE for the clock test.
+
 	* glib/gthreadpool.h:
 	* glib/gthreadpool.c (g_thread_pool_free): Don't use "wait"
 	as parameter name.  (#379207, Christian Biere)
diff --git a/configure.in b/configure.in
index 80e8e84e6..1f8cbdd0d 100644
--- a/configure.in
+++ b/configure.in
@@ -2000,15 +2000,18 @@ AC_CHECK_FUNCS(clock_gettime, [], [
 ])
 
 AC_CACHE_CHECK(for monotonic clocks,
-    glib_cv_monotonic_clock,AC_COMPILE_IFELSE([
+    glib_cv_monotonic_clock,AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <time.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-      int main() {
+#endif
+int main (int argc, char *argv[]) {
 #if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC))
         #error No monotonic clock
 #endif
-        return 0;
-      }],glib_cv_monotonic_clock=yes,glib_cv_monotonic_clock=no))
+	return 0;
+}
+]])],glib_cv_monotonic_clock=yes,glib_cv_monotonic_clock=no))
 if test "$glib_cv_monotonic_clock" = "yes"; then
   AC_DEFINE(HAVE_MONOTONIC_CLOCK,1,[Have a monotonic clock])
 fi