Remove two warnings for m4

diff --git a/configure.ac b/configure.ac
index d7b45a32bb2da93ad326a8dcd4caa0fdb0e0cdb4..d54a7d96b551e8342a67ce007ea3a5fea560fe82 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,6 @@ ENABLE_FNV64_HASH
 ENABLE_MEMASLAP
 PROTOCOL_BINARY_TEST
 ENABLE_DEPRECATED
 ENABLE_MEMASLAP
 PROTOCOL_BINARY_TEST
 ENABLE_DEPRECATED

-PANDORA_HAVE_LIBINNODB

 PANDORA_HAVE_SASL
 
 AC_CHECK_FUNCS([alarm])
 PANDORA_HAVE_SASL
 
 AC_CHECK_FUNCS([alarm])

diff --git a/m4/byteorder.m4 b/m4/byteorder.m4
index 324317989470d443acb663e2344cb6bd9107ea1c..7366822bb63586fb4d4a207ad89ba012e372df4c 100644 (file)
--- a/m4/byteorder.m4
+++ b/m4/byteorder.m4
@@ -1,19 +1,19 @@
 AC_DEFUN([DETECT_BYTEORDER],
 AC_DEFUN([DETECT_BYTEORDER],

-[
+    [

     AC_REQUIRE([AC_C_BIGENDIAN])
     AC_REQUIRE([AC_C_BIGENDIAN])

+    AC_LANG_PUSH([C++])

     AC_CACHE_CHECK([for htonll], [ac_cv_have_htonll],
     AC_CACHE_CHECK([for htonll], [ac_cv_have_htonll],

-        [AC_TRY_LINK([
-#include <sys/types.h>
+      [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+          [#include <sys/types.h>

 #include <netinet/in.h>
 #include <inttypes.h>
 #include <netinet/in.h>
 #include <inttypes.h>

-                        ], [
-return htonll(0);
-                        ],
-                        [ ac_cv_have_htonll=yes ],
-                        [ ac_cv_have_htonll=no ])
-        ])
+      ], [ return htonll(0) ])],
+        [ ac_cv_have_htonll=yes ],
+        [ ac_cv_have_htonll=no ])
+      ])
+    AC_LANG_POP()

     AS_IF([test "x$ac_cv_have_htonll" = "xyes"],[
     AS_IF([test "x$ac_cv_have_htonll" = "xyes"],[

-          AC_DEFINE([HAVE_HTONLL], [1], [Have ntohll])])
+      AC_DEFINE([HAVE_HTONLL], [1], [Have ntohll])])

 
     AM_CONDITIONAL([BUILD_BYTEORDER],[test "x$ac_cv_have_htonll" = "xno"])
 
     AM_CONDITIONAL([BUILD_BYTEORDER],[test "x$ac_cv_have_htonll" = "xno"])

-])
+    ])