X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=configure.ac;h=5fcc02442c16191898c484b2fbfbad60b54786ac;hp=34b70ea634be77f852e859128b909c133ddba9db;hb=refs%2Fheads%2Fhvy-plastic-3;hpb=35ef345ecbd13dfdb253ecc3e005e86a27897d56

diff --git a/configure.ac b/configure.ac
index 34b70ea63..5fcc02442 100644
--- 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-2011, 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-2008
+#      Markus Armbruster, 2005-2010
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -37,8 +36,9 @@
 # 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.20], [wolfpack@wolfpackempire.com], [empire])
+AC_PREREQ(2.64)
+AC_INIT([Wolfpack Empire], [4.3.30], [wolfpack@wolfpackempire.com], [empire],
+	[http://www.wolfpackempire.com/])
 AC_CONFIG_SRCDIR([include/combat.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -63,23 +63,16 @@ else revctrl=
 fi
 AC_SUBST(revctrl,$revctrl)
 
+# Not a program, but need to check this early
+MY_WINDOWS_API
+
 
 ### Checks for libraries
 ACX_PTHREAD
+LIBS_util="$LIBS"
+LIBS="$LIBS_SOCKETS $LIBS"
 LIB_SOCKET_NSL
-# TODO merge this into LIB_SOCKET_NSL?
-case "$host_os" in
-*mingw32)
-    LIBS="-lws2_32 $LIBS" ;;
-esac
-
-# TODO turn this into a macro?
-save_LIBS=$LIBS
-AC_SEARCH_LIBS([setupterm], [termlib termcap curses ncurses])
-# FIXME if not found, complain and switch off highlighting
-termlibs=`echo $LIBS | sed s/\`echo $save_LIBS | sed 's/././g'\`'$//'`
-AC_SUBST(termlibs)
-LIBS=$save_LIBS
+LIBS_server="$LIBS"
 
 
 ### Checks for header files
@@ -92,7 +85,7 @@ AC_C_CHAR_UNSIGNED
 
 ### Checks for library functions
 
-AC_CHECK_FUNCS(getaddrinfo)
+AC_CHECK_FUNCS(getaddrinfo getpass)
 MY_FUNC_MAKECONTEXT
 
 
@@ -123,25 +116,30 @@ if test -z "$with_pthread" || test "$with_pthread" = no; then
     if test "$ac_cv_func_makecontext" = yes; then
 	empthread=LWP
     fi
-    case "$host_os" in
-    *mingw32)
-	empthread=Windows ;;
-    esac
+    if test $Windows_API = yes; then
+	empthread=Windows
+    fi
 fi
 if test -z "$empthread"; then
     AC_MSG_ERROR([No usable thread package found])
 fi
 AC_SUBST(empthread)
-AC_MSG_NOTICE([Using $empthread threads])
 case $empthread in
 LWP)	AC_DEFINE([EMPTH_LWP], 1, [Define to use LWP threads]) ;;
 POSIX)	AC_DEFINE([EMPTH_POSIX], 1, [Define to use POSIX threads]) ;;
 Windows) AC_DEFINE([EMPTH_W32], 1, [Define to use Windows threads]) ;;
 esac
 
+MY_WITH_TERMINFO
+LIBS_client="$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
@@ -157,3 +155,10 @@ AC_CONFIG_COMMANDS([stamp-h],
 	touch stamp-h],
 	[revctrl=$revctrl])
 AC_OUTPUT
+
+AC_MSG_NOTICE([])
+AC_MSG_NOTICE([-= Configuration summary =-])
+AC_MSG_NOTICE([Thread package: $empthread])
+AC_MSG_NOTICE([      terminfo: $with_terminfo])
+AC_MSG_NOTICE([    EMPIREHOST: $EMPIREHOST])
+AC_MSG_NOTICE([    EMPIREPORT: $EMPIREPORT])