Merge tree from intel box.

diff --git a/bootstrap.sh b/bootstrap.sh
index 4bc2148a84f7ad57e5e78fc0905048c52e27f7d0..ae25df01761669faee11cf1633c2e0add072119c 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1746,7 +1746,7 @@ function main ()
       fi
 
       if [ -z "$MAKE_TARGET" ]; then
-        MAKE_TARGET='jenkins'
+        MAKE_TARGET='check'
       fi
     fi
   fi

diff --git a/configure.ac b/configure.ac
index 45ee0e7ed2244e5122f866617abbf4c3eccfa283..6f768b152f1995917e74f0d35a29378bb3e2b13d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,9 @@ LT_INIT
 LT_LANG([C++])
 LT_LIB_M
 
+AC_PROG_CC_C99
+AS_IF([test "x${ac_cv_prog_cc_c99}" == "xno"],[AC_MSG_ERROR([No c99 compatible compiler found])])
+
 AX_ASSERT
 
 AX_PLATFORM

diff --git a/m4/ax_uuid.m4 b/m4/ax_uuid.m4
index 93c5f89f2367791683bccd039df80f09677a045f..293fdfc58a06c39a5a9f75fa2d8debc9176d7acc 100644 (file)
--- a/m4/ax_uuid.m4
+++ b/m4/ax_uuid.m4
@@ -6,22 +6,23 @@
 # SYNOPSIS
 #
 #   AX_UUID()
+#   AX_UUID_GENERATE_TIME()
 #   AX_UUID_GENERATE_TIME_SAFE()
 #
 # DESCRIPTION
 #
-#   Check for uuid, and uuid_generate_time_safe support.
+#   Check for uuid, uuid_generate_time, and uuid_generate_time_safe support.
 #
 # LICENSE
 #
-#   Copyright (c) 2012 Brian Aker <brian@tangent.org>
+#   Copyright (c) 2012-2013 Brian Aker <brian@tangent.org>
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 6
+#serial 7
 
 AC_DEFUN([AX_UUID],
     [AC_PREREQ([2.63])dnl
@@ -72,6 +73,31 @@ AC_DEFUN([AX_UUID],
   AM_CONDITIONAL([HAVE_LIBUUID],[test "x$ax_libuuid" = xyes])
   ])
 
+  AC_DEFUN([AX_UUID_GENERATE_TIME],
+      [AC_PREREQ([2.63])dnl
+      AC_REQUIRE([AX_UUID])dnl
+      AC_CACHE_CHECK([for uuid_generate_time],
+        [ax_cv_uuid_generate_time],
+        [AX_SAVE_FLAGS
+        LIBS="$LIBUUID_LIB $LIBS"
+        AC_LANG_PUSH([C])
+        AC_RUN_IFELSE([
+          AC_LANG_PROGRAM([#include <uuid/uuid.h>],[
+            uuid_t out;
+            uuid_generate_time(out);
+            ])],
+          [ax_cv_uuid_generate_time=yes],
+          [ax_cv_uuid_generate_time=no],
+          [AC_MSG_WARN([test program execution failed])])
+        AC_LANG_POP
+        AX_RESTORE_FLAGS
+        ])
+
+      AS_IF([test "$ax_cv_uuid_generate_time" = yes],
+        [AC_DEFINE([HAVE_UUID_GENERATE_TIME],[1],[Define if uuid_generate_time is present in uuid/uuid.h.])],
+        [AC_DEFINE([HAVE_UUID_GENERATE_TIME],[0],[Define if uuid_generate_time is present in uuid/uuid.h.])])
+      ])
+
   AC_DEFUN([AX_UUID_GENERATE_TIME_SAFE],
       [AC_PREREQ([2.63])dnl
       AC_REQUIRE([AX_UUID])dnl