Simplify configure.ac for faster autotools build.

* Remove ability to disable logging.
* Remove unused `NCURSES_FOUND`.
* Remove checks for stdbool and existence of int types.
  These mostly exist, and if they don't, we'll just fail to compile.
* Remove checks for various functions.
* Add check for `explicit_bzero` and `memset_s`.

1 files changed, 13 insertions, 46 deletions

diff --git a/configure.ac b/configure.ac
index 5681c8ad..13913622 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,6 @@ BUILD_TESTS="yes"
 BUILD_AV="yes"
 BUILD_TESTING="yes"
 
-TOX_LOGGER="no"
-
-NCURSES_FOUND="no"
 LIBCONFIG_FOUND="no"
 WANT_NACL="no"
 ADD_NACL_OBJECTS_TO_PKGCONFIG="yes"
@@ -66,41 +63,26 @@ AC_ARG_ENABLE([randombytes-stir],
     ]
 )
 
-AC_ARG_ENABLE([logging],
-    [AC_HELP_STRING([--enable-logging], [enable logging (default: auto)]) ],
-    [
-        if test "x$enableval" = "xyes"; then
-            TOX_LOGGER="yes"
-
-            AC_DEFINE([MIN_LOGGER_LEVEL], [LOGGER_LEVEL_DEBUG], [Logger_Level value])
-        fi
-    ]
-)
-
 AC_ARG_WITH(log-level,
     AC_HELP_STRING([--with-log-level=LEVEL],
                    [Logger levels: TRACE; DEBUG; INFO; WARNING; ERROR ]),
     [
-        if test "x$TOX_LOGGER" = "xno"; then
-            AC_MSG_WARN([Logging disabled!])
-        else
-            if test "x$withval" = "xTRACE"; then
-                AC_DEFINE([MIN_LOGGER_LEVEL], [LOGGER_LEVEL_TRACE], [Logger_Level value])
+        if test "x$withval" = "xTRACE"; then
+            AC_DEFINE([MIN_LOGGER_LEVEL], [LOGGER_LEVEL_TRACE], [Logger_Level value])
 
-            elif test "x$withval" = "xDEBUG"; then
-                AC_DEFINE([MIN_LOGGER_LEVEL], [LOGGER_LEVEL_DEBUG], [Logger_Level value])
+        elif test "x$withval" = "xDEBUG"; then
+            AC_DEFINE([MIN_LOGGER_LEVEL], [LOGGER_LEVEL_DEBUG], [Logger_Level value])
 
-            elif test "x$withval" = "xINFO"; then
-                AC_DEFINE([MIN_LOGGER_LEVEL], [LOGGER_LEVEL_INFO], [Logger_Level value])
+        elif test "x$withval" = "xINFO"; then
+            AC_DEFINE([MIN_LOGGER_LEVEL], [LOGGER_LEVEL_INFO], [Logger_Level value])
 
-            elif test "x$withval" = "xWARNING"; then
-                AC_DEFINE([MIN_LOGGER_LEVEL], [LOGGER_LEVEL_WARNING], [Logger_Level value])
+        elif test "x$withval" = "xWARNING"; then
+            AC_DEFINE([MIN_LOGGER_LEVEL], [LOGGER_LEVEL_WARNING], [Logger_Level value])
 
-            elif test "x$withval" = "xERROR"; then
-                AC_DEFINE([MIN_LOGGER_LEVEL], [LOGGER_LEVEL_ERROR], [Logger_Level value])
-            else
-                AC_MSG_WARN([Invalid logger level: $withval. Using default 'DEBUG'])
-            fi
+        elif test "x$withval" = "xERROR"; then
+            AC_DEFINE([MIN_LOGGER_LEVEL], [LOGGER_LEVEL_ERROR], [Logger_Level value])
+        else
+            AC_MSG_WARN([Invalid logger level: $withval. Using default 'DEBUG'])
         fi
     ]
 )
@@ -312,7 +294,7 @@ MATH_LDFLAGS="-lm"
 AC_SUBST(MATH_LDFLAGS)
 
 # Checks for libraries.
-
+AC_CHECK_FUNCS([explicit_bzero memset_s])
 PKG_CHECK_MODULES([LIBSODIUM], [libsodium],
     [
         LIBSODIUM_FOUND="yes"
@@ -452,22 +434,7 @@ elif test "x$LIBSODIUM_FOUND" = "xno"; then
     AC_SUBST(LIBSODIUM_CFLAGS)
 fi
 
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_UINT8_T
-AC_C_BIGENDIAN
-
-
 # Checks for library functions.
-AC_FUNC_FORK
-AC_CHECK_FUNCS([gettimeofday memset socket strchr malloc])
 if (test "x$WIN32" != "xyes") && (test "x$MACH" != "xyes") && (test "x${host_os#*openbsd}" = "x$host_os") && (test "x$DISABLE_RT" != "xyes"); then
     AC_CHECK_LIB(rt, clock_gettime,
         [