diff -uX freeciv/diff_ignore freeciv/autogen.sh freeciv-dunno/autogen.sh --- freeciv/autogen.sh Mon May 6 21:58:20 2002 +++ freeciv-dunno/autogen.sh Tue May 7 00:36:35 2002 @@ -102,10 +102,13 @@ } # We need to move configure.in out of the way in case we have autoconf > 2.13 -# since that would cause lots of spurious warnings +# since that would cause lots of spurious warnings. Same goes for acconfig.h test -f configure.in && { mv configure.in configure.old } +test -f acconfig.h && { + mv acconfig.h acconfig.old +} # x.252 is autoconf 2.52 compatible version of this macro, while x.213 is # the original autoconf 2.13 version; we must suppose 2.52 by default here @@ -113,6 +116,7 @@ version_check 0 "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || { mv configure.old configure.in + mv acconfig.old acconfig.h cp m4/x.213 m4/x.m4 version_check 1 "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 13 || DIE=1 } diff -uX freeciv/diff_ignore freeciv/configure.ac freeciv-dunno/configure.ac --- freeciv/configure.ac Mon May 6 23:28:59 2002 +++ freeciv-dunno/configure.ac Tue May 7 00:33:52 2002 @@ -23,17 +23,17 @@ dnl Similar to following are already done by AM_INIT_AUTOMAKE: dnl (but different in terms of producing quoted vs bare strings) -dnl AC_DEFINE_UNQUOTED(PACKAGE, $PACKAGE) -dnl AC_DEFINE_UNQUOTED(VERSION, $VERSION) +dnl AC_DEFINE_UNQUOTED(PACKAGE, $PACKAGE, [Package name]) +dnl AC_DEFINE_UNQUOTED(VERSION, $VERSION, [Version number]) dnl AC_SUBST(VERSION) -AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION) -AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION) -AC_DEFINE_UNQUOTED(PATCH_VERSION, $PATCH_VERSION) -AC_DEFINE_UNQUOTED(VERSION_LABEL, "${VERSION_LABEL}") -AC_DEFINE_UNQUOTED(VERSION_STRING, "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL}") -AC_DEFINE_UNQUOTED(IS_DEVEL_VERSION, $IS_DEVEL_VERSION) -AC_DEFINE_UNQUOTED(IS_BETA_VERSION, $IS_BETA_VERSION) +AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION, [Major version]) +AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION, [Minor version]) +AC_DEFINE_UNQUOTED(PATCH_VERSION, $PATCH_VERSION, [Patch version]) +AC_DEFINE_UNQUOTED(VERSION_LABEL, "${VERSION_LABEL}", [Version label]) +AC_DEFINE_UNQUOTED(VERSION_STRING, "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL}", [Version string]) +AC_DEFINE_UNQUOTED(IS_DEVEL_VERSION, $IS_DEVEL_VERSION, [Is this a devel version]) +AC_DEFINE_UNQUOTED(IS_BETA_VERSION, $IS_BETA_VERSION, [Is this a beta veersion]) dnl Initialize automake stuff AM_INIT_AUTOMAKE($PACKAGE, $VERSION) @@ -261,7 +261,7 @@ dnl note this has to match the path installed by po/Makefile FC_EXPAND_DIR(LOCALEDIR, '${prefix}/share/locale') -AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR") +AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [Locale directory]) if test -n "$GCC"; then CFLAGS="$CFLAGS -Wall" @@ -278,7 +278,7 @@ dnl BeOS-specific settings if test x`$UNAME -s` = xBeOS ; then - AC_DEFINE(SOCKET_ZERO_ISNT_STDIN) + AC_DEFINE(SOCKET_ZERO_ISNT_STDIN, 1, [BeOS-specific setting]) CFLAGS="$CFLAGS -Wno-multichar" LDFLAGS="$LDFLAGS -x none" if test x$enable_debug = xyes ; then @@ -297,10 +297,10 @@ esac if test x"$MINGW32" = "xyes"; then - AC_DEFINE(SOCKET_ZERO_ISNT_STDIN) - AC_DEFINE(ALWAYS_ROOT) - AC_DEFINE(WIN32_NATIVE) - AC_DEFINE(HAVE_WINSOCK) + AC_DEFINE(SOCKET_ZERO_ISNT_STDIN, 1, [Mingw32-specific setting - stdin]) + AC_DEFINE(ALWAYS_ROOT, 1, [Mingw32-specific setting - root]) + AC_DEFINE(WIN32_NATIVE, 1, [Mingw32-specific setting - native]) + AC_DEFINE(HAVE_WINSOCK, 1, [Mingw32-specific setting - winsock]) SERVER_LIBS="-lwsock32" CFLAGS="$CFLAGS -fnative-struct" fi @@ -363,11 +363,11 @@ dnl Determine the Xfuncproto control definitions: FC_CHECK_X_PROTO_DEFINE(FUNCPROTO) if test -n "$fc_x_proto_value"; then - AC_DEFINE_UNQUOTED(FUNCPROTO, $fc_x_proto_value) + AC_DEFINE_UNQUOTED(FUNCPROTO, $fc_x_proto_value, [Xfuncproto]) fi FC_CHECK_X_PROTO_DEFINE(NARROWPROTO) if test -n "$fc_x_proto_value"; then - AC_DEFINE_UNQUOTED(NARROWPROTO, $fc_x_proto_value) + AC_DEFINE_UNQUOTED(NARROWPROTO, $fc_x_proto_value, [Narrowproto]) fi dnl Try to get additional Xpm paths: @@ -386,7 +386,7 @@ fi dnl Some sites may put xpm.h in a directory whose parent isn't "X11" if test "x$xpm_h_no_x11" = "xyes"; then - AC_DEFINE(XPM_H_NO_X11) + AC_DEFINE(XPM_H_NO_X11, 1, [XPM support]) fi fi @@ -490,7 +490,7 @@ if test "x$ESD" != "xno"; then SOUND_CFLAGS="$SOUND_CFLAGS $ESD_CFLAGS" SOUND_LIBS="$SOUND_LIBS $ESD_LIBS" - AC_DEFINE(ESD) + AC_DEFINE(ESD, 1, [Esound support]) AC_MSG_CHECKING(building ESOUND support) AC_MSG_RESULT(yes) fi @@ -506,7 +506,7 @@ if test "x$SDL_mixer" = "xyes"; then SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS" SOUND_LIBS="$SOUND_LIBS $SDL_LIBS -lSDL_mixer" - AC_DEFINE(SDL) + AC_DEFINE(SDL, 1, [SDL_Mixer support]) AC_MSG_RESULT(yes) else AC_MSG_RESULT([no, found header but not library!]) @@ -519,7 +519,7 @@ dnl Add WinMM sound support to client if test x"$MINGW32" = "xyes"; then SOUND_LIBS="$SOUND_LIBS -lwinmm" - AC_DEFINE(WINMM) + AC_DEFINE(WINMM, 1, [Windows MultiMedia sound support]) WINMM="yes" fi @@ -603,7 +603,7 @@ have_readline_lib=1, have_readline_lib=0) if test "$have_readline_lib" = "1"; then SERVER_LIBS="-lreadline $SERVER_LIBS $HAVE_TERMCAP" - AC_DEFINE_UNQUOTED(HAVE_LIBREADLINE) + AC_DEFINE_UNQUOTED(HAVE_LIBREADLINE, 1, [Readline support]) else if test "$WITH_READLINE" = "yes"; then AC_MSG_ERROR(Specified --with-readline but the @@ -701,26 +701,26 @@ dnl (if fcntl or ioctl exists) AC_CHECK_FUNC(fcntl, - [AC_DEFINE(HAVE_FCNTL) - AC_DEFINE(NONBLOCKING_SOCKETS)], + [AC_DEFINE(HAVE_FCNTL, 1, [fcntl support]) + AC_DEFINE(NONBLOCKING_SOCKETS, 1, [nonblocking sockets support])], [AC_CHECK_FUNC(ioctl, - [AC_DEFINE(HAVE_IOCTL) - AC_DEFINE(NONBLOCKING_SOCKETS)])]) + [AC_DEFINE(HAVE_IOCTL, 1, [ioctl support]) + AC_DEFINE(NONBLOCKING_SOCKETS, 1, [nonblocking sockets support])])]) dnl Checks if SIGPIPE is usable AC_MSG_CHECKING([for SIGPIPE]) AC_TRY_COMPILE([#include ],[signal (SIGPIPE, SIG_IGN)], [AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SIGPIPE)], + AC_DEFINE(HAVE_SIGPIPE, 1, [sigpipe support])], [AC_MSG_RESULT([no])]) dnl export where the datadir is going to be installed FC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv") if test x"$MINGW32" = xyes; then - AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".;data;~/.freeciv;$FREECIV_DATADIR") + AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".;data;~/.freeciv;$FREECIV_DATADIR", [Mingw32-specific path]) else - AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".:data:~/.freeciv:$FREECIV_DATADIR") + AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".:data:~/.freeciv:$FREECIV_DATADIR", [Freeciv data path]) fi dnl This has to be last library