configure: Suppress Clang warning on carg()

[empserver] / configure.ac

diff --git a/configure.ac b/configure.ac
index a333e3c0813cd1500baadda44284be7b87fd0ec6..a80a95af70c15c3068715f49264838080dfa35f2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 #
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
-#                            Ken Stevens, Steve McClure
+#   Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#                 Ken Stevens, Steve McClure, Markus Armbruster
 #
-#   This program is free software; you can redistribute it and/or modify
+#   Empire is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
+#   the Free Software Foundation, either version 3 of the License, or
 #   (at your option) any later version.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #   ---
 #
@@ -28,7 +27,7 @@
 #   configure.ac: Autoconf input file
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2005-2009
+#      Markus Armbruster, 2005-2015
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -37,9 +36,11 @@
 # POSIX, and when something breaks on some oddball machine, see
 # whether it's worth fixing.
 
-AC_PREREQ(2.59)
-AC_INIT([Wolfpack Empire], [4.3.22], [wolfpack@wolfpackempire.com], [empire])
+AC_PREREQ(2.64)
+AC_INIT([Wolfpack Empire], [4.3.34], [wolfpack@wolfpackempire.com], [empire],
+       [http://www.wolfpackempire.com/])
 AC_CONFIG_SRCDIR([include/combat.h])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
@@ -49,7 +50,6 @@ AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PROG_CC
-AC_SUBST(GCC)
 AM_PROG_CC_C_O
 # Private automake macro, tsk, tsk, tsk...
 _AM_DEPENDENCIES(CC)
@@ -68,10 +68,10 @@ MY_WINDOWS_API
 
 
 ### Checks for libraries
-ACX_PTHREAD
+AX_PTHREAD
 LIBS_util="$LIBS"
 LIBS="$LIBS_SOCKETS $LIBS"
-LIB_SOCKET_NSL
+AX_LIB_SOCKET_NSL
 LIBS_server="$LIBS"
 
 
@@ -80,7 +80,39 @@ LIBS_server="$LIBS"
 
 ### Checks for typedefs, structures, and compiler characteristics
 
-AC_C_CHAR_UNSIGNED
+# Enable useful warnings
+# Some of them are commented out because the code needs cleanup first
+# Clang needs to be tested with -Werror=unknown-warning-option
+AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],
+[cflags_test="-Werror=unknown-warning-option"],
+[cflags_test=""])
+MY_APPEND_COMPILE_FLAGS([-Wall -Wextra dnl
+dnl -Wcast-align dnl
+dnl -Wconversion dnl
+-Wdeclaration-after-statement dnl
+dnl -Wformat-nonliteral dnl
+-Wformat-security dnl
+-Winit-self dnl
+-Wlogical-op dnl
+-Wmissing-prototypes dnl
+-Wnested-externs dnl
+-Wold-style-definition dnl
+-Wpacked dnl
+-Wpointer-arith dnl
+-Wredundant-decls dnl
+dnl -Wshadow dnl
+-Wstrict-prototypes dnl
+dnl too prone to false positives: -Wsuggest-attribute=format dnl
+dnl -Wswitch-default dnl
+-Wundef dnl
+-Wno-unused-parameter dnl
+], [], [$cflags_test])
+
+# Our carg() conflicts with libm's TODO clean that up
+MY_APPEND_COMPILE_FLAGS([-fno-builtin-carg -Wno-incompatible-library-redeclaration])
+
+# No multiple definitions of uninitialized global variables
+MY_APPEND_COMPILE_FLAGS([-fno-common])
 
 
 ### Checks for library functions
@@ -108,7 +140,7 @@ AC_ARG_WITH([pthread],
 # Select thread package
 empthread=
 if test "$with_pthread" != no; then
-    if test "$acx_pthread_ok" = yes; then
+    if test "$ax_pthread_ok" = yes; then
        empthread=POSIX
     fi
 fi