X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=configure.ac;h=240343238fda14268e8176e24b0b1b2e957f0c30;hp=933bc1ee4b6a5569c688bb1196f74c2234d664d4;hb=refs%2Fheads%2Fchangeling;hpb=ec4004b4d4054dbe06158e24db66c6fbbbb2f6eb

diff --git a/configure.ac b/configure.ac
index 933bc1ee4..240343238 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#   Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
 #                 Ken Stevens, Steve McClure, Markus Armbruster
 #
 #   Empire is free software: you can redistribute it and/or modify
@@ -84,6 +84,8 @@ LIBS="$LIBS_SOCKETS $LIBS"
 AX_LIB_SOCKET_NSL
 LIBS_server="$LIBS"
 MY_WITH_READLINE
+MY_WITH_TERMINFO
+LIBS_client="$LIBS"
 
 
 ### Checks for header files
@@ -122,9 +124,6 @@ dnl -Wswitch-default 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])
 
@@ -222,9 +221,6 @@ 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