Remove dead pandora files.

[awesomized/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index dc7b8ca70bda407e7a38169f07a26e8e07a0ee95..98c29e89c3c2ffe0a72dd3eb37ac43f3c01a873b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,10 @@ AC_SUBST(HASHKIT_LIBRARY_VERSION)
 LT_PREREQ([2.2])
 LT_INIT
 LT_LANG([C++])
 LT_PREREQ([2.2])
 LT_INIT
 LT_LANG([C++])

+
+AX_PLATFORM
+

 gl_VISIBILITY
 gl_VISIBILITY

-PANDORA_PLATFORM

 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AX_CXX_HEADER_STDCXX_98
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AX_CXX_HEADER_STDCXX_98


@@ -177,6 +179,7 @@ AC_C_RESTRICT
 AX_CXX_GCC_ABI_DEMANGLE
 
 AX_SASL_CHECK
 AX_CXX_GCC_ABI_DEMANGLE
 
 AX_SASL_CHECK

+AX_LIBEVENT

 
 dnl
 dnl The sasl functions should only be visible if we build with sasl support
 
 dnl
 dnl The sasl functions should only be visible if we build with sasl support


@@ -195,12 +198,12 @@ AC_CHECK_LIB([rt], [clock_gettime], [
               ])
 
 # Check for the ability to call dlopen
               ])
 
 # Check for the ability to call dlopen

-AC_CHECK_LIB([dl], [dlopen],[
+AC_CHECK_LIB([dl], [dlopen], [

               DL_LIB="-ldl"
               DL_LIB="-ldl"

-              AC_SUBST(DL_LIB)
-              AC_DEFINE([HAVE_LIBDL], [ 1 ], [Have dlopen])
+              AC_SUBST([DL_LIB])
+              AC_DEFINE([HAVE_LIBDL],[1],[Have dlopen])

               ],[
               ],[

-                 AC_DEFINE([HAVE_LIBDL], [ 0 ], [Have dlopen])
+                 AC_DEFINE([HAVE_LIBDL], [0], [Have dlopen])

                  ])
 
 AC_CHECK_LIB([m], [floor])
                  ])
 
 AC_CHECK_LIB([m], [floor])


@@ -208,8 +211,8 @@ AC_CHECK_FUNCS([sigignore])
 
 AC_CHECK_HEADERS([atomic.h])
 AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[
 
 AC_CHECK_HEADERS([atomic.h])
 AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[

-      AC_CHECK_FUNCS(atomic_add_64)
-      AC_CHECK_FUNCS(atomic_add_32)
+      AC_CHECK_FUNCS([atomic_add_64])
+      AC_CHECK_FUNCS([atomic_add_32])

       AS_IF([test "x$ac_cv_func_atomic_add_64" = "xyes" -a "x$ac_cv_func_atomic_add_32" = "xyes"],[
             AC_DEFINE([USE_ATOMIC_H],
                      [1],
       AS_IF([test "x$ac_cv_func_atomic_add_64" = "xyes" -a "x$ac_cv_func_atomic_add_32" = "xyes"],[
             AC_DEFINE([USE_ATOMIC_H],
                      [1],


@@ -231,8 +234,8 @@ dnl If you want to add support for other platforms you should check for
 dnl your requirements, define HAVE_DROP_PRIVILEGES, and make sure you add
 dnl the source file containing the implementation into memcached_SOURCE
 dnl in Makefile.am
 dnl your requirements, define HAVE_DROP_PRIVILEGES, and make sure you add
 dnl the source file containing the implementation into memcached_SOURCE
 dnl in Makefile.am

-AC_CHECK_FUNCS(setppriv, [
-   AC_CHECK_HEADER(priv.h, [
+AC_CHECK_FUNCS([setppriv], [
+   AC_CHECK_HEADER([priv.h], [

       AC_DEFINE([HAVE_DROP_PRIVILEGES], 1,
          [Define this if you have an implementation of drop_privileges()])
       build_solaris_privs=yes
       AC_DEFINE([HAVE_DROP_PRIVILEGES], 1,
          [Define this if you have an implementation of drop_privileges()])
       build_solaris_privs=yes


@@ -249,11 +252,6 @@ AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes",
       ])
 SOCKET_SEND_FLAGS
 
       ])
 SOCKET_SEND_FLAGS
 

-AX_CHECK_LIBRARY([LIBEVENT], [event.h], [event], 
-                 [LIBEVENT_LDFLAGS="-levent"],
-                 [AC_MSG_WARN([Unable to find libevent])])
-AM_CONDITIONAL(HAVE_LIBEVENT, test "x${ax_cv_have_LIBEVENT}" = "xyes")
-

 AX_UUID_GENERATE_TIME_SAFE
 
 
 AX_UUID_GENERATE_TIME_SAFE
 
 


@@ -267,6 +265,8 @@ AX_ASSERT
 AX_CXX_COMPILER_VERSION
 AX_HARDEN_COMPILER_FLAGS
 
 AX_CXX_COMPILER_VERSION
 AX_HARDEN_COMPILER_FLAGS
 

+AX_AM_JOBSERVER([yes])
+

 AC_CONFIG_FILES([
   Makefile
   docs/conf.py
 AC_CONFIG_FILES([
   Makefile
   docs/conf.py


@@ -290,8 +290,8 @@ echo "   * C Flags:                   $CFLAGS"
 echo "   * C++ Compiler:              $CXX_VERSION"
 echo "   * C++ Flags:                 $CXXFLAGS"
 echo "   * CPP Flags:                 $CPPFLAGS"
 echo "   * C++ Compiler:              $CXX_VERSION"
 echo "   * C++ Flags:                 $CXXFLAGS"
 echo "   * CPP Flags:                 $CPPFLAGS"

-echo "   * Assertions enabled:        $ac_cv_assert"
-echo "   * Debug enabled:             $with_debug"
+echo "   * Assertions enabled:        $ax_enable_assert"
+echo "   * Debug enabled:             $ax_enable_debug"

 echo "   * Warnings as failure:       $ac_cv_warnings_as_errors"
 echo "   * SASL support:              $ac_enable_sasl"
 echo ""
 echo "   * Warnings as failure:       $ac_cv_warnings_as_errors"
 echo "   * SASL support:              $ac_enable_sasl"
 echo ""