build: Fix inexact calculation of required materials

[empserver] / configure.ac

diff --git a/configure.ac b/configure.ac
index dfe4ff1b61f4d6e33ede54f2254238fbdd70b1c3..f808945573be528dffe625906662f909ddc7480d 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.33], [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])
 
@@ -68,15 +69,11 @@ MY_WINDOWS_API
 
 
 ### Checks for libraries
-ACX_PTHREAD
-save_LIBS="$LIBS"
+AX_PTHREAD
+LIBS_util="$LIBS"
 LIBS="$LIBS_SOCKETS $LIBS"
-LIB_SOCKET_NSL
+AX_LIB_SOCKET_NSL
 LIBS_server="$LIBS"
-LIBS_client="$LIBS"
-LIBS="$save_LIBS"
-AC_SUBST(LIBS_server)
-AC_SUBST(LIBS_client)
 
 
 ### Checks for header files
@@ -112,7 +109,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
@@ -134,15 +131,16 @@ POSIX)    AC_DEFINE([EMPTH_POSIX], 1, [Define to use POSIX threads]) ;;
 Windows) AC_DEFINE([EMPTH_W32], 1, [Define to use Windows threads]) ;;
 esac
 
-save_LIBS="$LIBS"
-LIBS="$LIBS_client"
 MY_WITH_TERMINFO
 LIBS_client="$LIBS"
-LIBS="$save_LIBS"
 
 
 ### Output
 
+LIBS="$LIBS_util"
+AC_SUBST(LIBS_client)
+AC_SUBST(LIBS_server)
+
 AC_CONFIG_FILES([GNUmakefile])
 AC_CONFIG_COMMANDS([stamp-h],
        [case $revctrl in