? stamp-h.in
? po
Index: Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/Makefile.am,v
retrieving revision 1.3
diff -r1.3 Makefile.am
3c3,6
< SUBDIRS= data common ai client server
---
> PACKAGE = @PACKAGE@
> VERSION = @VERSION@
>
> SUBDIRS= intl @BASEDIRS@ po
7c10
< NEWS README README.AI \
---
> NEWS README README.AI ABOUT-NLS \
Index: acconfig.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/acconfig.h,v
retrieving revision 1.1
diff -r1.1 acconfig.h
3d2
< * by Falk Hüffner <falk.hueffner@xxxxxxxxxxxxxxxxxxxxxxxx>
5,7d3
< @TOP@
< /* Define to the name of the distribution. */
< #undef PACKAGE
9c5
< /* Define to the version of the distribution. */
---
> #undef PACKAGE
10a7,23
> #undef MAJOR_VERSION
> #undef MINOR_VERSION
> #undef PATCH_VERSION
> #undef VERSION_STRING
>
> /* Define if you want to build the GTK front-end */
> #undef BUILD_GTK
>
> /* Define if you want to build the X Athena front-end */
> #undef BUILD_XAW
>
> #undef LOCALEDIR
> #undef ENABLE_NLS
> #undef HAVE_CATGETS
> #undef HAVE_GETTEXT
> #undef HAVE_LC_MESSAGES
> #undef HAVE_STPCPY
Index: aclocal.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/aclocal.m4,v
retrieving revision 1.2
diff -r1.2 aclocal.m4
12a13,35
> # Like AC_CONFIG_HEADER, but automatically create stamp file.
>
> AC_DEFUN(AM_CONFIG_HEADER,
> [AC_PREREQ([2.12])
> AC_CONFIG_HEADER([$1])
> dnl When config.status generates a header, we must update the stamp-h file.
> dnl This file resides in the same directory as the config header
> dnl that is generated. We must strip everything past the first ":",
> dnl and everything past the last "/".
> AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
> ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
> <<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
> <<am_indx=1
> for am_file in <<$1>>; do
> case " <<$>>CONFIG_HEADERS " in
> *" <<$>>am_file "*<<)>>
> echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
> ;;
> esac
> am_indx=`expr "<<$>>am_indx" + 1`
> done<<>>dnl>>)
> changequote([,]))])
>
112a136,519
>
> # Macro to add for using GNU gettext.
> # Ulrich Drepper <drepper@xxxxxxxxxx>, 1995.
> #
> # This file can be copied and used freely without restrictions. It can
> # be used in projects which are not available under the GNU Public License
> # but which still want to provide support for the GNU gettext functionality.
> # Please note that the actual code is *not* freely available.
>
> # serial 5
>
> AC_DEFUN(AM_WITH_NLS,
> [AC_MSG_CHECKING([whether NLS is requested])
> dnl Default is enabled NLS
> AC_ARG_ENABLE(nls,
> [ --disable-nls do not use Native Language Support],
> USE_NLS=$enableval, USE_NLS=yes)
> AC_MSG_RESULT($USE_NLS)
> AC_SUBST(USE_NLS)
>
> USE_INCLUDED_LIBINTL=no
>
> dnl If we use NLS figure out what method
> if test "$USE_NLS" = "yes"; then
> AC_DEFINE(ENABLE_NLS)
> AC_MSG_CHECKING([whether included gettext is requested])
> AC_ARG_WITH(included-gettext,
> [ --with-included-gettext use the GNU gettext library included here],
> nls_cv_force_use_gnu_gettext=$withval,
> nls_cv_force_use_gnu_gettext=no)
> AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
>
> nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
> if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
> dnl User does not insist on using GNU NLS library. Figure out what
> dnl to use. If gettext or catgets are available (in this order) we
> dnl use this. Else we have to fall back to GNU NLS library.
> dnl catgets is only used if permitted by option --with-catgets.
> nls_cv_header_intl=
> nls_cv_header_libgt=
> CATOBJEXT=NONE
>
> AC_CHECK_HEADER(libintl.h,
> [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
> [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
> gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
>
> if test "$gt_cv_func_gettext_libc" != "yes"; then
> AC_CHECK_LIB(intl, bindtextdomain,
> [AC_CACHE_CHECK([for gettext in libintl],
> gt_cv_func_gettext_libintl,
> [AC_CHECK_LIB(intl, gettext,
> gt_cv_func_gettext_libintl=yes,
> gt_cv_func_gettext_libintl=no)],
> gt_cv_func_gettext_libintl=no)])
> fi
>
> if test "$gt_cv_func_gettext_libc" = "yes" \
> || test "$gt_cv_func_gettext_libintl" = "yes"; then
> AC_DEFINE(HAVE_GETTEXT)
> AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
> [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
> if test "$MSGFMT" != "no"; then
> AC_CHECK_FUNCS(dcgettext)
> AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
> AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
> [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
> AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
> return _nl_msg_cat_cntr],
> [CATOBJEXT=.gmo
> DATADIRNAME=share],
> [CATOBJEXT=.mo
> DATADIRNAME=lib])
> INSTOBJEXT=.mo
> fi
> fi
> ])
>
> if test "$CATOBJEXT" = "NONE"; then
> AC_MSG_CHECKING([whether catgets can be used])
> AC_ARG_WITH(catgets,
> [ --with-catgets use catgets functions if available],
> nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
> AC_MSG_RESULT($nls_cv_use_catgets)
>
> if test "$nls_cv_use_catgets" = "yes"; then
> dnl No gettext in C library. Try catgets next.
> AC_CHECK_LIB(i, main)
> AC_CHECK_FUNC(catgets,
> [AC_DEFINE(HAVE_CATGETS)
> INTLOBJS="\$(CATOBJS)"
> AC_PATH_PROG(GENCAT, gencat, no)dnl
> if test "$GENCAT" != "no"; then
> AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
> if test "$GMSGFMT" = "no"; then
> AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
> [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
> fi
> AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
> [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
> USE_INCLUDED_LIBINTL=yes
> CATOBJEXT=.cat
> INSTOBJEXT=.cat
> DATADIRNAME=lib
> INTLDEPS='$(top_builddir)/intl/libintl.a'
> INTLLIBS=$INTLDEPS
> LIBS=`echo $LIBS | sed -e 's/-lintl//'`
> nls_cv_header_intl=intl/libintl.h
> nls_cv_header_libgt=intl/libgettext.h
> fi])
> fi
> fi
>
> if test "$CATOBJEXT" = "NONE"; then
> dnl Neither gettext nor catgets in included in the C library.
> dnl Fall back on GNU gettext library.
> nls_cv_use_gnu_gettext=yes
> fi
> fi
>
> if test "$nls_cv_use_gnu_gettext" = "yes"; then
> dnl Mark actions used to generate GNU NLS library.
> INTLOBJS="\$(GETTOBJS)"
> AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
> [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
> AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
> AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
> [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
> AC_SUBST(MSGFMT)
> USE_INCLUDED_LIBINTL=yes
> CATOBJEXT=.gmo
> INSTOBJEXT=.mo
> DATADIRNAME=share
> INTLDEPS='$(top_builddir)/intl/libintl.a'
> INTLLIBS=$INTLDEPS
> LIBS=`echo $LIBS | sed -e 's/-lintl//'`
> nls_cv_header_intl=intl/libintl.h
> nls_cv_header_libgt=intl/libgettext.h
> fi
>
> dnl Test whether we really found GNU xgettext.
> if test "$XGETTEXT" != ":"; then
> dnl If it is no GNU xgettext we define it as : so that the
> dnl Makefiles still can work.
> if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
> : ;
> else
> AC_MSG_RESULT(
> [found xgettext program is not GNU xgettext; ignore it])
> XGETTEXT=":"
> fi
> fi
>
> # We need to process the po/ directory.
> POSUB=po
> else
> DATADIRNAME=share
> nls_cv_header_intl=intl/libintl.h
> nls_cv_header_libgt=intl/libgettext.h
> fi
> AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
> AC_OUTPUT_COMMANDS(
> [case "$CONFIG_FILES" in *po/Makefile.in*)
> sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
> esac])
>
>
> # If this is used in GNU gettext we have to set USE_NLS to `yes'
> # because some of the sources are only built for this goal.
> if test "$PACKAGE" = gettext; then
> USE_NLS=yes
> USE_INCLUDED_LIBINTL=yes
> fi
>
> dnl These rules are solely for the distribution goal. While doing this
> dnl we only have to keep exactly one list of the available catalogs
> dnl in configure.in.
> for lang in $ALL_LINGUAS; do
> GMOFILES="$GMOFILES $lang.gmo"
> POFILES="$POFILES $lang.po"
> done
>
> dnl Make all variables we use known to autoconf.
> AC_SUBST(USE_INCLUDED_LIBINTL)
> AC_SUBST(CATALOGS)
> AC_SUBST(CATOBJEXT)
> AC_SUBST(DATADIRNAME)
> AC_SUBST(GMOFILES)
> AC_SUBST(INSTOBJEXT)
> AC_SUBST(INTLDEPS)
> AC_SUBST(INTLLIBS)
> AC_SUBST(INTLOBJS)
> AC_SUBST(POFILES)
> AC_SUBST(POSUB)
> ])
>
> AC_DEFUN(AM_GNU_GETTEXT,
> [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
> AC_REQUIRE([AC_PROG_CC])dnl
> AC_REQUIRE([AC_PROG_RANLIB])dnl
> AC_REQUIRE([AC_ISC_POSIX])dnl
> AC_REQUIRE([AC_HEADER_STDC])dnl
> AC_REQUIRE([AC_C_CONST])dnl
> AC_REQUIRE([AC_C_INLINE])dnl
> AC_REQUIRE([AC_TYPE_OFF_T])dnl
> AC_REQUIRE([AC_TYPE_SIZE_T])dnl
> AC_REQUIRE([AC_FUNC_ALLOCA])dnl
> AC_REQUIRE([AC_FUNC_MMAP])dnl
>
> AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
> unistd.h sys/param.h])
> AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
> strdup __argz_count __argz_stringify __argz_next])
>
> if test "${ac_cv_func_stpcpy+set}" != "set"; then
> AC_CHECK_FUNCS(stpcpy)
> fi
> if test "${ac_cv_func_stpcpy}" = "yes"; then
> AC_DEFINE(HAVE_STPCPY)
> fi
>
> AM_LC_MESSAGES
> AM_WITH_NLS
>
> if test "x$CATOBJEXT" != "x"; then
> if test "x$ALL_LINGUAS" = "x"; then
> LINGUAS=
> else
> AC_MSG_CHECKING(for catalogs to be installed)
> NEW_LINGUAS=
> for lang in ${LINGUAS=$ALL_LINGUAS}; do
> case "$ALL_LINGUAS" in
> *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
> esac
> done
> LINGUAS=$NEW_LINGUAS
> AC_MSG_RESULT($LINGUAS)
> fi
>
> dnl Construct list of names of catalog files to be constructed.
> if test -n "$LINGUAS"; then
> for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
> fi
> fi
>
> dnl The reference to <locale.h> in the installed <libintl.h> file
> dnl must be resolved because we cannot expect the users of this
> dnl to define HAVE_LOCALE_H.
> if test $ac_cv_header_locale_h = yes; then
> INCLUDE_LOCALE_H="#include <locale.h>"
> else
> INCLUDE_LOCALE_H="\
> /* The system does not provide the header <locale.h>. Take care yourself. */"
> fi
> AC_SUBST(INCLUDE_LOCALE_H)
>
> dnl Determine which catalog format we have (if any is needed)
> dnl For now we know about two different formats:
> dnl Linux libc-5 and the normal X/Open format
> test -d intl || mkdir intl
> if test "$CATOBJEXT" = ".cat"; then
> AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
>
> dnl Transform the SED scripts while copying because some dumb SEDs
> dnl cannot handle comments.
> sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
> fi
> dnl po2tbl.sed is always needed.
> sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
> $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
>
> dnl In the intl/Makefile.in we have a special dependency which makes
> dnl only sense for gettext. We comment this out for non-gettext
> dnl packages.
> if test "$PACKAGE" = "gettext"; then
> GT_NO="#NO#"
> GT_YES=
> else
> GT_NO=
> GT_YES="#YES#"
> fi
> AC_SUBST(GT_NO)
> AC_SUBST(GT_YES)
>
> dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
> dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
> dnl Try to locate is.
> MKINSTALLDIRS=
> if test -n "$ac_aux_dir"; then
> MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
> fi
> if test -z "$MKINSTALLDIRS"; then
> MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
> fi
> AC_SUBST(MKINSTALLDIRS)
>
> dnl *** For now the libtool support in intl/Makefile is not for real.
> l=
> AC_SUBST(l)
>
> dnl Generate list of files to be processed by xgettext which will
> dnl be included in po/Makefile.
> test -d po || mkdir po
> if test "x$srcdir" != "x."; then
> if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
> posrcprefix="$srcdir/"
> else
> posrcprefix="../$srcdir/"
> fi
> else
> posrcprefix="../"
> fi
> rm -f po/POTFILES
> sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
> < $srcdir/po/POTFILES.in > po/POTFILES
> ])
>
> # Search path for a program which passes the given test.
> # Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
> #
> # This file can be copied and used freely without restrictions. It can
> # be used in projects which are not available under the GNU Public License
> # but which still want to provide support for the GNU gettext functionality.
> # Please note that the actual code is *not* freely available.
>
> # serial 1
>
> dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
> dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
> AC_DEFUN(AM_PATH_PROG_WITH_TEST,
> [# Extract the first word of "$2", so it can be a program name with args.
> set dummy $2; ac_word=[$]2
> AC_MSG_CHECKING([for $ac_word])
> AC_CACHE_VAL(ac_cv_path_$1,
> [case "[$]$1" in
> /*)
> ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
> ;;
> *)
> IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
> for ac_dir in ifelse([$5], , $PATH, [$5]); do
> test -z "$ac_dir" && ac_dir=.
> if test -f $ac_dir/$ac_word; then
> if [$3]; then
> ac_cv_path_$1="$ac_dir/$ac_word"
> break
> fi
> fi
> done
> IFS="$ac_save_ifs"
> dnl If no 4th arg is given, leave the cache variable unset,
> dnl so AC_PATH_PROGS will keep looking.
> ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
> ])dnl
> ;;
> esac])dnl
> $1="$ac_cv_path_$1"
> if test -n "[$]$1"; then
> AC_MSG_RESULT([$]$1)
> else
> AC_MSG_RESULT(no)
> fi
> AC_SUBST($1)dnl
> ])
>
> # Check whether LC_MESSAGES is available in <locale.h>.
> # Ulrich Drepper <drepper@xxxxxxxxxx>, 1995.
> #
> # This file can be copied and used freely without restrictions. It can
> # be used in projects which are not available under the GNU Public License
> # but which still want to provide support for the GNU gettext functionality.
> # Please note that the actual code is *not* freely available.
>
> # serial 1
>
> AC_DEFUN(AM_LC_MESSAGES,
> [if test $ac_cv_header_locale_h = yes; then
> AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
> [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
> am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
> if test $am_cv_val_LC_MESSAGES = yes; then
> AC_DEFINE(HAVE_LC_MESSAGES)
> fi
> fi])
Index: configure.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.in,v
retrieving revision 1.16
diff -r1.16 configure.in
6c6,11
< AM_INIT_AUTOMAKE(freeciv,1.7.1)
---
>
> dnl Create config.h (thanks to Markus Linala)
> AM_CONFIG_HEADER(config.h)
>
> dnl Require a POSIX system
> AC_ISC_POSIX
9c14,28
< VERSION=1.7.1
---
>
> MAJOR_VERSION=1
> MINOR_VERSION=7
> PATCH_VERSION=1
> ALL_LINGUAS="no"
>
> AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
> AC_DEFINE_UNQUOTED(ALL_LINGUAS, "$ALL_LINGUAS")
> AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION)
> AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION)
> AC_DEFINE_UNQUOTED(PATCH_VERSION, $PATCH_VERSION)
> # FIXME: replace VERSION_STRING with VERSION in source and delete line below
> AC_DEFINE_UNQUOTED(VERSION_STRING, "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
> AC_DEFINE_UNQUOTED(VERSION, "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
> AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
13,18d31
< dnl Evaluate options. Example:
< dnl AC_ARG_ENABLE(debug,
< dnl [ --enable-debug include debugging code],
< dnl AC_DEFINE(DEBUG)
< dnl )
<
26,42d38
< dnl Checks for libraries.
< AC_PATH_XTRA
< CFLAGS="$CFLAGS $X_CFLAGS"
< LIBS="$LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
<
< AC_CHECK_LIB(X11, XOpenDisplay, , AC_MSG_ERROR("Need X11"), $LIBS)
< AC_CHECK_LIB(Xext, XShapeCombineMask)
< AC_CHECK_LIB(ICE, main)
< AC_CHECK_LIB(SM, main)
< AC_CHECK_LIB(Xt, main, , ,$LIBS)
< AC_CHECK_LIB(Xmu, main)
< AC_CHECK_LIB(Xaw, main)
< AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, , AC_MSG_ERROR("Need xpm library"), $X_LIBS)
< AC_CHECK_LIB(socket,main)
< AC_CHECK_LIB(nsl,main)
< AC_CHECK_LIB(nls,main)
<
51d46
< AC_CHECK_HEADERS(X11/xpm.h)
56a52,144
> AC_CHECK_LIB(socket,main)
> AC_CHECK_LIB(nsl,main)
>
> dnl Preliminary support for internationalization -- EXPERIMENTAL
> dnl ( the below code has been shamelessly stolen from Window Maker )
>
> AM_GNU_GETTEXT
> AC_DEFINE(LOCALEDIR, "/usr/local/share") # FIXME!
>
> dnl Which modules to build
> NO_SERVER="dunno"
> NO_CLIENT="dunno"
> BASEDIRS="data common"
>
> AC_ARG_ENABLE(client,
> [ --disable-client do not build the client], NO_CLIENT="$enableval")
> AC_ARG_ENABLE(server,
> [ --disable-server do not build the server], NO_SERVER="$enableval")
>
> if test "x$NO_CLIENT" != "xno"; then
>
> BASEDIRS="$BASEDIRS client"
>
> dnl Checks for GUI front-ends. Default policy is to build for
> dnl all available toolkits.
> WITH_XAW="dunno"
> WITH_GTK="dunno"
> GUI_SOURCES=""
>
> AC_ARG_WITH(xaw,
> [ --with-xaw use the X widget set], WITH_XAW="$withval")
> AC_ARG_WITH(gtk,
> [ --with-gtk use the GTK widget set and imlib (experimental)], WITH_GTK="$withval")
>
> if test "x$WITH_XAW" != "xno"; then
> AC_PATH_XTRA
> CFLAGS="$CFLAGS $X_CFLAGS"
> LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
> AC_CHECK_LIB(X11, XOpenDisplay, WITH_XAW="yes", WITH_XAW="no", $LIBS)
> AC_CHECK_LIB(Xext, XShapeCombineMask, , WITH_XAW="no", $LIBS)
> AC_CHECK_LIB(ICE, main)
> AC_CHECK_LIB(SM, main)
> AC_CHECK_LIB(Xt, main, , WITH_XAW="no", $LIBS)
> AC_CHECK_LIB(Xmu, main)
> AC_CHECK_LIB(Xaw, main, , WITH_XAW="no")
> AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, , WITH_XAW="no", $LIBS)
> AC_CHECK_HEADERS(X11/xpm.h)
> fi
>
> dnl FIXME -- when gtk 1.2 is release, use the gtk.m4 macro
> dnl FIXME - instead. it check a lot of potentially erronous cases.
> if test "x$WITH_GTK" != "xno"; then
> AC_CHECK_PROG(TEST_GLIB, glib-config, "yes", "no" )
> if test "x$TEST_GLIB" = "xyes"; then
> AC_CHECK_PROG(TEST_GTK, gtk-config, "yes", "no" )
> if test "x$TEST_GTK" = "xyes"; then
> AC_CHECK_PROG(TEST_IMLIB, imlib-config, "yes", "no" )
> fi
> fi
> dnl CFLAGS="$CFLAGS `imlib-config --cflags`"
> dnl LIBS="$LIBS `imlib-config --libs`"
> WITH_GTK=$TEST_IMLIB
> fi
>
> dnl Implements toolkits.
> echo ">> Building clients"
>
> if test "x$WITH_XAW" = "xyes"; then
> GUI_SOURCES="$GUI_SOURCES XAW"
> AC_DEFINE(BUILD_XAW)
> echo " o Building for X Athena widgets"
> fi
>
> if test "x$WITH_GTK" = "xyes"; then
> dnl GUI_SOURCES="$GUI_SOURCES GTK"
> dnl AC_DEFINE(BUILD_GTK)
> echo " o GTK detected but not supported"
> fi
>
> dnl end of client section
> fi
>
> if test "x$NO_SERVER" != "xno"; then
> BASEDIRS="$BASEDIRS ai server"
> echo ">> Building server"
> fi
>
> dnl This variable sets SUBDIRS= in client/Makefile.am
> AC_SUBST(GUI_SOURCES)
>
> dnl This variable sets SUBDIRS= in base Makefile.am
> AC_SUBST(BASEDIRS)
>
60c148,157
< AC_OUTPUT(Makefile data/Makefile common/Makefile ai/Makefile client/Makefile server/Makefile)
---
> AC_OUTPUT(
> Makefile
> data/Makefile
> common/Makefile
> ai/Makefile
> client/Makefile
> server/Makefile
> intl/Makefile
> po/Makefile.in
> )
Index: client/civclient.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/civclient.c,v
retrieving revision 1.18
diff -r1.18 civclient.c
12a13,16
> #include <libintl.h>
> #include <config.h>
> #define _(String) gettext (String)
>
80a85,89
> /* gettext */
> setlocale(LC_MESSAGES,"");
> bindtextdomain(PACKAGE, LOCALEDIR);
> textdomain(PACKAGE);
>
103c112
< flog(LOG_DEBUG, "server shutdown");
---
> flog(LOG_DEBUG, _("server shutdown"));
Index: client/clinet.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/clinet.c,v
retrieving revision 1.6
diff -r1.6 clinet.c
12a13,14
> #include <config.h>
>
Index: client/connectdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/connectdlg.c,v
retrieving revision 1.7
diff -r1.7 connectdlg.c
0a1,2
> #include <config.h>
>
Index: client/graphics.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/graphics.c,v
retrieving revision 1.9
diff -r1.9 graphics.c
12a13,14
> #include <config.h>
>
Index: client/graphics.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/graphics.h,v
retrieving revision 1.5
diff -r1.5 graphics.h
15a16,17
> #include <config.h>
>
Index: client/helpdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/helpdlg.c,v
retrieving revision 1.14
diff -r1.14 helpdlg.c
12a13,14
> #include <config.h>
>
Index: client/xmain.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/xmain.c,v
retrieving revision 1.23
diff -r1.23 xmain.c
13a14,15
> #include <config.h>
>
Index: common/shared.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/shared.h,v
retrieving revision 1.20
diff -r1.20 shared.h
16,21c16
< /* client/server should always have the same major and minor versions */
< /* different patch versions are compatible */
< #define MAJOR_VERSION 1
< #define MINOR_VERSION 7
< #define PATCH_VERSION 1
< #define VERSION_STRING "1.7.1"
---
> #include <config.h>
Index: server/civserver.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/civserver.c,v
retrieving revision 1.48
diff -r1.48 civserver.c
12a13,14
> #include <config.h>
>
Index: server/gamehand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/gamehand.c,v
retrieving revision 1.21
diff -r1.21 gamehand.c
12a13,14
> #include <config.h>
>
Index: server/meta.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/meta.h,v
retrieving revision 1.2
diff -r1.2 meta.h
21a22,23
> #include <config.h>
>
Index: server/registry.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/registry.c,v
retrieving revision 1.9
diff -r1.9 registry.c
112a113,114
> #include <config.h>
>