X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=e1b82ba6ac032fcaf61aea50a9a356c6b50a2b93;hb=9b13e23dc5a1c11b93cefc9f188cf459af68bede;hp=48e81d0241459a4dcffb32a57ae07edd3c207663;hpb=558dbc482b4285c064b15b7d6889a7e2860c96f2;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 48e81d02..e1b82ba6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,14 +185,7 @@ AS_IF([test "x$ac_enable_sasl" = "xyes"], [
            ])
 AC_SUBST(LIBMEMCACHED_WITH_SASL_SUPPORT)
 
-AX_CHECK_LIBRARY([LIBUUID], [uuid/uuid.h], [uuid], 
-                 [
-                  LIBUUID_LDFLAGS="-luuid"
-                  AC_DEFINE([HAVE_LIBUUID], [ 1 ], [Have libuuid])
-                  ],
-                 [
-                  AC_DEFINE([HAVE_LIBUUID], [ 0 ], [Have libuuid])
-                  ])
+AX_UUID_GENERATE_TIME_SAFE
 
 AC_CHECK_LIB([rt], [clock_gettime], 
              [
@@ -288,7 +281,7 @@ AX_CHECK_SOCK_CLOEXEC([AC_DEFINE([HAVE_SOCK_CLOEXEC], [1], [Check for SOCK_CLOEX
 
 AX_PTHREAD(, [AC_MSG_ERROR(could not find libpthread)])
 
-AX_HARDEN_COMPILER_FLAGS
+AX_HARDEN_CC_COMPILER_FLAGS
 
 AX_DEBUG
 
@@ -313,8 +306,8 @@ echo "   * System type:               $host_vendor-$host_os"
 echo "   * Host CPU:                  $host_cpu"
 echo "   * C Compiler:                $CC_VERSION"
 echo "   * C Flags:                   $CFLAGS"
-echo "   * C++ Compiler:              $CXX"
-echo "   * C++ Flags:                 $CXX_VERSION"
+echo "   * C++ Compiler:              $CXX_VERSION"
+echo "   * C++ Flags:                 $CXXFLAGS"
 echo "   * CPP Flags:                 $CPPFLAGS"
 echo "   * Assertions enabled:        $ac_cv_assert"
 echo "   * Debug enabled:             $with_debug"