From d8887ef5bfd61246545e43ac9b4a354eab81d1cc Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Sun, 12 Feb 2012 10:59:52 -0800
Subject: [PATCH] Remove two warnings for m4

---
 configure.ac    |  1 -
 m4/byteorder.m4 | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index d7b45a32..d54a7d96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,6 @@ ENABLE_FNV64_HASH
 ENABLE_MEMASLAP
 PROTOCOL_BINARY_TEST
 ENABLE_DEPRECATED
-PANDORA_HAVE_LIBINNODB
 PANDORA_HAVE_SASL
 
 AC_CHECK_FUNCS([alarm])
diff --git a/m4/byteorder.m4 b/m4/byteorder.m4
index 32431798..7366822b 100644
--- a/m4/byteorder.m4
+++ b/m4/byteorder.m4
@@ -1,19 +1,19 @@
 AC_DEFUN([DETECT_BYTEORDER],
-[
+    [
     AC_REQUIRE([AC_C_BIGENDIAN])
+    AC_LANG_PUSH([C++])
     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>
-                        ], [
-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"],[
-          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"])
-])
+    ])
-- 
2.30.2