diff -Nru freeciv-2.3.0/aclocal.m4 freeciv-2.3.1/aclocal.m4 --- freeciv-2.3.0/aclocal.m4 2011-08-08 04:25:43.000000000 +0000 +++ freeciv-2.3.1/aclocal.m4 2011-11-19 20:24:00.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, -[m4_warning([this file was generated for autoconf 2.64. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +[m4_warning([this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -2460,7 +2460,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -2500,6 +2500,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3087,11 +3099,11 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3708,7 +3720,7 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -3772,7 +3784,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -3992,7 +4004,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4197,6 +4209,9 @@ cygwin* | mingw* | cegcc*) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4261,6 +4276,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4282,6 +4300,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -4373,7 +4392,7 @@ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -4443,7 +4462,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -4618,6 +4637,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -4856,7 +4876,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -5852,7 +5872,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -7859,15 +7879,15 @@ # Generated from ltversion.in. -# serial 3012 ltversion.m4 +# serial 3017 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' +[macro_version='2.2.6b' +macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -7980,7 +8000,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -7996,7 +8016,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -Nru freeciv-2.3.0/ai/Makefile.in freeciv-2.3.1/ai/Makefile.in --- freeciv-2.3.0/ai/Makefile.in 2011-08-08 04:25:51.000000000 +0000 +++ freeciv-2.3.1/ai/Makefile.in 2011-11-19 20:24:03.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -125,10 +125,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -301,7 +297,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/autogen.sh freeciv-2.3.1/autogen.sh --- freeciv-2.3.0/autogen.sh 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/autogen.sh 2011-11-19 20:22:07.000000000 +0000 @@ -10,7 +10,7 @@ package=freeciv srcfile=client/civclient.c -SRCDIR=`dirname $0` +SRCDIR=`dirname "$0"` BUILDDIR=`pwd` # Uncomment the line below to debug this file @@ -216,10 +216,10 @@ } # Chdir to the srcdir, then run auto* tools. -cd $SRCDIR +cd "$SRCDIR" [ -f $srcfile ] || { - echo "Are you sure $SRCDIR is a valid source directory?" + echo "Are you sure \"$SRCDIR\" is a valid source directory?" exit 1 } @@ -232,9 +232,9 @@ } # autoconf and autoheader version numbers must be kept in sync -real_package_name "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 58 || DIE=1 +real_package_name "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 59 || DIE=1 AUTOCONF=$REALPKGNAME -real_package_name "autoheader" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 58 || DIE=1 +real_package_name "autoheader" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 59 || DIE=1 AUTOHEADER=$REALPKGNAME # automake and aclocal version numbers must be kept in sync @@ -294,7 +294,7 @@ } # Chdir back to the builddir before the configure step. -cd $BUILDDIR +cd "$BUILDDIR" # now remove the cache, because it can be considered dangerous in this case echo "+ removing config.cache ... " @@ -317,7 +317,7 @@ fi echo -$SRCDIR/configure $FC_NEWARGLINE || { +"$SRCDIR/configure" $FC_NEWARGLINE || { echo echo "configure failed" exit 1 diff -Nru freeciv-2.3.0/bootstrap/config.guess freeciv-2.3.1/bootstrap/config.guess --- freeciv-2.3.0/bootstrap/config.guess 2011-08-08 04:25:51.000000000 +0000 +++ freeciv-2.3.1/bootstrap/config.guess 2011-11-19 20:24:03.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-27' +timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -170,7 +170,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -656,7 +656,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -822,6 +822,9 @@ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -882,40 +885,17 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif @@ -947,7 +927,7 @@ EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; @@ -1001,14 +981,6 @@ elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -1074,7 +1046,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1182,7 +1154,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) diff -Nru freeciv-2.3.0/bootstrap/config.sub freeciv-2.3.1/bootstrap/config.sub --- freeciv-2.3.0/bootstrap/config.sub 2011-08-08 04:25:51.000000000 +0000 +++ freeciv-2.3.1/bootstrap/config.sub 2011-11-19 20:24:03.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-04-17' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -153,6 +153,9 @@ os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -467,6 +470,10 @@ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos @@ -1260,7 +1267,7 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ @@ -1613,7 +1620,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff -Nru freeciv-2.3.0/bootstrap/freeciv-modpack.desktop.in freeciv-2.3.1/bootstrap/freeciv-modpack.desktop.in --- freeciv-2.3.0/bootstrap/freeciv-modpack.desktop.in 1970-01-01 00:00:00.000000000 +0000 +++ freeciv-2.3.1/bootstrap/freeciv-modpack.desktop.in 2011-11-19 20:21:19.000000000 +0000 @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Freeciv modpack installer +Comment=Download and install add-ons for Freeciv +Exec=freeciv-modpack +Icon=freeciv-modpack +StartupNotify=true +Terminal=false +Type=Application +Categories=GTK;Game;StrategyGame; diff -Nru freeciv-2.3.0/bootstrap/generate_svnrev.sh freeciv-2.3.1/bootstrap/generate_svnrev.sh --- freeciv-2.3.0/bootstrap/generate_svnrev.sh 2011-08-08 04:20:02.000000000 +0000 +++ freeciv-2.3.1/bootstrap/generate_svnrev.sh 2011-11-19 20:21:19.000000000 +0000 @@ -10,9 +10,9 @@ # # Absolete paths -SRCROOT=$(cd "$1" ; pwd) -INPUTDIR=$(cd "$1/bootstrap" ; pwd) -OUTPUTDIR=$(cd "$2/common" ; pwd) +SRCROOT="$(cd "$1" ; pwd)" +INPUTDIR="$(cd "$1/bootstrap" ; pwd)" +OUTPUTDIR="$(cd "$2/common" ; pwd)" REVSTATE="OFF" REV="dist" diff -Nru freeciv-2.3.0/bootstrap/ltmain.sh freeciv-2.3.1/bootstrap/ltmain.sh --- freeciv-2.3.0/bootstrap/ltmain.sh 2009-10-18 11:17:33.000000000 +0000 +++ freeciv-2.3.1/bootstrap/ltmain.sh 2010-01-06 10:19:45.000000000 +0000 @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6 +# ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=2.2.6 +VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" TIMESTAMP="" -package_revision=1.3012 +package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -116,15 +116,15 @@ : ${CP="cp -f"} : ${ECHO="echo"} -: ${EGREP="/usr/bin/grep -E"} -: ${FGREP="/usr/bin/grep -F"} -: ${GREP="/usr/bin/grep"} +: ${EGREP="/bin/grep -E"} +: ${FGREP="/bin/grep -F"} +: ${GREP="/bin/grep"} : ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/opt/local/bin/gsed"} +: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -5033,7 +5033,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -5344,19 +5347,19 @@ # It is a libtool convenience library, so add in its objects. convenience="$convenience $ladir/$objdir/$old_library" old_convenience="$old_convenience $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done continue fi # $pass = conv @@ -5893,6 +5896,7 @@ if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do + path= case $deplib in -L*) path="$deplib" ;; *.la) @@ -6206,6 +6210,9 @@ revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) diff -Nru freeciv-2.3.0/ChangeLog freeciv-2.3.1/ChangeLog --- freeciv-2.3.0/ChangeLog 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/ChangeLog 2011-11-19 20:22:07.000000000 +0000 @@ -1,3 +1,1327 @@ +------------------------------------------------------------------------ +r20600 | jtn | 2011-11-19 20:07:51 +0000 (Sat, 19 Nov 2011) | 2 lines +Changed paths: + M /branches/S2_3/fc_version + +Bump version number to '2.3.1'. + +------------------------------------------------------------------------ +r20599 | jtn | 2011-11-19 20:02:36 +0000 (Sat, 19 Nov 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/ar.po + M /branches/S2_3/po/ca.po + M /branches/S2_3/po/cs.po + M /branches/S2_3/po/da.po + M /branches/S2_3/po/de.po + M /branches/S2_3/po/el.po + M /branches/S2_3/po/en_GB.po + M /branches/S2_3/po/eo.po + M /branches/S2_3/po/es.po + M /branches/S2_3/po/et.po + M /branches/S2_3/po/fa.po + M /branches/S2_3/po/fi.po + M /branches/S2_3/po/fr.po + M /branches/S2_3/po/ga.po + M /branches/S2_3/po/gd.po + M /branches/S2_3/po/he.po + M /branches/S2_3/po/hu.po + M /branches/S2_3/po/it.po + M /branches/S2_3/po/ja.po + M /branches/S2_3/po/ko.po + M /branches/S2_3/po/lt.po + M /branches/S2_3/po/nl.po + M /branches/S2_3/po/no.po + M /branches/S2_3/po/pl.po + M /branches/S2_3/po/pt.po + M /branches/S2_3/po/pt_BR.po + M /branches/S2_3/po/ro.po + M /branches/S2_3/po/ru.po + M /branches/S2_3/po/sv.po + M /branches/S2_3/po/tr.po + M /branches/S2_3/po/uk.po + M /branches/S2_3/po/zh_CN.po + +Results of running "make update-po". + +------------------------------------------------------------------------ +r20596 | jtn | 2011-11-19 19:40:16 +0000 (Sat, 19 Nov 2011) | 8 lines +Changed paths: + M /branches/S2_3/common/player.c + M /branches/S2_3/common/player.h + M /branches/S2_3/server/savegame2.c + +Fix bug with saving/loading player known information when use of player slots +was sparse, i.e. after a player was /removed. Could cause segfaults or cause +players to forget which bits of the map they knew on reload. + +Report and analysis by Michal Mazurek (akfaew@gna), patch by +Matthias Pfafferodt (syntron@gna). + +See gna bug #19007. +------------------------------------------------------------------------ +r20595 | jtn | 2011-11-19 19:40:09 +0000 (Sat, 19 Nov 2011) | 4 lines +Changed paths: + M /branches/S2_3/po/ca.po + M /branches/S2_3/po/es.po + M /branches/S2_3/po/fi.po + M /branches/S2_3/po/fr.po + M /branches/S2_3/po/gd.po + M /branches/S2_3/po/pl.po + +Reinstate the string removed and then replaced under gna bug #18641 in +translations that have been updated since then (and have cleared out +their obsolete translations). The translations came out of old svn +versions. +------------------------------------------------------------------------ +r20594 | jtn | 2011-11-19 19:40:02 +0000 (Sat, 19 Nov 2011) | 2 lines +Changed paths: + M /branches/S2_3/server/stdinhand.c + +Temporarily revert fix for gna bug #18641 on stable branch. +It exposes another bug (gna bug #18776) that's too late to fix for 2.3.1. +------------------------------------------------------------------------ +r20593 | jtn | 2011-11-19 17:32:02 +0000 (Sat, 19 Nov 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/fi.po + +Updated Finnish translation by Sini Ruohomaa and Juhana Uuttu. +95.4%: 6009 translated, 101 fuzzy, 186 untranslated. +------------------------------------------------------------------------ +r20592 | jtn | 2011-11-19 00:24:17 +0000 (Sat, 19 Nov 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/fi.po + +Updated Finnish translation by Sini Ruohomaa and Juhana Uuttu. +85%: 5364 translated, 667 fuzzy, 265 untranslated. +------------------------------------------------------------------------ +r20591 | jtn | 2011-11-18 21:31:40 +0000 (Fri, 18 Nov 2011) | 3 lines +Changed paths: + D /branches/S2_3/doc/README.fcdb + +Remove the README.fcdb added in gna patch #2959 -- its current content is not +applicable to the S2_3 branch. + +------------------------------------------------------------------------ +r20590 | jtn | 2011-11-17 23:41:40 +0000 (Thu, 17 Nov 2011) | 3 lines +Changed paths: + M /branches/S2_3/common/generate_packets.py + +Change log level for network packet variant logging. + +See gna bug #19004. +------------------------------------------------------------------------ +r20584 | cazfi | 2011-11-17 19:50:18 +0000 (Thu, 17 Nov 2011) | 4 lines +Changed paths: + M /branches/S2_3/client/goto.c + +Fixed crash when planning goto for unit with move_rate 0. + +See gna bug #19001 + +------------------------------------------------------------------------ +r20571 | jtn | 2011-11-15 21:02:46 +0000 (Tue, 15 Nov 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/es.po + +Updated Spanish translation from Jordi Negrevernis i Font. +100%: 6296 translated. +------------------------------------------------------------------------ +r20570 | jtn | 2011-11-15 21:02:43 +0000 (Tue, 15 Nov 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/gd.po + +Updated Scottish Gaelic localisation from Michael Bauer. +100%: 6296 translated. +------------------------------------------------------------------------ +r20564 | jtn | 2011-11-14 23:47:33 +0000 (Mon, 14 Nov 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/fr.po + +Updated French translation by Igx, The Dreaming Drummer... +100%: 6296 translated. +------------------------------------------------------------------------ +r20550 | jtn | 2011-11-13 20:26:26 +0000 (Sun, 13 Nov 2011) | 9 lines +Changed paths: + M /branches/S2_3/client/packhand.c + M /branches/S2_3/common/packets.def + M /branches/S2_3/fc_version + M /branches/S2_3/server/gamehand.c + +Add optional capability to network protocol to increase range of +seconds_to_phasedone for new clients/servers, allowing the client to +see timeouts of greater than about 60 hours. +(Previously, the timeout was enacted fine on the server; it was just a +display issue on the client.) + +Reported by Michal Mazurek (akfaew@gna). + +See gna bug #18687. +------------------------------------------------------------------------ +r20544 | jcreus | 2011-11-12 11:22:44 +0000 (Sat, 12 Nov 2011) | 1 line +Changed paths: + M /branches/S2_3/po/ca.po + +Translation update +------------------------------------------------------------------------ +r20543 | jtn | 2011-11-12 10:27:27 +0000 (Sat, 12 Nov 2011) | 3 lines +Changed paths: + M /branches/S2_3/po/pl.po + +Updated Polish translation by Hubert Kowalewski (hubkow@gna). +(From gna patch #2609.) +100%: 6296 translated. +------------------------------------------------------------------------ +r20536 | cazfi | 2011-11-10 21:58:22 +0000 (Thu, 10 Nov 2011) | 6 lines +Changed paths: + M /branches/S2_3/client/gui-gtk-2.0/themes.c + +Fixed crash when no usable theme is found. + +Reported by Rafa艂 Mu偶y艂o + +See gna bug #18952 + +------------------------------------------------------------------------ +r20526 | cazfi | 2011-11-09 22:16:56 +0000 (Wed, 09 Nov 2011) | 4 lines +Changed paths: + M /branches/S2_3/server/savegame2.c + +Save and load ownerless bases to and from playerless scenarios. + +See gna bug #18930 + +------------------------------------------------------------------------ +r20523 | cazfi | 2011-11-09 21:56:25 +0000 (Wed, 09 Nov 2011) | 5 lines +Changed paths: + M /branches/S2_3/client/options.c + +Renamed min() and max() callbacks as minimum() and maximum() to +avoid namespace conflict with macros with same names. + +See gna bug #18963 + +------------------------------------------------------------------------ +r20518 | cazfi | 2011-11-09 00:11:55 +0000 (Wed, 09 Nov 2011) | 5 lines +Changed paths: + M /branches/S2_3/doc/README.packaging + +Added section to README.packaging about changes since 2.3.0 that +are concern of packagers. + +See gna patch #2928 + +------------------------------------------------------------------------ +r20511 | syntron | 2011-11-08 21:14:25 +0000 (Tue, 08 Nov 2011) | 6 lines +Changed paths: + M /branches/S2_3/server/savegame2.c + +fix loading of shuffle information + +- was broken since introduction of player slots(?) + +see gna bug #18886 + +------------------------------------------------------------------------ +r20503 | syntron | 2011-11-08 20:57:08 +0000 (Tue, 08 Nov 2011) | 13 lines +Changed paths: + M /branches/S2_3/server/settings.c + +fix map definition / generation + +the map is defined with several settings (mapsize, size, tilesperplayer, +xsize, ysize, topology). Now, some combinations are invalid like in this +bug + +mapsize == XYSIZE && ysize % 2 != 0 && MAP_IS_ISOMETRIC + +I did add the required checks but a framework to check the settings +would be helpful. Check also bug #18673 and patch #2542. + +see gna bug #18875 + +------------------------------------------------------------------------ +r20502 | syntron | 2011-11-08 20:53:42 +0000 (Tue, 08 Nov 2011) | 14 lines +Changed paths: + M /branches/S2_3/server/stdinhand.c + +[S2_3] allow remove command for access level >= ADMIN in running games + +Fix error message if trying "/remove" with + +git-svn-id: svn://svn.gna.org/svn/freeciv/trunk@20278 +a0f10bec-cc02-0410-94fc-a9cfff90b4cd +git-svn-id: svn://svn.gna.org/svn/freeciv/trunk@20329 +a0f10bec-cc02-0410-94fc-a9cfff90b4cd + + +------------------------------------------------------------------------ +r20497 | jtn | 2011-11-08 00:05:55 +0000 (Tue, 08 Nov 2011) | 3 lines +Changed paths: + M /branches/S2_3/data/amplio/medievalcities.png + M /branches/S2_3/data/amplio2/medievalcities.png + +Fix a tiny glitch in one of the Amplio Steam Age city graphics. + +See gna bug #18935. +------------------------------------------------------------------------ +r20496 | jtn | 2011-11-08 00:05:51 +0000 (Tue, 08 Nov 2011) | 3 lines +Changed paths: + M /branches/S2_3/modinst/modinst.c + +Mark freeciv-modpack table headings for i18n. + +See gna bug #18934. +------------------------------------------------------------------------ +r20495 | jtn | 2011-11-08 00:05:48 +0000 (Tue, 08 Nov 2011) | 3 lines +Changed paths: + M /branches/S2_3/client/gui-gtk-2.0/gotodlg.c + +Remove some erroneous FIXME comments about astring lifetime management. + +See gna bug #17846. +------------------------------------------------------------------------ +r20476 | cazfi | 2011-11-07 22:25:35 +0000 (Mon, 07 Nov 2011) | 4 lines +Changed paths: + M /branches/S2_3/data/civ1/terrain.ruleset + M /branches/S2_3/data/civ2/terrain.ruleset + M /branches/S2_3/data/default/terrain.ruleset + M /branches/S2_3/data/experimental/terrain.ruleset + M /branches/S2_3/data/multiplayer/terrain.ruleset + +Documented base's native_to -field in terrain.ruleset comments. + +See gna bug #18920 + +------------------------------------------------------------------------ +r20463 | jcreus | 2011-11-06 18:00:48 +0000 (Sun, 06 Nov 2011) | 1 line +Changed paths: + M /branches/S2_3/po/ca.po + +Translation update +------------------------------------------------------------------------ +r20453 | syntron | 2011-11-05 18:25:23 +0000 (Sat, 05 Nov 2011) | 12 lines +Changed paths: + M /branches/S2_3/common/tile.c + +add check to tile_transform + +This check is needed as tile could be a virtual tile used by the client +(gtk) to check which unit tasks should be shown. If a city is on the +tile and it could be transformed to a terrain with the flag +TER_NO_CITIES this would result in an assert(). + +Compared to S2_4 or trunk an additional check for the value of +tile->index is included. + +see gna bug #18549 + +------------------------------------------------------------------------ +r20447 | syntron | 2011-11-05 18:05:56 +0000 (Sat, 05 Nov 2011) | 4 lines +Changed paths: + M /branches/S2_3/common/tile.c + M /branches/S2_3/common/tile.h + +check if a tile is a virtual tile + +see gna patch #2957 + +------------------------------------------------------------------------ +r20441 | jtn | 2011-11-04 22:50:18 +0000 (Fri, 04 Nov 2011) | 7 lines +Changed paths: + M /branches/S2_3/server/srv_main.c + +Initialise AI data phase earlier during end-turn activities, so that it +is open during auto-explore activities, fixing a server crash. + +Reported by "zekkerj" on the forum; patch by Matthias Pfafferodt +(syntron@gna). + +See gna bug #18796. +------------------------------------------------------------------------ +r20435 | jcreus | 2011-11-04 18:19:37 +0000 (Fri, 04 Nov 2011) | 1 line +Changed paths: + M /branches/S2_3/po/ca.po + +Translation update +------------------------------------------------------------------------ +r20433 | cazfi | 2011-11-03 23:24:50 +0000 (Thu, 03 Nov 2011) | 5 lines +Changed paths: + M /branches/S2_3/doc/README + +Fix documentation to list amplio2 as default tileset instead of amplio we +don't even ship any more. + +See gna bug #18897 + +------------------------------------------------------------------------ +r20425 | jtn | 2011-11-03 20:46:01 +0000 (Thu, 03 Nov 2011) | 4 lines +Changed paths: + M /branches/S2_3/data/experimental/buildings.ruleset + M /branches/S2_3/doc/README.ruleset_experimental + +Update README.ruleset_experimental for recent changes to health in +bug #18535. Also, fix typo in Temple description. + +See gna patch #2998. +------------------------------------------------------------------------ +r20419 | jtn | 2011-11-02 01:18:14 +0000 (Wed, 02 Nov 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/en_GB.po + +en_GB: merge in latest string updates and take account of them. +Complete once again. +------------------------------------------------------------------------ +r20412 | cazfi | 2011-11-01 20:40:50 +0000 (Tue, 01 Nov 2011) | 6 lines +Changed paths: + M /branches/S2_3/utility/netintf.c + +Fixed compilation when AI_NUMERICSERV is not defined. + +Reported by David Lowe + +See gna bug #18871 + +------------------------------------------------------------------------ +r20407 | jtn | 2011-11-01 10:16:57 +0000 (Tue, 01 Nov 2011) | 5 lines +Changed paths: + M /branches/S2_3/data/experimental/buildings.ruleset + +Fixed unterminated string literal. + +Patch by Marko Lindqvist (cazfi@gna). + +See gna bug #18895. +------------------------------------------------------------------------ +r20402 | cazfi | 2011-10-31 21:05:43 +0000 (Mon, 31 Oct 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/gd.po + +Updated translation by Michael Bauer + +------------------------------------------------------------------------ +r20364 | syntron | 2011-10-30 18:48:54 +0000 (Sun, 30 Oct 2011) | 4 lines +Changed paths: + M /branches/S2_3/server/savegame2.c + +check for savefile.options if loading a savegame + +see gna bug #18546 (part 2) + +------------------------------------------------------------------------ +r20362 | syntron | 2011-10-30 18:47:41 +0000 (Sun, 30 Oct 2011) | 4 lines +Changed paths: + M /branches/S2_3/utility/capability.c + +check for capability string == NULL + +see gna bug #18546 (part 1) + +------------------------------------------------------------------------ +r20359 | syntron | 2011-10-30 18:43:49 +0000 (Sun, 30 Oct 2011) | 15 lines +Changed paths: + M /branches/S2_3/data/experimental/buildings.ruleset + M /branches/S2_3/data/experimental/effects.ruleset + +fix health in early game (experimental ruleset) + ++30 => Building: Aqueduct ++20 => Building: Aqueduct (ends if Industrialization is researched) +[new] ++20 => Building: Aqueduct + Sewer System + ++25 => Building: Hospital ++20 => Building: Genetic Lab ++20 => Building: Temple [new] + ++5 =>Wonder: Cure For Cancer + +see gna bug #18535 + +------------------------------------------------------------------------ +r20356 | cazfi | 2011-10-29 21:47:41 +0100 (Sat, 29 Oct 2011) | 5 lines +Changed paths: + M /branches/S2_3/client/client_main.c + M /branches/S2_3/common/fc_interface.c + M /branches/S2_3/common/fc_interface.h + M /branches/S2_3/common/tile.c + M /branches/S2_3/server/maphand.c + M /branches/S2_3/server/srv_main.c + +Fixed bug that after base was removed due to terrain changing to one that cannot support it, +it was still acting as border source and vision source. + +See gna bug #18513 + +------------------------------------------------------------------------ +r20353 | syntron | 2011-10-28 23:09:33 +0100 (Fri, 28 Oct 2011) | 8 lines +Changed paths: + M /branches/S2_3/data/multiplayer/script.lua + +fix error if future tech is researched + +if a future tech is research tech will be nil and the current lua code +for the multiplayer ruleset will result in an error + +see gna bug #18710 + + +------------------------------------------------------------------------ +r20347 | syntron | 2011-10-28 22:59:17 +0100 (Fri, 28 Oct 2011) | 4 lines +Changed paths: + M /branches/S2_3/server/generator/startpos.c + +fix possible division by 0 for a map without goodies + +see gna bug #18533 + +------------------------------------------------------------------------ +r20344 | cazfi | 2011-10-28 22:15:02 +0100 (Fri, 28 Oct 2011) | 9 lines +Changed paths: + M /branches/S2_3/common/tile.c + M /branches/S2_3/server/citytools.c + +Fixed bugs and inconsistencies in roads granted for city center tiles. For simplicity of the fix, +city center tiles having roads always, no matter what, is considered a feature. + +- Roads are removed from terrains that cannot support them when city is removed +- Roads are not removed when city center is transformed to ocean +- Roads are removed when non-city-center tile is changed to terrain that cannot support them. + +See gna bug #18553 + +------------------------------------------------------------------------ +r20341 | cazfi | 2011-10-28 20:58:53 +0100 (Fri, 28 Oct 2011) | 4 lines +Changed paths: + M /branches/S2_3/bootstrap/generate_svnrev.sh + M /branches/S2_3/common/Makefile.am + +Handle correctly srcdirs and builddirs with whitespace in their names when --enable-svnrev given. + +See gna bug #18418 + +------------------------------------------------------------------------ +r20332 | cazfi | 2011-10-26 22:24:37 +0100 (Wed, 26 Oct 2011) | 6 lines +Changed paths: + M /branches/S2_3/server/sernet.c + +Set client connection close callback also when server LAN announcements are off. + +Reported by Michal Mazurek + +See gna bug #18511 + +------------------------------------------------------------------------ +r20318 | jtn | 2011-10-21 22:03:18 +0100 (Fri, 21 Oct 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/fr.po + +Updated French translation by Igx, The Dreaming Drummer... +100%: 6291 translated. +------------------------------------------------------------------------ +r20317 | jtn | 2011-10-21 21:47:15 +0100 (Fri, 21 Oct 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/es.po + +Updated Spanish translation from Jordi Negrevernis i Font. +100%: 6291 translated. +------------------------------------------------------------------------ +r20303 | vmikhnevych | 2011-10-06 15:28:34 +0100 (Thu, 06 Oct 2011) | 1 line +Changed paths: + M /branches/S2_3/po/uk.po + +UK translation - 82% complete (485 fuzzy, 635 untranslated) +------------------------------------------------------------------------ +r20302 | jcreus | 2011-10-05 22:35:17 +0100 (Wed, 05 Oct 2011) | 1 line +Changed paths: + M /branches/S2_3/po/ca.po + +Translation update +------------------------------------------------------------------------ +r20301 | jtn | 2011-10-04 21:01:11 +0100 (Tue, 04 Oct 2011) | 5 lines +Changed paths: + M /branches/S2_3/client/mapview_common.c + M /branches/S2_3/client/options.c + M /branches/S2_3/client/options.h + +Add a client option controlling combat animation speed. + +Requested by Vadim Peretokin (vadi@gna). + +See gna bug #18770. +------------------------------------------------------------------------ +r20284 | syntron | 2011-09-25 17:22:12 +0100 (Sun, 25 Sep 2011) | 14 lines +Changed paths: + M /branches/S2_3/client/text.c + +change research progress display + +"Progress: Y turns/advance (X bulbs/turn)" + +where: +- X is the number of bulbs researched per turn (i.e. leave as is.) +- Y should be changed to the total number of bulbs required for the + current advance, from start to finish, divided by X, and rounded up, +NOT the number of turns left for the current advance, since that is +displayed in the progress bar below. + +see gna bug #18499 +request/found by Staffan Bruun + +------------------------------------------------------------------------ +r20282 | syntron | 2011-09-25 17:20:52 +0100 (Sun, 25 Sep 2011) | 5 lines +Changed paths: + M /branches/S2_3/server/srv_main.c + +fix saving of scenarios after start + +see gna bug #18652 +reported by Michal Mazurek + +------------------------------------------------------------------------ +r20280 | syntron | 2011-09-25 17:18:16 +0100 (Sun, 25 Sep 2011) | 4 lines +Changed paths: + A /branches/S2_3/doc/README.fcdb + +add README.fcdb + +see gna patch #2959 + +------------------------------------------------------------------------ +r20272 | jtn | 2011-09-22 10:10:14 +0100 (Thu, 22 Sep 2011) | 6 lines +Changed paths: + M /branches/S2_3/client/gui-gtk-2.0/citydlg.c + +Fix crash in Gtk client when clicking Previous/Next City buttons as a +player observer. + +Reported by Bernhard Maerz. + +See gna bug #18608. +------------------------------------------------------------------------ +r20270 | chrisk | 2011-09-22 08:14:43 +0100 (Thu, 22 Sep 2011) | 1 line +Changed paths: + M /branches/S2_3/po/de.po + +Revert to Rev. 20056 - too many bugs +------------------------------------------------------------------------ +r20269 | ronnystandtke | 2011-09-20 22:58:12 +0100 (Tue, 20 Sep 2011) | 1 line +Changed paths: + M /branches/S2_3/po/de.po + +improved German L10n +------------------------------------------------------------------------ +r20268 | ronnystandtke | 2011-09-20 21:52:07 +0100 (Tue, 20 Sep 2011) | 1 line +Changed paths: + M /branches/S2_3/po/de.po + +improved German L10n +------------------------------------------------------------------------ +r20266 | jtn | 2011-09-19 20:52:12 +0100 (Mon, 19 Sep 2011) | 3 lines +Changed paths: + M /branches/S2_3/server/stdinhand.c + +Fix misplaced '/' in unknown command response from server to client. + +See gna bug #18678. +------------------------------------------------------------------------ +r20265 | jtn | 2011-09-19 20:52:09 +0100 (Mon, 19 Sep 2011) | 5 lines +Changed paths: + M /branches/S2_3/server/commands.c + +Mention 'allowtake' option in server help for /take and /observe. + +Suggested by Michal Mazurek (akfaew@gna). + +See gna bug #18677. +------------------------------------------------------------------------ +r20264 | jtn | 2011-09-19 20:52:06 +0100 (Mon, 19 Sep 2011) | 3 lines +Changed paths: + M /branches/S2_3/common/movement.c + +Prevent a unit moving into a city where it should not be able to exist. + +See gna bug #18675. +------------------------------------------------------------------------ +r20263 | jtn | 2011-09-19 20:52:03 +0100 (Mon, 19 Sep 2011) | 5 lines +Changed paths: + M /branches/S2_3/server/edithand.c + M /branches/S2_3/server/maphand.c + M /branches/S2_3/server/maphand.h + M /branches/S2_3/server/unittools.c + +When a tile's terrain changes, check units in adjacent tiles as well as the +tile in question; there may be units in cities which can't continue to +exist there. + +See gna bug #18613. +------------------------------------------------------------------------ +r20256 | syntron | 2011-09-18 20:42:07 +0100 (Sun, 18 Sep 2011) | 6 lines +Changed paths: + M /branches/S2_3/client/text.c + +fix science dialog to show the bulbs needed till the global target and +not the total number of bulbs + +see gna bug #18547 + + +------------------------------------------------------------------------ +r20255 | syntron | 2011-09-18 20:38:53 +0100 (Sun, 18 Sep 2011) | 6 lines +Changed paths: + M /branches/S2_3/common/aicore/cm.c + +limit number of cm iterations +(backport from trunk) + +see gna bug #18407 + + +------------------------------------------------------------------------ +r20253 | jtn | 2011-09-17 22:49:57 +0100 (Sat, 17 Sep 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/fr.po + +Updated French translation by Igx, The Dreaming Drummer... +99.9%: 6284 translated, 5 fuzzy. +------------------------------------------------------------------------ +r20249 | jtn | 2011-09-15 21:31:24 +0100 (Thu, 15 Sep 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/gd.po + +Updated Scottish Gaelic localisation from Michael Bauer. +99.9%: 6284 translated, 5 fuzzy. +------------------------------------------------------------------------ +r20246 | syntron | 2011-09-11 21:55:57 +0100 (Sun, 11 Sep 2011) | 5 lines +Changed paths: + M /branches/S2_3/server/generator/mapgen_topology.c + +check map size against the size limit + +see gna bug #18537 + + +------------------------------------------------------------------------ +r20219 | jtn | 2011-09-03 19:30:57 +0100 (Sat, 03 Sep 2011) | 5 lines +Changed paths: + M /branches/S2_3/server/citytools.c + +When creating a city, destroy bases first (not during), and only try to +destroy bases that actually exist. Quick commit to fix assertion failures +and segfaults from r20218. + +See gna bug #18529. +------------------------------------------------------------------------ +r20218 | cazfi | 2011-09-03 07:34:22 +0100 (Sat, 03 Sep 2011) | 6 lines +Changed paths: + M /branches/S2_3/server/citytools.c + +When city is built to tile with base, replacing base, remove also all the effects +provided by base; vision and borders. + +See gna bug #18529 + + +------------------------------------------------------------------------ +r20216 | jcreus | 2011-09-02 18:46:23 +0100 (Fri, 02 Sep 2011) | 1 line +Changed paths: + M /branches/S2_3/po/ca.po + +Translation update +------------------------------------------------------------------------ +r20214 | jtn | 2011-09-02 09:58:22 +0100 (Fri, 02 Sep 2011) | 6 lines +Changed paths: + M /branches/S2_3/data/scenario/earth-160x90-v2.sav + +Further tweak to earth-160x90-v2 scenario to improve navigation around +Greenland. + +By David Fernandez (tirolalira@gna). + +See gna patch #2949. +------------------------------------------------------------------------ +r20209 | jtn | 2011-08-31 10:05:55 +0100 (Wed, 31 Aug 2011) | 7 lines +Changed paths: + M /branches/S2_3/data/experimental/units.ruleset + +Remove TerrainSpeed flag from experimental ruleset's Triremes. +It was making it possible for these units to move very fast along rivers +(faster than on open water). + +Reported by David Fernandez (tirolalira@gna). + +See gna bug #18590. +------------------------------------------------------------------------ +r20208 | jtn | 2011-08-31 10:05:52 +0100 (Wed, 31 Aug 2011) | 6 lines +Changed paths: + M /branches/S2_3/data/scenario/earth-160x90-v2.sav + +Updated earth-160x90-v2 scenario with more start positions and a few terrain +tweaks. + +Updates by David Fernandez (tirolalira@gna). + +See gna patch #2949. +------------------------------------------------------------------------ +r20207 | jtn | 2011-08-31 10:05:49 +0100 (Wed, 31 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/configure.ac + M /branches/S2_3/data/misc/Makefile.am + M /branches/S2_3/data/misc/icons.spec + A /branches/S2_3/data/misc/mpicon.png + M /branches/S2_3/modinst/modinst.c + +Add a run-time icon for freeciv-modpack on platforms other than Windows. + +Graphics by user "yd" on the forum. + +See gna patch #2948. +------------------------------------------------------------------------ +r20206 | jtn | 2011-08-31 10:05:46 +0100 (Wed, 31 Aug 2011) | 3 lines +Changed paths: + M /branches/S2_3/modinst/modinst.c + +Add a window title for freeciv-modpack. + +See gna bug #18589. +------------------------------------------------------------------------ +r20205 | evyscr | 2011-08-31 09:14:20 +0100 (Wed, 31 Aug 2011) | 2 lines +Changed paths: + M /branches/S2_3/client/gui-xaw/connectdlg.c + M /branches/S2_3/data/Freeciv.in + +gui-xaw: rewritten connect dialog (gna patch #2813) + +------------------------------------------------------------------------ +r20203 | cazfi | 2011-08-30 21:42:08 +0100 (Tue, 30 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/server/maphand.c + M /branches/S2_3/server/unittools.c + +Bounce units when native base is pillaged, and they have no other means +to remain in tile. + +See gna bug #18528 + +------------------------------------------------------------------------ +r20201 | jtn | 2011-08-30 21:18:07 +0100 (Tue, 30 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/client/gui-gtk-2.0/helpdlg.c + M /branches/S2_3/client/gui-xaw/helpdlg.c + M /branches/S2_3/client/helpdata.c + M /branches/S2_3/data/helpdata.txt + M /branches/S2_3/manual/civmanual.c + +Add version information and client_string to "About Freeciv" help. + +Suggested by Marko Lindqvist (cazfi@gna) and Daniel Markstedt (dmarks@gna). + +See gna bug #18198. +------------------------------------------------------------------------ +r20200 | jtn | 2011-08-30 21:18:04 +0100 (Tue, 30 Aug 2011) | 3 lines +Changed paths: + M /branches/S2_3/client/gui-gtk-2.0/editprop.c + +Don't include the "Address" fields in the property editor in non-debug builds. + +See gna bug #18584. +------------------------------------------------------------------------ +r20199 | jtn | 2011-08-30 21:18:00 +0100 (Tue, 30 Aug 2011) | 6 lines +Changed paths: + M /branches/S2_3/client/gui-gtk-2.0/editprop.c + +Avoid resetting cursor position in Scenario Description text box every time it +is touched. + +Reported by Michal Mazurek (akfaew@gna). + +See gna bug #18536. +------------------------------------------------------------------------ +r20190 | jtn | 2011-08-28 13:14:40 +0100 (Sun, 28 Aug 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/es.po + +Updated Spanish translation from Jordi Negrevernis i Font. +>99.9%: 6287 translated, 1 fuzzy. +------------------------------------------------------------------------ +r20188 | cazfi | 2011-08-28 06:15:06 +0100 (Sun, 28 Aug 2011) | 6 lines +Changed paths: + M /branches/S2_3/server/maphand.c + +Fixed claiming of border source tile on Ocean. + +Originally reported by heilkitty + +See gna bug #18557 + +------------------------------------------------------------------------ +r20185 | cazfi | 2011-08-27 20:30:18 +0100 (Sat, 27 Aug 2011) | 7 lines +Changed paths: + M /branches/S2_3/client/clinet.c + M /branches/S2_3/client/servers.c + M /branches/S2_3/common/dataio.c + M /branches/S2_3/server/sernet.c + +Always include sys/types.h, sys/socket.h and netinet/in.h before +arpa/inet.h + +Patch by Michal Mazurek + +See gna bug #18501 + +------------------------------------------------------------------------ +r20182 | jtn | 2011-08-25 09:58:05 +0100 (Thu, 25 Aug 2011) | 3 lines +Changed paths: + M /branches/S2_3/server/settings.c + +Fix description of revolen=0 (1-5 turns, not 1-6). + +See gna bug #18552. +------------------------------------------------------------------------ +r20170 | jtn | 2011-08-21 16:24:24 +0100 (Sun, 21 Aug 2011) | 6 lines +Changed paths: + M /branches/S2_3/common/map.c + M /branches/S2_3/common/tile.c + M /branches/S2_3/common/tile.h + +Do not use tile pointer as key in startpos hash. This makes autogames +reproducible again. (backport from trunk r19064) + +Patch by Marko Lindqvist (cazfi@gna). + +See gna bug #13679, gna bug #18346. +------------------------------------------------------------------------ +r20169 | jtn | 2011-08-21 16:24:20 +0100 (Sun, 21 Aug 2011) | 3 lines +Changed paths: + M /branches/S2_3/client/gui-gtk-2.0/dialogs.c + M /branches/S2_3/client/gui-gtk-2.0/messagewin.c + +Fix keyboard shortcut clash with messages in Gtk client. + +See gna bug #18500. +------------------------------------------------------------------------ +r20168 | cazfi | 2011-08-21 07:30:57 +0100 (Sun, 21 Aug 2011) | 4 lines +Changed paths: + M /branches/S2_3/server/ruleset.c + +Added sanity checking for base type requirement lists. + +See gna patch #2925 + +------------------------------------------------------------------------ +r20165 | jtn | 2011-08-20 10:52:16 +0100 (Sat, 20 Aug 2011) | 3 lines +Changed paths: + M /branches/S2_3/po/fi.po + +Some manual defuzzification of fi.po after gna bug #18416, at translator's +request. +85%: 5333 translated, 686 fuzzy, 269 untranslated. +------------------------------------------------------------------------ +r20164 | jtn | 2011-08-20 10:52:12 +0100 (Sat, 20 Aug 2011) | 1 line +Changed paths: + M /branches/S2_3/po/fi.po + +Merge fi.po with latest freeciv.pot in preparation for defuzzying. +------------------------------------------------------------------------ +r20163 | jtn | 2011-08-20 01:20:07 +0100 (Sat, 20 Aug 2011) | 3 lines +Changed paths: + M /branches/S2_3/po/pl.po + +Updated Polish translation by Hubert Kowalewski (hubkow@gna). +(From gna patch #2609.) +100%: 6288 translated. +------------------------------------------------------------------------ +r20162 | jtn | 2011-08-20 00:04:47 +0100 (Sat, 20 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/server/savegame.c + +When reading pre-2.3 savegames, reset "onsetbarbs" to 0 if it's <0 +(and hence a year rather than a turn), rather than >0. This mistake was +causing immediate barbarian uprising in the tutorial scenario. + +See gna bug #18472. +------------------------------------------------------------------------ +r20160 | cazfi | 2011-08-19 06:00:24 +0100 (Fri, 19 Aug 2011) | 12 lines +Changed paths: + M /branches/S2_3/server/ruleset.c + +Fixed sanity checks too easily flagging multiple same type requirements +in requiremnet list as error: + +- Check for max_tiles should be disabled with value -1, + but check was erronously against 1. This resulted sanity check to + always fail when there was at least 2 requirements of the type + terrain, base or special. +- Limiting number of base and special requirements to number of tiles + in range was broken idea as same tile can have multiple bases or specials. + +See gna bug #18514 + +------------------------------------------------------------------------ +r20156 | cazfi | 2011-08-18 22:09:23 +0100 (Thu, 18 Aug 2011) | 4 lines +Changed paths: + M /branches/S2_3/doc/man/freeciv-client.6.in + +List amplio2.tilespec instead of amplio.tilespec. + +See gna bug #18512 + +------------------------------------------------------------------------ +r20153 | cazfi | 2011-08-17 20:44:12 +0100 (Wed, 17 Aug 2011) | 8 lines +Changed paths: + M /branches/S2_3/server/ruleset.c + +Do not cast int pointer to size_t pointer, and use pointed value as if it +was of size_t size. That cast lead to crashes in systems where size_t is +bigger datatype than int. + +Reported by Michal Mazurek + +See gna bug #18482 + +------------------------------------------------------------------------ +r20147 | cazfi | 2011-08-17 05:28:08 +0100 (Wed, 17 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/autogen.sh + +Fixed autogen.sh to handled correctly srdir and builddir that have +whitespace in name. + +See gna bug #18491 + +------------------------------------------------------------------------ +r20145 | jtn | 2011-08-16 23:14:36 +0100 (Tue, 16 Aug 2011) | 3 lines +Changed paths: + M /branches/S2_3/po/en_GB.po + +Cosmetic: fix date in en_GB.po. +(NB, all strings have now been reviewed, so this is now a complete translation, +and has been since r20049.) +------------------------------------------------------------------------ +r20141 | jtn | 2011-08-16 17:56:10 +0100 (Tue, 16 Aug 2011) | 2 lines +Changed paths: + M /branches/S2_3/po/en_GB.po + +Updated en_GB translation after recent string changes. +5%: 321 translated, 5967 untranslated. +------------------------------------------------------------------------ +r20139 | jtn | 2011-08-16 11:08:24 +0100 (Tue, 16 Aug 2011) | 2 lines +Changed paths: + M /branches/S2_3/doc/man + M /branches/S2_3/modinst + +Update svn:ignore after gna patch #2810 and gna patch #2890. + +------------------------------------------------------------------------ +r20137 | jtn | 2011-08-16 10:29:04 +0100 (Tue, 16 Aug 2011) | 3 lines +Changed paths: + M /branches/S2_3/data/helpdata.txt + +Acknowledge Worker units in the "Strategy and Tactics" section of the help. + +See gna bug #18424. +------------------------------------------------------------------------ +r20136 | jtn | 2011-08-16 10:28:59 +0100 (Tue, 16 Aug 2011) | 3 lines +Changed paths: + M /branches/S2_3/client/ggzclient.c + M /branches/S2_3/client/gui-gtk-2.0/mapview.c + M /branches/S2_3/client/text.c + M /branches/S2_3/data/Freeciv.in + M /branches/S2_3/data/civ1/buildings.ruleset + M /branches/S2_3/data/civ1/game.ruleset + M /branches/S2_3/data/civ2/buildings.ruleset + M /branches/S2_3/data/default/buildings.ruleset + M /branches/S2_3/data/experimental/buildings.ruleset + M /branches/S2_3/data/helpdata.txt + M /branches/S2_3/data/multiplayer/buildings.ruleset + M /branches/S2_3/data/nation/angolan.ruleset + M /branches/S2_3/data/nation/belgian.ruleset + M /branches/S2_3/data/nation/bhutanese.ruleset + M /branches/S2_3/data/nation/brandenburgian.ruleset + M /branches/S2_3/data/nation/cham.ruleset + M /branches/S2_3/data/nation/elamite.ruleset + M /branches/S2_3/data/nation/franconian.ruleset + M /branches/S2_3/data/nation/frisian.ruleset + M /branches/S2_3/data/nation/greenlander.ruleset + M /branches/S2_3/data/nation/hansa.ruleset + M /branches/S2_3/data/nation/holyroman.ruleset + M /branches/S2_3/data/nation/inca.ruleset + M /branches/S2_3/data/nation/kazakh.ruleset + M /branches/S2_3/data/nation/kurd.ruleset + M /branches/S2_3/data/nation/lithuanian.ruleset + M /branches/S2_3/data/nation/manx.ruleset + M /branches/S2_3/data/nation/mexican.ruleset + M /branches/S2_3/data/nation/miao.ruleset + M /branches/S2_3/data/nation/miskito.ruleset + M /branches/S2_3/data/nation/mixtec.ruleset + M /branches/S2_3/data/nation/moldovan.ruleset + M /branches/S2_3/data/nation/moravian.ruleset + M /branches/S2_3/data/nation/northkorean.ruleset + M /branches/S2_3/data/nation/nubian.ruleset + M /branches/S2_3/data/nation/panamanian.ruleset + M /branches/S2_3/data/nation/phoenician.ruleset + M /branches/S2_3/data/nation/salvadoran.ruleset + M /branches/S2_3/data/nation/samogitian.ruleset + M /branches/S2_3/data/nation/sarmatian.ruleset + M /branches/S2_3/data/nation/seleucid.ruleset + M /branches/S2_3/data/nation/shawnee.ruleset + M /branches/S2_3/data/nation/somali.ruleset + M /branches/S2_3/data/nation/soviet.ruleset + M /branches/S2_3/data/nation/swazi.ruleset + M /branches/S2_3/data/nation/taiwanese.ruleset + M /branches/S2_3/data/nation/thai.ruleset + M /branches/S2_3/data/nation/tocharian.ruleset + M /branches/S2_3/data/nation/tunisian.ruleset + M /branches/S2_3/data/nation/westernroman.ruleset + M /branches/S2_3/server/commands.c + M /branches/S2_3/server/generator/startpos.c + M /branches/S2_3/server/ggzserver.c + M /branches/S2_3/server/settings.c + M /branches/S2_3/server/stdinhand.c + +Fix various typos in translateable strings. + +See gna bug #18416. +------------------------------------------------------------------------ +r20135 | jtn | 2011-08-16 10:28:54 +0100 (Tue, 16 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/Makefile.am + A /branches/S2_3/bootstrap/freeciv-modpack.desktop.in + M /branches/S2_3/configure.ac + A /branches/S2_3/data/icons/128x128/freeciv-modpack.png + A /branches/S2_3/data/icons/16x16/freeciv-modpack.png + A /branches/S2_3/data/icons/32x32/freeciv-modpack.png + A /branches/S2_3/data/icons/48x48/freeciv-modpack.png + A /branches/S2_3/data/icons/64x64/freeciv-modpack.png + M /branches/S2_3/data/icons/Makefile.am + M /branches/S2_3/debian/freeciv-modpack.install + M /branches/S2_3/modinst/Makefile.am + +Add .desktop files and icon for freeciv-modpack. + +Graphics by user "yd" on the forum. + +See gna patch #2810. +------------------------------------------------------------------------ +r20134 | jtn | 2011-08-16 10:28:49 +0100 (Tue, 16 Aug 2011) | 9 lines +Changed paths: + M /branches/S2_3/server/settings.c + M /branches/S2_3/utility/registry.c + +Allow server settings in ruleset to be specified using syntax closer to that +of the server command line: + - setting names and enum/bitwise values are matched case-insensitively + - boolean settings can take a string "disabled"/"enabled" value as well + as the secfile TRUE/FALSE value + +Reported by Micke (someswede@gna). + +See gna bug #18328. +------------------------------------------------------------------------ +r20133 | jtn | 2011-08-16 10:28:46 +0100 (Tue, 16 Aug 2011) | 9 lines +Changed paths: + M /branches/S2_3/client/gui-gtk-2.0/cityrep.c + M /branches/S2_3/client/gui-gtk-2.0/diplodlg.c + M /branches/S2_3/client/gui-gtk-2.0/gui_stuff.c + M /branches/S2_3/client/gui-gtk-2.0/gui_stuff.h + M /branches/S2_3/client/gui-gtk-2.0/plrdlg.c + M /branches/S2_3/client/gui-gtk-2.0/wldlg.c + +In the Gtk client, decorate menu bars other than the main one with the +"ubuntu-local" property. This provides a hint to Ubuntu's Unity desktop +environment (which likes to move menubars around) that it shouldn't mess +with these, which was making vital menus like the Diplomacy menu +disappear. + +Reported in Ubuntu by John Lenton, and many times on the forums. + +See gna bug #18260 (and Ubuntu launchpad #743265). +------------------------------------------------------------------------ +r20132 | jtn | 2011-08-16 10:28:43 +0100 (Tue, 16 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/utility/ioz.c + +Fix a bug that caused files to always be opened in binary mode if bzip2 +support was compiled in. (Although this doesn't make any difference if +zlib support is compiled in, so is largely a cosmetic change.) + +See gna bug #18434. +------------------------------------------------------------------------ +r20131 | jtn | 2011-08-16 10:28:39 +0100 (Tue, 16 Aug 2011) | 3 lines +Changed paths: + M /branches/S2_3/utility/inputfile.c + +Make secfiles cope with \r\n and \n\r line endings. + +See gna patch #2843. +------------------------------------------------------------------------ +r20130 | jtn | 2011-08-16 10:28:36 +0100 (Tue, 16 Aug 2011) | 4 lines +Changed paths: + M /branches/S2_3/client/include/helpdlg_g.h + +Fix "Strategy and Tactics" help menu item, which didn't work in some locales +(including English ones). + +See gna bug #18425. +------------------------------------------------------------------------ +r20129 | jtn | 2011-08-16 10:28:34 +0100 (Tue, 16 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/client/gui-gtk-2.0/helpdlg.c + M /branches/S2_3/client/gui-xaw/helpdlg.c + M /branches/S2_3/client/helpdata.c + +Translate nation names in help. + +Reported by Hubert Kowalewski (hubkow@gna). + +See gna bug #18451. +------------------------------------------------------------------------ +r20128 | jtn | 2011-08-16 10:28:30 +0100 (Tue, 16 Aug 2011) | 4 lines +Changed paths: + M /branches/S2_3/data/hex2t.tilespec + +hex2t tileset shouldn't depend on amplio, as we no longer ship it. +This was preventing it from loading. + +See gna bug #18458. +------------------------------------------------------------------------ +r20112 | cazfi | 2011-08-15 06:23:44 +0100 (Mon, 15 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/client/gui-xaw/repodlgs.c + +Fixed a bug that unit counts were multiplied by city count in +xaw-client unit report. + +See gna bug #18486 + +------------------------------------------------------------------------ +r20105 | cazfi | 2011-08-14 06:14:52 +0100 (Sun, 14 Aug 2011) | 10 lines +Changed paths: + M /branches/S2_3/common/city.c + M /branches/S2_3/common/city.h + M /branches/S2_3/common/tile.c + +Set x and y coordinates for vitrual tiles and use these when checking +if tile is city center instead of comparing tile pointers. This fixes a bug +that autosettlers never improved city center tiles. + +Reported by Lavrentij P Berija (bug #17767) + +Patch by Ryan Riegel + +See gna patch #2866 + +------------------------------------------------------------------------ +r20103 | cazfi | 2011-08-13 19:56:39 +0100 (Sat, 13 Aug 2011) | 4 lines +Changed paths: + M /branches/S2_3/configure.ac + M /branches/S2_3/debian/freeciv-modpack.install + M /branches/S2_3/doc/man/Makefile.am + A /branches/S2_3/doc/man/freeciv-modpack.6.in + +Added freeciv-modpack man-page + +See gna patch #2890 + +------------------------------------------------------------------------ +r20101 | cazfi | 2011-08-13 15:08:57 +0100 (Sat, 13 Aug 2011) | 6 lines +Changed paths: + M /branches/S2_3/common/dataio.c + +Include sys/socket.h and netinet/in.h before arpa/inet.h + +Patch by Michal Mazurek + +See gna bug #18468 + +------------------------------------------------------------------------ +r20097 | cazfi | 2011-08-13 06:35:58 +0100 (Sat, 13 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/modinst/Makefile.am + M /branches/S2_3/modinst/modinst.c + A /branches/S2_3/modinst/mpcmdline.c + A /branches/S2_3/modinst/mpcmdline.h + M /branches/S2_3/po/POTFILES.in + +Added commandline parameter parsing to freeciv-modpack. Supported +parameters are "--help" and "--version" + +See gna patch #2808 + +------------------------------------------------------------------------ +r20095 | cazfi | 2011-08-12 21:41:47 +0100 (Fri, 12 Aug 2011) | 9 lines +Changed paths: + M /branches/S2_3/common/tile.c + +Set S_RESOURCE_VALID correctly for virtual tile. This makes autosettlers +to calculate worth of improving tiles with resources correctly. + +Reported by Lavrentij P Berija (bug #17767) + +Patch by Ryan Riegel (originally in patch #2866) + +See gna patch #2840 + +------------------------------------------------------------------------ +r20092 | cazfi | 2011-08-12 06:31:39 +0100 (Fri, 12 Aug 2011) | 4 lines +Changed paths: + M /branches/S2_3/m4/auth.m4 + +Added configure option --with-mysql-libdir. + +See gna patch #2867 + +------------------------------------------------------------------------ +r20089 | cazfi | 2011-08-11 22:19:37 +0100 (Thu, 11 Aug 2011) | 6 lines +Changed paths: + M /branches/S2_3/configure.ac + M /branches/S2_3/m4/debug.m4 + M /branches/S2_3/m4/gprof.m4 + +Do not require C++ compiler. + +Reported by Egor Vyscrebentsov + +See gna bug #17488 + +------------------------------------------------------------------------ +r20085 | cazfi | 2011-08-10 21:38:59 +0100 (Wed, 10 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/server/unittools.c + +Fixed the way non-transported units in city are counted in +wakeup_neighbor_sentries(). + +See gna bug #18388 + +------------------------------------------------------------------------ +r20082 | cazfi | 2011-08-09 22:23:18 +0100 (Tue, 09 Aug 2011) | 5 lines +Changed paths: + M /branches/S2_3/INSTALL + M /branches/S2_3/autogen.sh + M /branches/S2_3/configure.ac + +Updated documentation and autogen.sh check to reflect the fact that +autoconf 2.59 has effectively been our minimum requirement for some time. + +See gna bug #18464 + +------------------------------------------------------------------------ +r20077 | dmarks | 2011-08-08 05:18:37 +0100 (Mon, 08 Aug 2011) | 1 line +Changed paths: + M /branches/S2_3/fc_version + +Reinstate '+' to version string to indicate development code +------------------------------------------------------------------------ +r20075 | dmarks | 2011-08-08 05:12:52 +0100 (Mon, 08 Aug 2011) | 1 line +Changed paths: + M /branches/S2_3/ChangeLog + +Update ChangeLog as of S2_3 r20074 +------------------------------------------------------------------------ r20074 | dmarks | 2011-08-07 21:04:08 -0700 (Sun, 07 Aug 2011) | 1 line Changed paths: diff -Nru freeciv-2.3.0/client/agents/Makefile.in freeciv-2.3.1/client/agents/Makefile.in --- freeciv-2.3.0/client/agents/Makefile.in 2011-08-08 04:25:52.000000000 +0000 +++ freeciv-2.3.1/client/agents/Makefile.in 2011-11-19 20:24:03.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -122,10 +122,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -298,7 +294,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/client/client_main.c freeciv-2.3.1/client/client_main.c --- freeciv-2.3.0/client/client_main.c 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/client/client_main.c 2011-11-19 20:22:07.000000000 +0000 @@ -1073,6 +1073,7 @@ { struct functions *funcs = fc_interface_funcs(); + funcs->destroy_base = NULL; funcs->player_tile_vision_get = client_map_is_known_and_seen; /* Keep this function call at the end. It checks if all required functions diff -Nru freeciv-2.3.0/client/clinet.c freeciv-2.3.1/client/clinet.c --- freeciv-2.3.0/client/clinet.c 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/client/clinet.c 2011-11-19 20:22:07.000000000 +0000 @@ -20,30 +20,30 @@ #include #include +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif #ifdef HAVE_ARPA_INET_H #include #endif #ifdef HAVE_NETDB_H #include #endif -#ifdef HAVE_NETINET_IN_H -#include -#endif #ifdef HAVE_PWD_H #include #endif #ifdef HAVE_SYS_SELECT_H #include #endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_SYS_TYPES_H -#include -#endif #ifdef HAVE_SYS_UIO_H #include #endif diff -Nru freeciv-2.3.0/client/ggzclient.c freeciv-2.3.1/client/ggzclient.c --- freeciv-2.3.0/client/ggzclient.c 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/client/ggzclient.c 2011-11-19 20:22:07.000000000 +0000 @@ -95,7 +95,7 @@ } ggz_socket = ggzmod_get_fd(ggzmod); if (ggz_socket < 0) { - fc_fprintf(stderr, _("Only the GGZ client must call civclient" + fc_fprintf(stderr, _("Only the GGZ client must call freeciv-client" " in ggz mode!\n")); exit(EXIT_FAILURE); } diff -Nru freeciv-2.3.0/client/goto.c freeciv-2.3.1/client/goto.c --- freeciv-2.3.0/client/goto.c 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/client/goto.c 2011-11-19 20:22:07.000000000 +0000 @@ -905,6 +905,12 @@ } mp = MAX(0, mp); + + if (goto_map->template.move_rate == 0) { + /* Immobile unit can never reach destination. */ + return FALSE; + } + /* Round down -- if we can get there this turn with MP left, report 0, * if we get there with 0 MP, report 1 */ turns = mp / goto_map->template.move_rate; diff -Nru freeciv-2.3.0/client/gui-ftwl/Makefile.in freeciv-2.3.1/client/gui-ftwl/Makefile.in --- freeciv-2.3.0/client/gui-ftwl/Makefile.in 2011-08-08 04:25:52.000000000 +0000 +++ freeciv-2.3.1/client/gui-ftwl/Makefile.in 2011-11-19 20:24:03.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -128,10 +128,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -304,7 +300,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/citydlg.c freeciv-2.3.1/client/gui-gtk-2.0/citydlg.c --- freeciv-2.3.0/client/gui-gtk-2.0/citydlg.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/citydlg.c 2011-11-19 20:21:58.000000000 +0000 @@ -1266,6 +1266,7 @@ pdialog->happiness.map_canvas.sw = NULL; /* make sure NULL if spy */ pdialog->happiness.map_canvas.ebox = NULL; /* ditto */ pdialog->happiness.map_canvas.pixmap = NULL; /* ditto */ + pdialog->cma_editor = NULL; pdialog->map_canvas_store = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, CITYMAP_WIDTH, CITYMAP_HEIGHT); pdialog->map_pixbuf_unscaled = NULL; @@ -2992,15 +2993,20 @@ /* reinitialize happiness, and cma dialogs */ gtk_box_pack_start(GTK_BOX(pdialog->happiness.widget), - get_top_happiness_display(pdialog->pcity), TRUE, TRUE, 0); - pdialog->cma_editor->pcity = new_pcity; + get_top_happiness_display(pdialog->pcity), TRUE, TRUE, 0); + if (!client_is_observer()) { + fc_assert(pdialog->cma_editor != NULL); + pdialog->cma_editor->pcity = new_pcity; + } reset_city_worklist(pdialog->production.worklist, pdialog->pcity); can_slide = FALSE; center_tile_mapcanvas(pdialog->pcity->tile); can_slide = TRUE; - set_cityopt_values(pdialog); /* need not be in real_city_dialog_refresh */ + if (!client_is_observer()) { + set_cityopt_values(pdialog); /* need not be in real_city_dialog_refresh */ + } real_city_dialog_refresh(pdialog->pcity); diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/cityrep.c freeciv-2.3.1/client/gui-gtk-2.0/cityrep.c --- freeciv-2.3.0/client/gui-gtk-2.0/cityrep.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/cityrep.c 2011-11-19 20:21:58.000000000 +0000 @@ -1033,7 +1033,7 @@ sep = gtk_hseparator_new(); gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0); - menubar = gtk_menu_bar_new(); + menubar = gtk_aux_menu_bar_new(); gtk_box_pack_start(GTK_BOX(vbox), menubar, TRUE, TRUE, 0); item = gtk_menu_item_new_with_mnemonic(_("_Production")); diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/dialogs.c freeciv-2.3.1/client/gui-gtk-2.0/dialogs.c --- freeciv-2.3.0/client/gui-gtk-2.0/dialogs.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/dialogs.c 2011-11-19 20:21:58.000000000 +0000 @@ -211,7 +211,7 @@ gtk_widget_show(goto_command); popcity_command = gtk_stockbutton_new(GTK_STOCK_ZOOM_IN, - _("Inspect _City")); + _("I_nspect City")); gtk_dialog_add_action_widget(GTK_DIALOG(shell), popcity_command, 2); gtk_widget_show(popcity_command); diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/diplodlg.c freeciv-2.3.1/client/gui-gtk-2.0/diplodlg.c --- freeciv-2.3.0/client/gui-gtk-2.0/diplodlg.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/diplodlg.c 2011-11-19 20:21:58.000000000 +0000 @@ -616,7 +616,7 @@ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); } - menubar = gtk_menu_bar_new(); + menubar = gtk_aux_menu_bar_new(); gtk_table_attach_defaults(GTK_TABLE(table), menubar, 1, 2, 1, 2); menu = gtk_menu_new(); @@ -687,7 +687,7 @@ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); } - menubar = gtk_menu_bar_new(); + menubar = gtk_aux_menu_bar_new(); gtk_table_attach_defaults(GTK_TABLE(table), menubar, 1, 2, 1, 2); menu = gtk_menu_new(); diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/editprop.c freeciv-2.3.1/client/gui-gtk-2.0/editprop.c --- freeciv-2.3.0/client/gui-gtk-2.0/editprop.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/editprop.c 2011-11-19 20:21:58.000000000 +0000 @@ -303,7 +303,9 @@ OPID_TILE_NAT_X, OPID_TILE_NAT_Y, OPID_TILE_CONTINENT, +#ifdef DEBUG OPID_TILE_ADDRESS, +#endif /* DEBUG */ OPID_TILE_TERRAIN, OPID_TILE_INDEX, OPID_TILE_XY, @@ -318,7 +320,9 @@ OPID_STARTPOS_NATIONS, OPID_UNIT_IMAGE, +#ifdef DEBUG OPID_UNIT_ADDRESS, +#endif /* DEBUG */ OPID_UNIT_TYPE, OPID_UNIT_ID, OPID_UNIT_XY, @@ -331,7 +335,9 @@ OPID_CITY_IMAGE, OPID_CITY_NAME, +#ifdef DEBUG OPID_CITY_ADDRESS, +#endif /* DEBUG */ OPID_CITY_ID, OPID_CITY_XY, OPID_CITY_SIZE, @@ -341,7 +347,9 @@ OPID_PLAYER_NAME, OPID_PLAYER_NATION, +#ifdef DEBUG OPID_PLAYER_ADDRESS, +#endif /* DEBUG */ OPID_PLAYER_INVENTIONS, OPID_PLAYER_GOLD, @@ -1427,10 +1435,12 @@ pv->data.v_pixbuf = create_tile_pixbuf(ptile); pv->must_free = TRUE; break; +#ifdef DEBUG case OPID_TILE_ADDRESS: pv->data.v_string = g_strdup_printf("%p", ptile); pv->must_free = TRUE; break; +#endif /* DEBUG */ case OPID_TILE_TERRAIN: { const struct terrain *pterrain = tile_terrain(ptile); @@ -1565,10 +1575,12 @@ pv->data.v_pixbuf = create_unit_pixbuf(punit); pv->must_free = TRUE; break; +#ifdef DEBUG case OPID_UNIT_ADDRESS: pv->data.v_string = g_strdup_printf("%p", punit); pv->must_free = TRUE; break; +#endif /* DEBUG */ case OPID_UNIT_XY: { const struct tile *ptile = unit_tile(punit); @@ -1627,10 +1639,12 @@ pv->data.v_pixbuf = create_city_pixbuf(pcity); pv->must_free = TRUE; break; +#ifdef DEBUG case OPID_CITY_ADDRESS: pv->data.v_string = g_strdup_printf("%p", pcity); pv->must_free = TRUE; break; +#endif /* DEBUG */ case OPID_CITY_XY: { const struct tile *ptile = city_tile(pcity); @@ -1683,10 +1697,12 @@ case OPID_PLAYER_NATION: pv->data.v_nation = nation_of_player(pplayer); break; +#ifdef DEBUG case OPID_PLAYER_ADDRESS: pv->data.v_string = g_strdup_printf("%p", pplayer); pv->must_free = TRUE; break; +#endif /* DEBUG */ case OPID_PLAYER_INVENTIONS: pv->data.v_inventions = fc_calloc(A_LAST, sizeof(bool)); advance_index_iterate(A_FIRST, tech) { @@ -2763,7 +2779,6 @@ propid = objprop_get_id(op); switch (propid) { - case OPID_TILE_ADDRESS: case OPID_TILE_INDEX: case OPID_TILE_X: case OPID_TILE_Y: @@ -2774,14 +2789,17 @@ case OPID_TILE_RESOURCE: case OPID_TILE_XY: case OPID_STARTPOS_XY: - case OPID_UNIT_ADDRESS: case OPID_UNIT_ID: case OPID_UNIT_XY: case OPID_UNIT_TYPE: - case OPID_CITY_ADDRESS: case OPID_CITY_ID: case OPID_CITY_XY: +#ifdef DEBUG + case OPID_TILE_ADDRESS: + case OPID_UNIT_ADDRESS: + case OPID_CITY_ADDRESS: case OPID_PLAYER_ADDRESS: +#endif /* DEBUG */ label = gtk_label_new(NULL); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); @@ -2938,17 +2956,19 @@ } break; - case OPID_TILE_ADDRESS: case OPID_TILE_XY: case OPID_TILE_TERRAIN: case OPID_TILE_RESOURCE: case OPID_STARTPOS_XY: - case OPID_UNIT_ADDRESS: case OPID_UNIT_XY: case OPID_UNIT_TYPE: - case OPID_CITY_ADDRESS: case OPID_CITY_XY: +#ifdef DEBUG + case OPID_TILE_ADDRESS: + case OPID_UNIT_ADDRESS: + case OPID_CITY_ADDRESS: case OPID_PLAYER_ADDRESS: +#endif /* DEBUG */ label = objprop_get_child_widget(op, "value-label"); if (pv) { gtk_label_set_text(GTK_LABEL(label), pv->data.v_string); @@ -3695,7 +3715,16 @@ case OPID_GAME_SCENARIO_DESC: disable_gobject_callback(G_OBJECT(ev->textbuf), G_CALLBACK(extviewer_textbuf_changed)); - gtk_text_buffer_set_text(textbuf, pv->data.v_const_string, -1); + { + GtkTextIter start, end; + char *oldtext; + /* Don't re-set content if unchanged, to avoid moving cursor */ + gtk_text_buffer_get_bounds(textbuf, &start, &end); + oldtext = gtk_text_buffer_get_text(textbuf, &start, &end, TRUE); + if (strcmp(oldtext, pv->data.v_const_string) != 0) { + gtk_text_buffer_set_text(textbuf, pv->data.v_const_string, -1); + } + } enable_gobject_callback(G_OBJECT(ev->textbuf), G_CALLBACK(extviewer_textbuf_changed)); gtk_widget_set_sensitive(ev->view_widget, TRUE); @@ -4042,8 +4071,10 @@ | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BV_SPECIAL); ADDPROP(OPID_TILE_BASES, _("Bases"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BV_BASES); +#ifdef DEBUG ADDPROP(OPID_TILE_ADDRESS, _("Address"), OPF_HAS_WIDGET, VALTYPE_STRING); +#endif /* DEBUG */ ADDPROP(OPID_TILE_VISION, _("Vision"), OPF_HAS_WIDGET, VALTYPE_TILE_VISION_DATA); return; @@ -4063,8 +4094,10 @@ case OBJTYPE_UNIT: ADDPROP(OPID_UNIT_IMAGE, _("Image"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET, VALTYPE_PIXBUF); +#ifdef DEBUG ADDPROP(OPID_UNIT_ADDRESS, _("Address"), OPF_HAS_WIDGET, VALTYPE_STRING); +#endif /* DEBUG */ ADDPROP(OPID_UNIT_TYPE, _("Type"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET, VALTYPE_STRING); ADDPROP(OPID_UNIT_ID, _("ID"), @@ -4091,8 +4124,10 @@ OPF_IN_LISTVIEW | OPF_HAS_WIDGET, VALTYPE_PIXBUF); ADDPROP(OPID_CITY_NAME, _("Name"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_STRING); +#ifdef DEBUG ADDPROP(OPID_CITY_ADDRESS, _("Address"), OPF_HAS_WIDGET, VALTYPE_STRING); +#endif /* DEBUG */ ADDPROP(OPID_CITY_ID, _("ID"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET, VALTYPE_INT); ADDPROP(OPID_CITY_XY, Q_("?coordinates:X,Y"), @@ -4110,8 +4145,10 @@ case OBJTYPE_PLAYER: ADDPROP(OPID_PLAYER_NAME, _("Name"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_STRING); +#ifdef DEBUG ADDPROP(OPID_PLAYER_ADDRESS, _("Address"), OPF_HAS_WIDGET, VALTYPE_STRING); +#endif /* DEBUG */ ADDPROP(OPID_PLAYER_NATION, _("Nation"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_NATION); ADDPROP(OPID_PLAYER_INVENTIONS, _("Inventions"), OPF_IN_LISTVIEW diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/gotodlg.c freeciv-2.3.1/client/gui-gtk-2.0/gotodlg.c --- freeciv-2.3.0/client/gui-gtk-2.0/gotodlg.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/gotodlg.c 2011-11-19 20:21:58.000000000 +0000 @@ -378,7 +378,6 @@ * A set of these appear in an "and"-separated list. */ air_text ? _("%s (airlift: %s)") : "%s", city_name(cities[i].city), air_text); - /* FIXME: free air_text */ descriptions[i] = astr_str(&strs[i]); unit_list_destroy(cities[i].units); } @@ -458,7 +457,6 @@ air_text = get_airlift_text(get_units_in_focus(), pcity); gtk_list_store_set(GTK_LIST_STORE(store), &iter, GD_COL_AIRLIFT, air_text ? air_text : "-", -1); - /* FIXME: FC_FREE(air_text); */ valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); } } diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/gui_stuff.c freeciv-2.3.1/client/gui-gtk-2.0/gui_stuff.c --- freeciv-2.3.0/client/gui-gtk-2.0/gui_stuff.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/gui_stuff.c 2011-11-19 20:21:58.000000000 +0000 @@ -263,6 +263,28 @@ } /************************************************************************** + Create an auxiliary menubar (i.e., not the main menubar at the top of + the window). +**************************************************************************/ +GtkWidget *gtk_aux_menu_bar_new(void) { + GtkWidget *menubar = gtk_menu_bar_new(); + + /* + * Ubuntu Linux's Ayatana/Unity desktop environment likes to steal the + * application's main menu bar from its window and put it at the top of + * the screen. It needs a hint in order not to steal menu bars other + * than the main one. Gory details at + * https://bugs.launchpad.net/ubuntu/+source/freeciv/+bug/743265 + */ + if (g_object_class_find_property( + G_OBJECT_CLASS(GTK_MENU_BAR_GET_CLASS(menubar)), "ubuntu-local")) { + g_object_set(G_OBJECT(menubar), "ubuntu-local", TRUE, NULL); + } + + return menubar; +} + +/************************************************************************** ... **************************************************************************/ static void close_callback(GtkDialog *dialog, gpointer data) diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/gui_stuff.h freeciv-2.3.1/client/gui-gtk-2.0/gui_stuff.h --- freeciv-2.3.0/client/gui-gtk-2.0/gui_stuff.h 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/gui_stuff.h 2011-11-19 20:21:58.000000000 +0000 @@ -53,6 +53,7 @@ GtkTreeViewColumn *add_treeview_column(GtkWidget *view, const char *title, GType gtype, int model_index); +GtkWidget *gtk_aux_menu_bar_new(void); enum gui_dialog_type { GUI_DIALOG_WINDOW, diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/helpdlg.c freeciv-2.3.1/client/gui-gtk-2.0/helpdlg.c --- freeciv-2.3.0/client/gui-gtk-2.0/helpdlg.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/helpdlg.c 2011-11-19 20:21:58.000000000 +0000 @@ -137,8 +137,7 @@ *****************************************************************/ static void set_title_topic(char *topic) { - if (strcmp(topic, "Freeciv") == 0 || strcmp(topic, "About") == 0 - || strcmp(topic, _("About")) == 0) { + if (strcmp(topic, _(HELP_ABOUT_ITEM)) == 0) { gtk_frame_set_label(GTK_FRAME(help_frame), freeciv_name_version()); } else { gtk_frame_set_label(GTK_FRAME(help_frame), topic); @@ -1298,7 +1297,7 @@ help_update_government(pitem, top); break; case HELP_NATIONS: - help_update_nation(pitem, top, nation_by_rule_name(top)); + help_update_nation(pitem, top, nation_by_translated_name(top)); break; case HELP_TEXT: default: diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/Makefile.in freeciv-2.3.1/client/gui-gtk-2.0/Makefile.in --- freeciv-2.3.0/client/gui-gtk-2.0/Makefile.in 2011-08-08 04:25:52.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/Makefile.in 2011-11-19 20:24:03.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -130,10 +130,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -306,7 +302,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/mapview.c freeciv-2.3.1/client/gui-gtk-2.0/mapview.c --- freeciv-2.3.0/client/gui-gtk-2.0/mapview.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/mapview.c 2011-11-19 20:21:58.000000000 +0000 @@ -173,7 +173,7 @@ /* update tooltips. */ gtk_tooltips_set_tip(main_tips, econ_ebox, - _("Shows your current luxury/science/tax rates;" + _("Shows your current luxury/science/tax rates; " "click to toggle them."), ""); gtk_tooltips_set_tip(main_tips, bulb_ebox, get_bulb_tooltip(), ""); diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/messagewin.c freeciv-2.3.1/client/gui-gtk-2.0/messagewin.c --- freeciv-2.3.0/client/gui-gtk-2.0/messagewin.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/messagewin.c 2011-11-19 20:21:58.000000000 +0000 @@ -355,7 +355,7 @@ gtk_widget_set_sensitive(cmd, FALSE); cmd = gui_dialog_add_stockbutton(pdialog->shell, GTK_STOCK_ZOOM_IN, - _("Inspect _City"), + _("I_nspect City"), MESWIN_RES_POPUP_CITY); gtk_widget_set_sensitive(cmd, FALSE); } diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/plrdlg.c freeciv-2.3.1/client/gui-gtk-2.0/plrdlg.c --- freeciv-2.3.0/client/gui-gtk-2.0/plrdlg.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/plrdlg.c 2011-11-19 20:21:58.000000000 +0000 @@ -506,9 +506,10 @@ sep = gtk_hseparator_new(); gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0); - menubar = gtk_menu_bar_new(); + menubar = gtk_aux_menu_bar_new(); gtk_box_pack_start(GTK_BOX(vbox), menubar, TRUE, TRUE, 0); + gui_dialog_add_widget(players_dialog_shell, vbox); gtk_box_set_child_packing(GTK_BOX(players_dialog_shell->action_area), vbox, FALSE, FALSE, 0, GTK_PACK_START); diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/themes.c freeciv-2.3.1/client/gui-gtk-2.0/themes.c --- freeciv-2.3.0/client/gui-gtk-2.0/themes.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/themes.c 2011-11-19 20:21:58.000000000 +0000 @@ -46,7 +46,7 @@ ****************************************************************************/ static void load_default_files(void) { - int i; + int i = 0; gchar** f; if (default_files != NULL) { @@ -54,9 +54,11 @@ } f = gtk_rc_get_default_files(); - - for (i = 0; f[i] ; i++) { - /* nothing */ + + if (f != NULL) { + for (i = 0; f[i] ; i++) { + /* nothing */ + } } num_default_files = i; default_files = fc_malloc(sizeof(char*) * (i + 2)); diff -Nru freeciv-2.3.0/client/gui-gtk-2.0/wldlg.c freeciv-2.3.1/client/gui-gtk-2.0/wldlg.c --- freeciv-2.3.0/client/gui-gtk-2.0/wldlg.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/client/gui-gtk-2.0/wldlg.c 2011-11-19 20:21:58.000000000 +0000 @@ -1210,7 +1210,7 @@ gtk_box_set_spacing(GTK_BOX(bbox), 10); gtk_box_pack_start(GTK_BOX(editor), bbox, FALSE, FALSE, 0); - menubar = gtk_menu_bar_new(); + menubar = gtk_aux_menu_bar_new(); gtk_container_add(GTK_CONTAINER(bbox), menubar); gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(bbox), menubar, TRUE); diff -Nru freeciv-2.3.0/client/gui-sdl/Makefile.in freeciv-2.3.1/client/gui-sdl/Makefile.in --- freeciv-2.3.0/client/gui-sdl/Makefile.in 2011-08-08 04:25:52.000000000 +0000 +++ freeciv-2.3.1/client/gui-sdl/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -135,10 +135,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -311,7 +307,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/client/gui-stub/Makefile.in freeciv-2.3.1/client/gui-stub/Makefile.in --- freeciv-2.3.0/client/gui-stub/Makefile.in 2011-08-08 04:25:52.000000000 +0000 +++ freeciv-2.3.1/client/gui-stub/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -128,10 +128,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -304,7 +300,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/client/gui-win32/Makefile.in freeciv-2.3.1/client/gui-win32/Makefile.in --- freeciv-2.3.0/client/gui-win32/Makefile.in 2011-08-08 04:25:52.000000000 +0000 +++ freeciv-2.3.1/client/gui-win32/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -128,10 +128,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -304,7 +300,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/client/gui-xaw/connectdlg.c freeciv-2.3.1/client/gui-xaw/connectdlg.c --- freeciv-2.3.0/client/gui-xaw/connectdlg.c 2011-08-08 04:20:43.000000000 +0000 +++ freeciv-2.3.1/client/gui-xaw/connectdlg.c 2011-11-19 20:22:01.000000000 +0000 @@ -32,13 +32,13 @@ /* common & utility */ #include "fcintl.h" #include "log.h" -#include "mem.h" /* fc_strdup() */ +#include "mem.h" /* fc_strdup() */ #include "support.h" #include "version.h" /* client */ #include "client_main.h" -#include "clinet.h" /* connect_to_server() */ +#include "clinet.h" /* connect_to_server() */ #include "packhand.h" #include "servers.h" @@ -50,40 +50,73 @@ #include "connectdlg_common.h" #include "connectdlg.h" -static enum { + +enum connection_state { LOGIN_TYPE, NEW_PASSWORD_TYPE, - VERIFY_PASSWORD_TYPE, - ENTER_PASSWORD_TYPE -} dialog_config; + ENTER_PASSWORD_TYPE, + WAITING_TYPE +}; -/****************************************************************/ +static enum connection_state connection_status; -static Widget textsrc, shell; -static Widget imsg, ilabel, iinput, ihost, iport; -static Widget connw, metaw, lanw, quitw; - -void server_address_ok_callback(Widget w, XtPointer client_data, - XtPointer call_data); -void quit_callback(Widget w, XtPointer client_data, XtPointer call_data); -void connect_callback(Widget w, XtPointer client_data, XtPointer call_data); -void connect_meta_callback(Widget w, XtPointer client_data, XtPointer call_data); -void connect_lan_callback(Widget w, XtPointer client_data, XtPointer call_data); + +static Widget connectdlg_shell; +static Widget connectdlg_form; +#if IS_BETA_VERSION +static Widget connectdlg_beta_label; +#endif +static Widget connectdlg_select_label; +static Widget connectdlg_host_label; +static Widget connectdlg_host_text; +static Widget connectdlg_port_label; +static Widget connectdlg_port_text; +static Widget connectdlg_login_label; +static Widget connectdlg_login_text; +static Widget connectdlg_password_label; +static Widget connectdlg_password_text; +static Widget connectdlg_verify_label; +static Widget connectdlg_verify_text; +static Widget connectdlg_message_label; +static Widget connectdlg_connect_button; +static Widget connectdlg_lan_button; +static Widget connectdlg_meta_button; +static Widget connectdlg_quit_button; + +void connectdlg_connect_callback(Widget w, XtPointer client_data, + XtPointer call_data); +void connectdlg_lan_callback(Widget w, XtPointer client_data, + XtPointer call_data); +void connectdlg_meta_callback(Widget w, XtPointer client_data, + XtPointer call_data); +void connectdlg_quit_callback(Widget w, XtPointer client_data, + XtPointer call_data); /****************************************************************/ -/* Meta Server */ -static Widget meta_dialog_shell=0; -static char *server_list[64]={NULL}; - -void create_meta_dialog(Widget caller); -int update_meta_dialog(Widget meta_list); -void meta_list_callback(Widget w, XtPointer client_data, XtPointer call_data); -void meta_list_destroy(Widget w, XtPointer client_data, XtPointer call_data); -void meta_update_callback(Widget w, XtPointer client_data, XtPointer call_data); -void meta_close_callback(Widget w, XtPointer client_data, XtPointer call_data); +/* Serverlist */ +static Widget connectdlg_serverlist_shell; + +static Widget connectdlg_serverlist_form; +static Widget connectdlg_serverlist_legend_label; +static Widget connectdlg_serverlist_viewport; +static Widget connectdlg_serverlist_list; +static Widget connectdlg_serverlist_update_button; +static Widget connectdlg_serverlist_close_button; + +static struct server_scan *lan_scan, *meta_scan; + +void connectdlg_serverlist_popup(void); +void server_scan_error(struct server_scan *scan, const char *message); +void connectdlg_serverlist_update_callback(Widget w, XtPointer client_data, + XtPointer call_data); +void connectdlg_serverlist_close_callback(Widget w, XtPointer client_data, + XtPointer call_data); +void connectdlg_serverlist_list_callback(Widget w, XtPointer client_data, + XtPointer call_data); -void connect_lan_callback(Widget w, XtPointer client_data, XtPointer call_data); +/* FIXME: Replace magic 64 with proper constant. */ +static char *servers_list[64]={NULL}; static void server_list_timer(XtPointer client_data, XtIntervalId * id); static int get_server_list(char **list, char *errbuf, int n_errbuf); @@ -91,49 +124,376 @@ static bool lan_mode; /* true for LAN mode, false when Meta mode */ static int num_lanservers_timer = 0; -struct server_scan *lan, *meta; + +/**************************************************************************** + Aligns widths of connect dialog labels and texts. +****************************************************************************/ +static void connectdlg_align_labels(void) +{ + Dimension width, s_width, t_width, max_width = 0; + +#if IS_BETA_VERSION + XtVaGetValues(connectdlg_beta_label, XtNwidth, &width, NULL); + max_width = width; +#endif + + XtVaGetValues(connectdlg_select_label, XtNwidth, &width, NULL); + if (width > max_width) { + max_width = width; + } + XtVaGetValues(connectdlg_message_label, XtNwidth, &width, NULL); + if (width > max_width) { + max_width = width; + } + + /* FIXME: Replace 7 with proper XtN* variable value */ + XtVaGetValues(connectdlg_host_label, XtNwidth, &width, NULL); + XtVaGetValues(connectdlg_host_text, XtNwidth, &t_width, NULL); + s_width = width; + if (width + 7 + t_width > max_width) { + max_width = width + 7 + t_width; + } + XtVaGetValues(connectdlg_port_label, XtNwidth, &width, NULL); + XtVaGetValues(connectdlg_port_text, XtNwidth, &t_width, NULL); + if (width > s_width) { + s_width = width; + } + if (width + 7 + t_width > max_width) { + max_width = width + 7 + t_width; + } + XtVaGetValues(connectdlg_login_label, XtNwidth, &width, NULL); + XtVaGetValues(connectdlg_login_text, XtNwidth, &t_width, NULL); + if (width > s_width) { + s_width = width; + } + if (width + 7 + t_width > max_width) { + max_width = width + 7 + t_width; + } + XtVaGetValues(connectdlg_password_label, XtNwidth, &width, NULL); + XtVaGetValues(connectdlg_password_text, XtNwidth, &t_width, NULL); + if (width > s_width) { + s_width = width; + } + if (width + 7 + t_width > max_width) { + max_width = width + 7 + t_width; + } + XtVaGetValues(connectdlg_verify_label, XtNwidth, &width, NULL); + XtVaGetValues(connectdlg_verify_text, XtNwidth, &t_width, NULL); + if (width > s_width) { + s_width = width; + } + if (width + 7 + t_width > max_width) { + max_width = width + 7 + t_width; + } + +#if IS_BETA_VERSION + XtVaSetValues(connectdlg_beta_label, XtNwidth, max_width, NULL); +#endif + XtVaSetValues(connectdlg_select_label, XtNwidth, max_width, NULL); + XtVaSetValues(connectdlg_message_label, XtNwidth, max_width, NULL); + XtVaSetValues(connectdlg_message_label, XtNresizable, False, NULL); + + XtVaSetValues(connectdlg_host_label, XtNwidth, s_width, NULL); + XtVaSetValues(connectdlg_port_label, XtNwidth, s_width, NULL); + XtVaSetValues(connectdlg_login_label, XtNwidth, s_width, NULL); + XtVaSetValues(connectdlg_password_label, XtNwidth, s_width, NULL); + XtVaSetValues(connectdlg_verify_label, XtNwidth, s_width, NULL); + + XtVaSetValues(connectdlg_host_text, XtNresizable, True, NULL); + XtVaSetValues(connectdlg_host_text, XtNwidth, max_width - s_width - 7, + NULL); + XtVaSetValues(connectdlg_host_text, XtNresizable, False, NULL); + XtVaSetValues(connectdlg_port_text, XtNresizable, True, NULL); + XtVaSetValues(connectdlg_port_text, XtNwidth, max_width - s_width - 7, + NULL); + XtVaSetValues(connectdlg_port_text, XtNresizable, False, NULL); + XtVaSetValues(connectdlg_login_text, XtNresizable, True, NULL); + XtVaSetValues(connectdlg_login_text, XtNwidth, max_width - s_width - 7, + NULL); + XtVaSetValues(connectdlg_login_text, XtNresizable, False, NULL); + XtVaSetValues(connectdlg_password_text, XtNresizable, True, NULL); + XtVaSetValues(connectdlg_password_text, XtNwidth, max_width - s_width - 7, + NULL); + XtVaSetValues(connectdlg_password_text, XtNresizable, False, NULL); + XtVaSetValues(connectdlg_verify_text, XtNresizable, True, NULL); + XtVaSetValues(connectdlg_verify_text, XtNwidth, max_width - s_width - 7, + NULL); + XtVaSetValues(connectdlg_verify_text, XtNresizable, False, NULL); +} /************************************************************************** - really close and destroy the dialog. + Creates connect dialog. **************************************************************************/ -void really_close_connection_dialog(void) +static void connectdlg_create(void) { - /* PORTME */ + char buf[64]; + + if (connectdlg_shell) { + return; + } + + connectdlg_shell = + I_IN(I_T(XtCreatePopupShell("connectdialog", topLevelShellWidgetClass, + toplevel, NULL, 0))); + connectdlg_form = + XtVaCreateManagedWidget("connectform", formWidgetClass, + connectdlg_shell, NULL); + +#if IS_BETA_VERSION + connectdlg_beta_label = + I_L(XtVaCreateManagedWidget("connbetalabel", labelWidgetClass, + connectdlg_form, + XtNresizable, True, + XtNjustify, XtJustifyCenter, + XtNlabel, beta_message(), + NULL)); +#endif + + connectdlg_select_label = + I_L(XtVaCreateManagedWidget("connselectlabel", labelWidgetClass, + connectdlg_form, + XtNresizable, True, +#if IS_BETA_VERSION + XtNfromVert, connectdlg_beta_label, +#endif + NULL)); + + connectdlg_host_label = + I_L(XtVaCreateManagedWidget("connhostlabel", labelWidgetClass, + connectdlg_form, + XtNresizable, True, + NULL)); + connectdlg_host_text = + XtVaCreateManagedWidget("connhosttext", asciiTextWidgetClass, + connectdlg_form, + XtNeditType, XawtextEdit, + XtNstring, server_host, + NULL); + connectdlg_port_label = + I_L(XtVaCreateManagedWidget("connportlabel", labelWidgetClass, + connectdlg_form, + XtNresizable, True, + NULL)); + fc_snprintf(buf, sizeof(buf), "%d", server_port); + connectdlg_port_text = + XtVaCreateManagedWidget("connporttext", asciiTextWidgetClass, + connectdlg_form, + XtNeditType, XawtextEdit, + XtNstring, buf, + NULL); + connectdlg_login_label = + I_L(XtVaCreateManagedWidget("connloginlabel", labelWidgetClass, + connectdlg_form, + XtNresizable, True, + NULL)); + connectdlg_login_text = + XtVaCreateManagedWidget("connlogintext", asciiTextWidgetClass, + connectdlg_form, + XtNeditType, XawtextEdit, + XtNstring, user_name, + NULL); + connectdlg_password_label = + I_L(XtVaCreateManagedWidget("connpasswordlabel", labelWidgetClass, + connectdlg_form, + XtNresizable, True, + NULL)); + connectdlg_password_text = + XtVaCreateManagedWidget("connpasswordtext", asciiTextWidgetClass, + connectdlg_form, + XtNecho, False, + XtNsensitive, False, + NULL); + connectdlg_verify_label = + I_L(XtVaCreateManagedWidget("connverifylabel", labelWidgetClass, + connectdlg_form, + XtNresizable, True, + NULL)); + connectdlg_verify_text = + XtVaCreateManagedWidget("connverifytext", asciiTextWidgetClass, + connectdlg_form, + XtNecho, False, + XtNsensitive, False, + NULL); + connectdlg_message_label = + I_L(XtVaCreateManagedWidget("connmessagelabel", labelWidgetClass, + connectdlg_form, + XtNresizable, True, + NULL)); + + connectdlg_connect_button = + I_L(XtVaCreateManagedWidget("connconnectbutton", commandWidgetClass, + connectdlg_form, + XtNlabel, _("Connect"), + NULL)); + connectdlg_lan_button = + I_L(XtVaCreateManagedWidget("connlanbutton", commandWidgetClass, + connectdlg_form, + XtNlabel, _("LAN Servers"), + NULL)); + connectdlg_meta_button = + I_L(XtVaCreateManagedWidget("connmetabutton", commandWidgetClass, + connectdlg_form, + XtNlabel, _("Metaserver"), + NULL)); + connectdlg_quit_button = + I_L(XtVaCreateManagedWidget("connquitbutton", commandWidgetClass, + connectdlg_form, + XtNlabel, _("Quit"), + NULL)); + + XtAddCallback(connectdlg_connect_button, XtNcallback, + connectdlg_connect_callback, NULL); + XtAddCallback(connectdlg_lan_button, XtNcallback, + connectdlg_lan_callback, NULL); + XtAddCallback(connectdlg_meta_button, XtNcallback, + connectdlg_meta_callback, NULL); + XtAddCallback(connectdlg_quit_button, XtNcallback, + connectdlg_quit_callback, NULL); + + XtRealizeWidget(connectdlg_shell); } /************************************************************************** - close and destroy the dialog. + Popdowns connect dialog. **************************************************************************/ -void close_connection_dialog() +static void connectdlg_popdown(void) { - if (lan) { - server_scan_finish(lan); - lan = NULL; + if (lan_scan) { + server_scan_finish(lan_scan); + lan_scan = NULL; + } + if (meta_scan) { + server_scan_finish(meta_scan); + meta_scan = NULL; } - if (meta) { - server_scan_finish(meta); - meta = NULL; + if (connectdlg_shell) { + XtPopdown(connectdlg_shell); } +} - if (shell) { - XtDestroyWidget(shell); - shell = NULL; +/************************************************************************** + Destroys connect dialog. +**************************************************************************/ +static void connectdlg_destroy(void) +{ + if (connectdlg_shell) { + connectdlg_popdown(); + XtDestroyWidget(connectdlg_shell); + connectdlg_shell = NULL; } +} - if (meta_dialog_shell) { - XtDestroyWidget(meta_dialog_shell); - meta_dialog_shell = NULL; +/************************************************************************** + Popups connect dialog. +**************************************************************************/ +static void connectdlg_popup(void) +{ + if (!connectdlg_shell) { + connectdlg_create(); } + + connectdlg_align_labels(); + xaw_set_relative_position(toplevel, connectdlg_shell, 20, 20); + XtPopup(connectdlg_shell, XtGrabNone); } -/**************************************************************** - FIXME: should be used to give some feedback on entering the password. - I couldn't get it to work (and I thought the GTK API reference was bad) -mck -*****************************************************************/ -static void password_callback(Widget w, XtPointer client_data, - XtPointer call_data) +/**************************************************************************** + Callback for Connect button. +****************************************************************************/ +void connectdlg_connect_callback(Widget w, XtPointer client_data, + XtPointer call_data) +{ + XtPointer pxp; + char errbuf[512]; + struct packet_authentication_reply reply; + + switch (connection_status) { + case LOGIN_TYPE: + XtVaGetValues(connectdlg_host_text, XtNstring, &pxp, NULL); + sz_strlcpy(server_host, (char *)pxp); + XtVaGetValues(connectdlg_port_text, XtNstring, &pxp, NULL); + sscanf((char *)pxp, "%d", &server_port); + XtVaGetValues(connectdlg_login_text, XtNstring, &pxp, NULL); + sz_strlcpy(user_name, (char *)pxp); + if (connect_to_server(user_name, server_host, server_port, + errbuf, sizeof(errbuf)) != -1) { + popup_start_page(); + connectdlg_destroy(); + XtSetSensitive(toplevel, True); + return; + } else { + XtVaSetValues(connectdlg_message_label, XtNlabel, errbuf, NULL); + output_window_append(ftc_client, errbuf); + } + break; + case NEW_PASSWORD_TYPE: + XtVaGetValues(connectdlg_password_text, XtNstring, &pxp, NULL); + sz_strlcpy(password, (char *)pxp); + XtVaGetValues(connectdlg_verify_text, XtNstring, &pxp, NULL); + sz_strlcpy(reply.password, (char *)pxp); + if (strncmp(reply.password, password, MAX_LEN_NAME) == 0) { + password[0] = '\0'; + send_packet_authentication_reply(&client.conn, &reply); + XtVaSetValues(connectdlg_message_label, XtNlabel, "", NULL); + XtVaSetValues(connectdlg_password_text, XtNsensitive, False, NULL); + XtVaSetValues(connectdlg_verify_text, XtNsensitive, False, NULL); + } else { + XtVaSetValues(connectdlg_password_text, XtNstring, "", NULL); + XtVaSetValues(connectdlg_verify_text, XtNstring, "", NULL); + XtVaSetValues(connectdlg_message_label, XtNlabel, + _("Passwords don't match, enter password."), NULL); + output_window_append(ftc_client, + _("Passwords don't match, enter password.")); + } + break; + case ENTER_PASSWORD_TYPE: + XtVaGetValues(connectdlg_verify_text, XtNstring, &pxp, NULL); + sz_strlcpy(reply.password, (char *)pxp); + send_packet_authentication_reply(&client.conn, &reply); + + XtVaSetValues(connectdlg_message_label, XtNlabel, "", NULL); + XtVaSetValues(connectdlg_password_text, XtNsensitive, False, NULL); + XtVaSetValues(connectdlg_verify_text, XtNsensitive, False, NULL); + break; + case WAITING_TYPE: + break; + } +} + +/**************************************************************************** + Callback fir LAN Servers button. +****************************************************************************/ +void connectdlg_lan_callback(Widget w, XtPointer client_data, + XtPointer call_data) +{ + lan_mode = true; + if (!lan_scan) { + lan_scan = server_scan_begin(SERVER_SCAN_LOCAL, server_scan_error); + } + connectdlg_serverlist_popup(); +} + +/**************************************************************************** + Callback for Metaserver button. +****************************************************************************/ +void connectdlg_meta_callback(Widget w, XtPointer client_data, + XtPointer call_data) { - /* FIXME */ + lan_mode = false; + if (!meta_scan) { + meta_scan = server_scan_begin(SERVER_SCAN_GLOBAL, server_scan_error); + } + connectdlg_serverlist_popup(); +} + +/**************************************************************************** + Callback for Quit button. +****************************************************************************/ +void connectdlg_quit_callback(Widget w, XtPointer client_data, + XtPointer call_data) +{ + connectdlg_destroy(); + xaw_ui_exit(); } /************************************************************************** @@ -143,17 +503,14 @@ void handle_authentication_req(enum authentication_type type, const char *message) { - XtVaSetValues(iinput, XtNstring, "", NULL); - XtVaSetValues(connw, XtNlabel, _("Next"), NULL); - XtSetSensitive(connw, TRUE); - XtVaSetValues(imsg, XtNlabel, message, NULL); + XtVaSetValues(connectdlg_message_label, XtNlabel, message, NULL); switch (type) { case AUTH_NEWUSER_FIRST: - dialog_config = NEW_PASSWORD_TYPE; - break; case AUTH_NEWUSER_RETRY: - dialog_config = NEW_PASSWORD_TYPE; + XtVaSetValues(connectdlg_password_text, XtNsensitive, True, NULL); + XtVaSetValues(connectdlg_verify_text, XtNsensitive, True, NULL); + connection_status = NEW_PASSWORD_TYPE; break; case AUTH_LOGIN_FIRST: /* if we magically have a password already present in 'password' @@ -165,21 +522,20 @@ send_packet_authentication_reply(&client.conn, &reply); return; } else { - dialog_config = ENTER_PASSWORD_TYPE; + XtVaSetValues(connectdlg_password_text, XtNsensitive, True, NULL); + XtVaSetValues(connectdlg_verify_text, XtNsensitive, False, NULL); + connection_status = ENTER_PASSWORD_TYPE; } break; case AUTH_LOGIN_RETRY: - dialog_config = ENTER_PASSWORD_TYPE; + XtVaSetValues(connectdlg_password_text, XtNsensitive, True, NULL); + XtVaSetValues(connectdlg_verify_text, XtNsensitive, False, NULL); + connection_status = ENTER_PASSWORD_TYPE; break; default: log_error("Unsupported authentication type %d: %s.", type, message); break; } - - XtPopup(shell, XtGrabNone); - XtSetKeyboardFocus(toplevel, shell); - XtVaSetValues(ilabel, XtNlabel, _("Pass"), NULL); - XtVaSetValues(iinput, XtNecho, FALSE, NULL); } /**************************************************************** @@ -187,67 +543,19 @@ *****************************************************************/ void gui_server_connect(void) { - Widget form; - char buf[512]; - - if (shell) { - return; - } - - dialog_config = LOGIN_TYPE; + connection_status = LOGIN_TYPE; XtSetSensitive(turn_done_button, FALSE); - XtSetSensitive(toplevel, FALSE); - - I_T(shell=XtCreatePopupShell("connectdialog", transientShellWidgetClass, - toplevel, NULL, 0)); - - form=XtVaCreateManagedWidget("cform", formWidgetClass, shell, NULL); - - I_LW(XtVaCreateManagedWidget("cheadline", labelWidgetClass, form, NULL)); - - I_L(imsg = XtVaCreateManagedWidget("cmsgl", labelWidgetClass, form, NULL)); - - I_L(ilabel = XtVaCreateManagedWidget("cnamel", labelWidgetClass, form, NULL)); - iinput = XtVaCreateManagedWidget("cnamei", asciiTextWidgetClass, form, - XtNstring, user_name, NULL); - textsrc = XawTextGetSource(iinput); - - I_L(XtVaCreateManagedWidget("chostl", labelWidgetClass, form, NULL)); - ihost=XtVaCreateManagedWidget("chosti", asciiTextWidgetClass, form, - XtNstring, server_host, NULL); - - fc_snprintf(buf, sizeof(buf), "%d", server_port); - - I_L(XtVaCreateManagedWidget("cportl", labelWidgetClass, form, NULL)); - iport=XtVaCreateManagedWidget("cporti", asciiTextWidgetClass, form, - XtNstring, buf, NULL); - - I_L(connw=XtVaCreateManagedWidget("cconnectc", commandWidgetClass, - form, NULL)); - I_L(metaw=XtVaCreateManagedWidget("cmetac", commandWidgetClass, form, NULL)); - I_L(lanw=XtVaCreateManagedWidget("clanc", commandWidgetClass, form, NULL)); - I_L(quitw=XtVaCreateManagedWidget("cquitc", commandWidgetClass, form, NULL)); - -#if IS_BETA_VERSION - XtVaCreateManagedWidget("cbetaline", labelWidgetClass, form, - XtNlabel, beta_message(), - NULL); -#endif - - XtAddCallback(textsrc, XtNcallback, password_callback, NULL); - XtAddCallback(connw, XtNcallback, connect_callback, NULL); - XtAddCallback(quitw, XtNcallback, quit_callback, NULL); - XtAddCallback(metaw, XtNcallback, connect_meta_callback, (XtPointer)shell); - XtAddCallback(lanw, XtNcallback, connect_lan_callback, (XtPointer)shell); - - xaw_set_relative_position(toplevel, shell, 30, 0); +/* XtSetSensitive(toplevel, FALSE);*/ if (auto_connect) { - XtPopdown(shell); + /* FIXME */ } else { - XtPopup(shell, XtGrabNone); - XtSetKeyboardFocus(toplevel, shell); + connectdlg_popup(); +/* + XtPopup(connectdlg_shell, XtGrabNone); + XtSetKeyboardFocus(toplevel, connectdlg_shell); +*/ } } @@ -265,269 +573,211 @@ *****************************************************************/ void connectdlg_key_connect(Widget w) { - x_simulate_button_click(connw); + x_simulate_button_click(connectdlg_connect_button); } -/**************************************************************** -... -*****************************************************************/ -void quit_callback(Widget w, XtPointer client_data, XtPointer call_data) -{ - xaw_ui_exit(); -} +/**************************************************************************** + SERVERS LIST DIALOG +****************************************************************************/ -/**************************************************************** - send connect and/or authentication requests to the server. -*****************************************************************/ -void connect_callback(Widget w, XtPointer client_data, - XtPointer call_data) -{ - XtPointer dp; - char errbuf[512]; - struct packet_authentication_reply reply; - - switch (dialog_config) { - case LOGIN_TYPE: - XtVaGetValues(iinput, XtNstring, &dp, NULL); - sz_strlcpy(user_name, (char*)dp); - XtVaGetValues(ihost, XtNstring, &dp, NULL); - sz_strlcpy(server_host, (char*)dp); - XtVaGetValues(iport, XtNstring, &dp, NULL); - sscanf((char*)dp, "%d", &server_port); - - if (connect_to_server(user_name, server_host, server_port, - errbuf, sizeof(errbuf)) != -1) { - if (meta_dialog_shell) { - XtDestroyWidget(meta_dialog_shell); - meta_dialog_shell=0; - } - - XtSetSensitive(toplevel, True); - popup_start_page(); - return; - } else { - output_window_append(ftc_client, errbuf); - } - case NEW_PASSWORD_TYPE: - XtVaGetValues(iinput, XtNstring, &dp, NULL); - sz_strlcpy(password, (char*)dp); - XtVaSetValues(imsg, XtNlabel, _("Verify Password"), NULL); - XtVaSetValues(iinput, XtNstring, "", NULL); - dialog_config = VERIFY_PASSWORD_TYPE; - break; - case VERIFY_PASSWORD_TYPE: - XtVaGetValues(iinput, XtNstring, &dp, NULL); - sz_strlcpy(reply.password, (char*)dp); - if (strncmp(reply.password, password, MAX_LEN_NAME) == 0) { - XtSetSensitive(connw, FALSE); - memset(password, 0, MAX_LEN_NAME); - password[0] = '\0'; - send_packet_authentication_reply(&client.conn, &reply); - } else { - XtVaSetValues(iinput, XtNstring, "", NULL); - XtVaSetValues(imsg, XtNlabel, - _("Passwords don't match, enter password."), NULL); - dialog_config = NEW_PASSWORD_TYPE; - } - - break; - case ENTER_PASSWORD_TYPE: - XtSetSensitive(connw, FALSE); - XtVaGetValues(iinput, XtNstring, &dp, NULL); - sz_strlcpy(reply.password, (char*)dp); - send_packet_authentication_reply(&client.conn, &reply); - break; - default: - log_error("Unsupported dialog configuration: %d", dialog_config) - break; - } -} - -/************************************************************************** +/**************************************************************************** Callback function for when there's an error in the server scan. -**************************************************************************/ -static void server_scan_error(struct server_scan *scan, - const char *message) +****************************************************************************/ +void server_scan_error(struct server_scan *scan, const char *message) { output_window_append(ftc_client, message); log_normal("%s", message); switch (server_scan_get_type(scan)) { case SERVER_SCAN_LOCAL: - server_scan_finish(lan); - lan = NULL; + server_scan_finish(lan_scan); + lan_scan = NULL; break; case SERVER_SCAN_GLOBAL: - server_scan_finish(meta); - meta = NULL; + server_scan_finish(meta_scan); + meta_scan = NULL; break; case SERVER_SCAN_LAST: break; } } -/**************************************************************** - Callback function for Metaserver button -*****************************************************************/ -void connect_meta_callback(Widget w, XtPointer client_data, - XtPointer call_data) -{ - lan_mode = false; - if (!meta) { - meta = server_scan_begin(SERVER_SCAN_GLOBAL, server_scan_error); - } - if (meta_dialog_shell) { - /* Metaserver window already poped up */ - return; - } - create_meta_dialog((Widget)client_data); -} - -/**************************************************************** - Callback function for LAN Server button -*****************************************************************/ -void connect_lan_callback(Widget w, XtPointer client_data, - XtPointer call_data) -{ - lan_mode = true; - if (!lan) { - lan = server_scan_begin(SERVER_SCAN_LOCAL, server_scan_error); - } - if (meta_dialog_shell) { - /* Metaserver window already poped up */ - return; - } - create_meta_dialog((Widget)client_data); -} - -/************************************************************************** +/**************************************************************************** This function updates the list of servers after the server dialog has been - displayed. LAN servers updated every 100 ms for 5 seconds, metaserver - updated only once. -**************************************************************************/ + displayed. LAN servers updated every 250 ms for 5 seconds, metaserver + updated every 500 ms for 2 seconds. +****************************************************************************/ static void server_list_timer(XtPointer meta_list, XtIntervalId * id) { char errbuf[128]; - if (!meta_dialog_shell) { + if (!connectdlg_serverlist_shell) { return; } - if (get_server_list(server_list, errbuf, sizeof(errbuf))!=-1) { - XawListChange(meta_list, server_list, 0, 0, True); - } else if (!lan_mode) { + if (get_server_list(servers_list, errbuf, sizeof(errbuf)) != -1) { + XawListChange(meta_list, servers_list, 0, 0, True); + } +/* + else if (!lan_mode) { output_window_append(ftc_client, errbuf); } +*/ num_lanservers_timer++; if (lan_mode) { - if (num_lanservers_timer == 50 && lan_mode) { - server_scan_finish(lan); + if (num_lanservers_timer == 20) { + server_scan_finish(lan_scan); + lan_scan = NULL; num_lanservers_timer = 0; return; } - (void)XtAppAddTimeOut(app_context, 100, server_list_timer, + (void)XtAppAddTimeOut(app_context, 250, server_list_timer, (XtPointer)meta_list); } else { - num_lanservers_timer = 0; + if (num_lanservers_timer == 4) { + server_scan_finish(meta_scan); + meta_scan = NULL; + num_lanservers_timer = 0; + return; + } + (void)XtAppAddTimeOut(app_context, 500, server_list_timer, + (XtPointer)meta_list); } } -/**************************************************************** -... -*****************************************************************/ -void create_meta_dialog(Widget caller) +/**************************************************************************** + Creates Servers List dialog. +****************************************************************************/ +static void connectdlg_serverlist_create(void) +{ + connectdlg_serverlist_shell = + I_IN(I_T(XtCreatePopupShell("serverlistdialog", + topLevelShellWidgetClass, + toplevel, NULL, 0))); + + connectdlg_serverlist_form = + XtVaCreateManagedWidget("serverlistform", formWidgetClass, + connectdlg_serverlist_shell, NULL); + connectdlg_serverlist_legend_label = + I_L(XtVaCreateManagedWidget("legendlabel", labelWidgetClass, + connectdlg_serverlist_form, + XtNresizable, True, + NULL)); + connectdlg_serverlist_viewport = + XtVaCreateManagedWidget("viewport", viewportWidgetClass, + connectdlg_serverlist_form, NULL); + connectdlg_serverlist_list = + XtVaCreateManagedWidget("serverlist", listWidgetClass, + connectdlg_serverlist_viewport, NULL); + connectdlg_serverlist_update_button = + XtVaCreateManagedWidget("updatebutton", commandWidgetClass, + connectdlg_serverlist_form, + XtNlabel, _("Update"), + NULL); + connectdlg_serverlist_close_button = + XtVaCreateManagedWidget("closebutton", commandWidgetClass, + connectdlg_serverlist_form, + XtNlabel, _("Close"), + NULL); + + XtAddCallback(connectdlg_serverlist_update_button, XtNcallback, + connectdlg_serverlist_update_callback, NULL); + XtAddCallback(connectdlg_serverlist_close_button, XtNcallback, + connectdlg_serverlist_close_callback, NULL); + XtAddCallback(connectdlg_serverlist_list, XtNcallback, + connectdlg_serverlist_list_callback, NULL); + + (void)XtAppAddTimeOut(app_context, 1, server_list_timer, + (XtPointer)connectdlg_serverlist_list); + + XtRealizeWidget(connectdlg_serverlist_shell); +} + +/**************************************************************************** + Popups Servers List dialog. +****************************************************************************/ +void connectdlg_serverlist_popup(void) +{ + if (!connectdlg_serverlist_shell) { + connectdlg_serverlist_create(); + } + + xaw_set_relative_position(toplevel, connectdlg_serverlist_shell, 15, 15); + XtPopup(connectdlg_serverlist_shell, XtGrabNone); +} + +/**************************************************************************** + Destroys Servers List dialog. +****************************************************************************/ +static void connectdlg_serverlist_destroy(void) { - Widget shell, form, label, list, update, close, viewport; - - I_T(shell=XtCreatePopupShell("metadialog", transientShellWidgetClass, - toplevel, NULL, 0)); - meta_dialog_shell=shell; - - form=XtVaCreateManagedWidget("metaform", formWidgetClass, shell, NULL); - - I_L(label=XtVaCreateManagedWidget("legend", labelWidgetClass, form, NULL)); - viewport = XtVaCreateManagedWidget("metaviewport", - viewportWidgetClass, form, NULL); - list = XtVaCreateManagedWidget("metalist", listWidgetClass, viewport, - NULL); - I_L(update=XtVaCreateManagedWidget("update", commandWidgetClass, - form, NULL)); - I_L(close=XtVaCreateManagedWidget("closecommand", commandWidgetClass, - form, NULL)); - - XtAddCallback(list, XtNcallback, meta_list_callback, NULL); - XtAddCallback(list, XtNdestroyCallback, meta_list_destroy, NULL); - XtAddCallback(update, XtNcallback, meta_update_callback, (XtPointer)list); - XtAddCallback(close, XtNcallback, meta_close_callback, NULL); - - (void)XtAppAddTimeOut(app_context, 1, server_list_timer, (XtPointer)list); - - /* XtRealizeWidget(shell); */ - - XtVaSetValues(shell, XtNwidth, 700, NULL); - XtVaSetValues(viewport, XtNwidth, 700, NULL); - XtVaSetValues(viewport, XtNheight, 350, NULL); - XtVaSetValues(list, XtNwidth, 700, NULL); - XtVaSetValues(label, XtNwidth, 700, NULL); - - xaw_set_relative_position(caller, shell, 0, 90); - XtPopup(shell, XtGrabNone); - - XtSetKeyboardFocus(toplevel, shell); -} + int i; -/**************************************************************** -... -*****************************************************************/ -void meta_update_callback(Widget w, XtPointer client_data, XtPointer call_data) -{ - if (num_lanservers_timer == 0) { - if (lan_mode) { - if (lan) { - server_list_timer((Widget)client_data, NULL); - } - } else { - server_list_timer((Widget)client_data, NULL); + if (lan_scan) { + server_scan_finish(lan_scan); + lan_scan = NULL; + } + if (meta_scan) { + server_scan_finish(meta_scan); + meta_scan = NULL; + } + /* FIXME: Replace magic 64 with proper constant. */ + for (i = 0; i < 64; i++) { + if (servers_list[i]) { + free(servers_list[i]); + servers_list[i] = NULL; } } + if (connectdlg_serverlist_shell) { + XtDestroyWidget(connectdlg_serverlist_shell); + connectdlg_serverlist_shell = NULL; + } } -/**************************************************************** -... -*****************************************************************/ -void meta_close_callback(Widget w, XtPointer client_data, XtPointer call_data) +/**************************************************************************** + Callback for Update button. +****************************************************************************/ +void connectdlg_serverlist_update_callback(Widget w, XtPointer client_data, + XtPointer call_data) { - XtDestroyWidget(meta_dialog_shell); - meta_dialog_shell=0; + if (lan_mode) { + if (!lan_scan) { + lan_scan = server_scan_begin(SERVER_SCAN_LOCAL, server_scan_error); + } + if (num_lanservers_timer == 0) { + server_list_timer(connectdlg_serverlist_list, NULL); + } + } else { + if (!meta_scan) { + meta_scan = server_scan_begin(SERVER_SCAN_GLOBAL, server_scan_error); + } + if (num_lanservers_timer == 0) { + server_list_timer(connectdlg_serverlist_list, NULL); + } + } } -/**************************************************************** -... -*****************************************************************/ -void meta_list_callback(Widget w, XtPointer client_data, XtPointer call_data) +/**************************************************************************** + Callback for Close button. +****************************************************************************/ +void connectdlg_serverlist_close_callback(Widget w, XtPointer client_data, + XtPointer call_data) +{ + connectdlg_serverlist_destroy(); +} + +/**************************************************************************** + Callback for choosing server from serverlist. +****************************************************************************/ +void connectdlg_serverlist_list_callback(Widget w, XtPointer client_data, + XtPointer call_data) { - XawListReturnStruct *ret=XawListShowCurrent(w); + XawListReturnStruct *ret = XawListShowCurrent(w); char name[64], port[16]; - sscanf(ret->string,"%s %s\n",name,port); - XtVaSetValues(ihost, XtNstring, name, NULL); - XtVaSetValues(iport, XtNstring, port, NULL); -} - -/**************************************************************** -... -*****************************************************************/ -void meta_list_destroy(Widget w, XtPointer client_data, XtPointer call_data) -{ - int i; - - for (i = 0; server_list[i]; i++) { - free(server_list[i]); - server_list[i]=NULL; - } - if (num_lanservers_timer != 0) { - server_scan_finish(lan); - } + sscanf(ret->string, "%s %s\n", name, port); + XtVaSetValues(connectdlg_host_text, XtNstring, name, NULL); + XtVaSetValues(connectdlg_port_text, XtNstring, port, NULL); } /************************************************************************** @@ -538,27 +788,47 @@ { char line[256]; const struct server_list *server_list = NULL; + enum server_scan_status scan_stat; if (lan_mode) { - if (lan) { - server_scan_poll(lan); - server_list = server_scan_get_list(lan); + if (lan_scan) { + server_scan_poll(lan_scan); + server_list = server_scan_get_list(lan_scan); if (server_list == NULL) { if (num_lanservers_timer == 0) { - *list = fc_strdup(" ");; + if (*list) { + free(*list); + } + *list = fc_strdup(" "); return 0; } else { return -1; } } + } else { + return -1; } } else { - if (meta) { - server_scan_poll(meta); - server_list = server_scan_get_list(meta); - if (!server_list) { - return -1; + if (meta_scan) { + scan_stat = server_scan_poll(meta_scan); + if (scan_stat >= SCAN_STATUS_PARTIAL) { + server_list = server_scan_get_list(meta_scan); + if (server_list == NULL) { + if (num_lanservers_timer == 0) { + if (*list) { + free(*list); + } + *list = fc_strdup(" "); + return 0; + } else { + return -1; + } + } + } else { + return -1; } + } else { + return -1; } } @@ -577,6 +847,24 @@ delete_server_list(server_list); } */ - *list=NULL; + *list = NULL; return 0; } + +/************************************************************************** + Really closes and destroys the dialog. +**************************************************************************/ +void really_close_connection_dialog(void) +{ + /* PORTME */ +} + +/************************************************************************** + Closes and destroys the dialog. +**************************************************************************/ +void close_connection_dialog() +{ + connectdlg_serverlist_destroy(); + connectdlg_destroy(); +} + diff -Nru freeciv-2.3.0/client/gui-xaw/Freeciv.h freeciv-2.3.1/client/gui-xaw/Freeciv.h --- freeciv-2.3.0/client/gui-xaw/Freeciv.h 2011-08-08 04:33:56.000000000 +0000 +++ freeciv-2.3.1/client/gui-xaw/Freeciv.h 2011-11-19 20:26:34.000000000 +0000 @@ -2,7 +2,7 @@ /* DO NOT EDIT THIS FILE, EDIT ../../data/Freeciv */ /**************************************************/ "Freeciv*gotAppDefFile: True", -"Freeciv*version: 2.3.0", +"Freeciv*version: 2.3.1", "Freeciv.title: Freeciv", "Freeciv.iconName: Freeciv", "Freeciv*borderColor: black", @@ -33,80 +33,94 @@ "Freeciv*.connectdialog.title: _(\"Connect to Freeciv Server\")", "Freeciv*connectdialog*translations: #override \ Return: key-dialog-connect-connect()", -"Freeciv*connectdialog.*.cheadline.label: _(\"Freeciv Server Selection\")", -"Freeciv*connectdialog.*.cheadline.width: 300", -"Freeciv*connectdialog.*.cmsgl.label:", -"Freeciv*connectdialog.*.cmsgl.fromVert: cheadline", -"Freeciv*connectdialog.*.cmsgl.resizable: True", -"Freeciv*connectdialog.*.cnamel.label: _(\"Name\")", -"Freeciv*connectdialog.*.cnamel.fromVert: cmsgl", -"Freeciv*connectdialog.*.cnamei.fromVert: cmsgl", -"Freeciv*connectdialog.*.cnamei.fromHoriz: cnamel", -"Freeciv*connectdialog.*.cnamei.*.editType: edit", -"Freeciv*connectdialog.*.cnamei.width: 256", -"Freeciv*connectdialog.*.chostl.label: _(\"Host\")", -"Freeciv*connectdialog.*.chostl.fromVert: cnamel", -"Freeciv*connectdialog.*.chosti.fromVert: cnamel", -"Freeciv*connectdialog.*.chosti.fromHoriz: chostl", -"Freeciv*connectdialog.*.chosti.*.editType: edit", -"Freeciv*connectdialog.*.chosti.width: 256", -"Freeciv*connectdialog.*.cportl.label: _(\"Port\")", -"Freeciv*connectdialog.*.cportl.fromVert: chostl", -"Freeciv*connectdialog.*.cporti.fromVert: chostl", -"Freeciv*connectdialog.*.cporti.fromHoriz: cportl", -"Freeciv*connectdialog.*.cporti.*.editType: edit", -"Freeciv*connectdialog.*.cporti.width: 256", -"Freeciv*connectdialog.*.cconnectc.label: _(\"Connect\")", -"Freeciv*connectdialog.*.cconnectc.fromVert: cportl", -"Freeciv*connectdialog.*.cmetac.label: _(\"Metaserver\")", -"Freeciv*connectdialog.*.cmetac.fromVert: cportl", -"Freeciv*connectdialog.*.cmetac.fromHoriz: cconnectc", -"Freeciv*connectdialog.*.clanc.label: _(\"LAN Servers\")", -"Freeciv*connectdialog.*.clanc.fromVert: cportl", -"Freeciv*connectdialog.*.clanc.fromHoriz: cmetac", -"Freeciv*connectdialog.*.cquitc.label: _(\"Quit\")", -"Freeciv*connectdialog.*.cquitc.fromVert: cportl", -"Freeciv*connectdialog.*.cquitc.fromHoriz: clanc", -"Freeciv*connectdialog.*.cbetaline.fromVert: cconnectc", -"Freeciv*connectdialog.*.cbetaline.justify: left", -"Freeciv*connectdialog.*.cbetaline.background: grey", -"Freeciv*connectdialog.*.cbetaline.foreground: red", -"Freeciv*connectdialog.*.cbetaline.width: 300", -"Freeciv*metadialog.title: _(\"Freeciv Server List\")", -"Freeciv*metadialog.allowShellResize: True", -"Freeciv*metadialog.*.legend.label: _(\"\ +"Freeciv*connectdialog.*.connbetalabel.justify: left", +"Freeciv*connectdialog.*.connbetalabel.background: grey", +"Freeciv*connectdialog.*.connbetalabel.foreground: red", +"Freeciv*connectdialog.*.connbetalabel.width: 300", +"Freeciv*connectdialog.*.connselectlabel.label: _(\"Freeciv Server Selection\")", +"Freeciv*connectdialog.*.connselectlabel.width: 300", +"Freeciv*connectdialog.*.connhostlabel.label: _(\"Host\")", +"Freeciv*connectdialog.*.connhostlabel.fromVert: connselectlabel", +"Freeciv*connectdialog.*.connhosttext.fromVert: connselectlabel", +"Freeciv*connectdialog.*.connhosttext.fromHoriz: connhostlabel", +"Freeciv*connectdialog.*.connhosttext.*.editType: edit", +"Freeciv*connectdialog.*.connhosttext.width: 256", +"Freeciv*connectdialog.*.connportlabel.label: _(\"Port\")", +"Freeciv*connectdialog.*.connportlabel.fromVert: connhostlabel", +"Freeciv*connectdialog.*.connporttext.fromVert: connhostlabel", +"Freeciv*connectdialog.*.connporttext.fromHoriz: connportlabel", +"Freeciv*connectdialog.*.connporttext.*.editType: edit", +"Freeciv*connectdialog.*.connporttext.width: 256", +"Freeciv*connectdialog.*.connloginlabel.label: _(\"Name\")", +"Freeciv*connectdialog.*.connloginlabel.fromVert: connportlabel", +"Freeciv*connectdialog.*.connlogintext.fromVert: connportlabel", +"Freeciv*connectdialog.*.connlogintext.fromHoriz: connloginlabel", +"Freeciv*connectdialog.*.connlogintext.*.editType: edit", +"Freeciv*connectdialog.*.connlogintext.width: 256", +"Freeciv*connectdialog.*.connpasswordlabel.label: _(\"Password\")", +"Freeciv*connectdialog.*.connpasswordlabel.fromVert: connloginlabel", +"Freeciv*connectdialog.*.connpasswordtext.fromVert: connloginlabel", +"Freeciv*connectdialog.*.connpasswordtext.fromHoriz: connpasswordlabel", +"Freeciv*connectdialog.*.connpasswordtext.*.editType: edit", +"Freeciv*connectdialog.*.connpasswordtext.width: 256", +"Freeciv*connectdialog.*.connverifylabel.label: _(\"Verify Password\")", +"Freeciv*connectdialog.*.connverifylabel.fromVert: connpasswordlabel", +"Freeciv*connectdialog.*.connverifytext.fromVert: connpasswordlabel", +"Freeciv*connectdialog.*.connverifytext.fromHoriz: connverifylabel", +"Freeciv*connectdialog.*.connverifytext.*.editType: edit", +"Freeciv*connectdialog.*.connverifytext.width: 256", +"Freeciv*connectdialog.*.connmessagelabel.label:", +"Freeciv*connectdialog.*.connmessagelabel.fromVert: connverifylabel", +"Freeciv*connectdialog.*.connmessagelabel.resizable: True", +"Freeciv*connectdialog.*.connconnectbutton.label: _(\"Connect\")", +"Freeciv*connectdialog.*.connconnectbutton.fromVert: connmessagelabel", +"Freeciv*connectdialog.*.connlanbutton.label: _(\"LAN Servers\")", +"Freeciv*connectdialog.*.connlanbutton.fromVert: connmessagelabel", +"Freeciv*connectdialog.*.connlanbutton.fromHoriz: connconnectbutton", +"Freeciv*connectdialog.*.connmetabutton.label: _(\"Metaserver\")", +"Freeciv*connectdialog.*.connmetabutton.fromVert: connmessagelabel", +"Freeciv*connectdialog.*.connmetabutton.fromHoriz: connlanbutton", +"Freeciv*connectdialog.*.connquitbutton.label: _(\"Quit\")", +"Freeciv*connectdialog.*.connquitbutton.fromVert: connmessagelabel", +"Freeciv*connectdialog.*.connquitbutton.fromHoriz: connmetabutton", +"Freeciv*serverlistdialog.title: _(\"Freeciv Server List\")", +"Freeciv*serverlistdialog.allowShellResize: True", +"Freeciv*serverlistdialog.width: 600", +"Freeciv*serverlistdialog.*.legendlabel.label: _(\"\ Server Name Port Version Status Players Comment\")", -"Freeciv*metadialog.*.legend.justify: Left", -"Freeciv*metadialog.*.legend.left: ChainLeft", -"Freeciv*metadialog.*.legend.right: ChainLeft", -"Freeciv*metadialog.*.legend.top: ChainTop", -"Freeciv*metadialog.*.legend.bottom: ChainTop", -"Freeciv*metadialog.*.legend.resizable: True", -"Freeciv*metadialog.*.metaviewport.allowVert: True", -"Freeciv*metadialog.*.metaviewport.allowHoriz: True", -"Freeciv*metadialog.*.metaviewport.useBottom: True", -"Freeciv*metadialog.*.metaviewport.fromVert: legend", -"Freeciv*metadialog.*.metalist.forceColumns: True", -"Freeciv*metadialog.*.metalist.defaultColumns: 1", -"Freeciv*metadialog.*.metalist.verticalList: True", -"Freeciv*metadialog.*.metalist.left: ChainLeft", -"Freeciv*metadialog.*.metalist.right: ChainRight", -"Freeciv*metadialog.*.metalist.top: ChainTop", -"Freeciv*metadialog.*.metalist.bottom: ChainBottom", -"Freeciv*metadialog.*.metalist.resizable: True", -"Freeciv*metadialog.*.update.label: _(\"Update\")", -"Freeciv*metadialog.*.update.left: ChainLeft", -"Freeciv*metadialog.*.update.right: ChainLeft", -"Freeciv*metadialog.*.update.top: ChainBottom", -"Freeciv*metadialog.*.update.bottom: ChainBottom", -"Freeciv*metadialog.*.update.fromVert: metaviewport", -"Freeciv*metadialog.*.closecommand.label: _(\"Close\")", -"Freeciv*metadialog.*.closecommand.left: ChainLeft", -"Freeciv*metadialog.*.closecommand.right: ChainLeft", -"Freeciv*metadialog.*.closecommand.top: ChainBottom", -"Freeciv*metadialog.*.closecommand.bottom: ChainBottom", -"Freeciv*metadialog.*.closecommand.fromVert: metaviewport", -"Freeciv*metadialog.*.closecommand.fromHoriz: update", +"Freeciv*serverlistdialog.*.legendlabel.justify: Left", +"Freeciv*serverlistdialog.*.legendlabel.left: ChainLeft", +"Freeciv*serverlistdialog.*.legendlabel.right: ChainLeft", +"Freeciv*serverlistdialog.*.legendlabel.top: ChainTop", +"Freeciv*serverlistdialog.*.legendlabel.bottom: ChainTop", +"Freeciv*serverlistdialog.*.legendlabel.resizable: True", +"Freeciv*serverlistdialog.*.viewport.allowVert: True", +"Freeciv*serverlistdialog.*.viewport.allowHoriz: True", +"Freeciv*serverlistdialog.*.viewport.useBottom: True", +"Freeciv*serverlistdialog.*.viewport.fromVert: legendlabel", +"Freeciv*serverlistdialog.*.viewport.height: 200", +"Freeciv*serverlistdialog.*.viewport.width: 600", +"Freeciv*serverlistdialog.*.serverlist.forceColumns: True", +"Freeciv*serverlistdialog.*.serverlist.defaultColumns: 1", +"Freeciv*serverlistdialog.*.serverlist.verticalList: True", +"Freeciv*serverlistdialog.*.serverlist.left: ChainLeft", +"Freeciv*serverlistdialog.*.serverlist.right: ChainRight", +"Freeciv*serverlistdialog.*.serverlist.top: ChainTop", +"Freeciv*serverlistdialog.*.serverlist.bottom: ChainBottom", +"Freeciv*serverlistdialog.*.serverlist.resizable: True", +"Freeciv*serverlistdialog.*.updatebutton.label: _(\"Update\")", +"Freeciv*serverlistdialog.*.updatebutton.left: ChainLeft", +"Freeciv*serverlistdialog.*.updatebutton.right: ChainLeft", +"Freeciv*serverlistdialog.*.updatebutton.top: ChainBottom", +"Freeciv*serverlistdialog.*.updatebutton.bottom: ChainBottom", +"Freeciv*serverlistdialog.*.updatebutton.fromVert: viewport", +"Freeciv*serverlistdialog.*.closebutton.label: _(\"Close\")", +"Freeciv*serverlistdialog.*.closebutton.left: ChainLeft", +"Freeciv*serverlistdialog.*.closebutton.right: ChainLeft", +"Freeciv*serverlistdialog.*.closebutton.top: ChainBottom", +"Freeciv*serverlistdialog.*.closebutton.bottom: ChainBottom", +"Freeciv*serverlistdialog.*.closebutton.fromVert: viewport", +"Freeciv*serverlistdialog.*.closebutton.fromHoriz: updatebutton", "Freeciv*intelpopup.title: _(\"Foreign Intelligence Report\")", "Freeciv*inteltitlelabel.background: gray84", "Freeciv*inteltitlelabel.borderColor: gray84", @@ -2190,7 +2204,7 @@ "Freeciv*outputwindowtext*String: _(\"\ Freeciv is free software and you are welcome to distribute copies of it\\n\ under certain conditions; See the \"Copying\" item on the Help menu.\\n\ -Now.. Go give'em hell!\")", +Now ... Go give 'em hell!\")", "Freeciv*inputlinetext.Width: 710", "Freeciv*inputlinetext.*.editType: edit", "Freeciv*inputlinetext.fromVert: outputwindowtext", diff -Nru freeciv-2.3.0/client/gui-xaw/helpdlg.c freeciv-2.3.1/client/gui-xaw/helpdlg.c --- freeciv-2.3.0/client/gui-xaw/helpdlg.c 2011-08-08 04:20:43.000000000 +0000 +++ freeciv-2.3.1/client/gui-xaw/helpdlg.c 2011-11-19 20:22:01.000000000 +0000 @@ -121,9 +121,7 @@ *****************************************************************/ static void set_title_topic(const struct help_item *pitem) { - if (strcmp(pitem->topic, "Freeciv") == 0 - || strcmp(pitem->topic, "About") == 0 - || strcmp(pitem->topic, _("About")) == 0) { + if (strcmp(pitem->topic, _(HELP_ABOUT_ITEM)) == 0) { xaw_set_label(help_title, freeciv_name_version()); } else { xaw_set_label(help_title, pitem->topic); @@ -1196,7 +1194,7 @@ help_update_government(pitem, top); break; case HELP_NATIONS: - help_update_nation(pitem, top, nation_by_rule_name(top)); + help_update_nation(pitem, top, nation_by_translated_name(top)); break; case HELP_TEXT: default: diff -Nru freeciv-2.3.0/client/gui-xaw/Makefile.in freeciv-2.3.1/client/gui-xaw/Makefile.in --- freeciv-2.3.0/client/gui-xaw/Makefile.in 2011-08-08 04:25:53.000000000 +0000 +++ freeciv-2.3.1/client/gui-xaw/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -128,10 +128,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -304,7 +300,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/client/gui-xaw/repodlgs.c freeciv-2.3.1/client/gui-xaw/repodlgs.c --- freeciv-2.3.0/client/gui-xaw/repodlgs.c 2011-08-08 04:20:43.000000000 +0000 +++ freeciv-2.3.1/client/gui-xaw/repodlgs.c 2011-11-19 20:22:01.000000000 +0000 @@ -1087,18 +1087,16 @@ memset(unitarray, '\0', sizeof(unitarray)); - city_list_iterate(client.conn.playing->cities, pcity) { - unit_list_iterate(client.conn.playing->units, punit) { - Unit_type_id uti = utype_index(unit_type(punit)); - - (unitarray[uti].active_count)++; - if (punit->homecity) { - output_type_iterate(o) { - unitarray[uti].upkeep[o] += punit->upkeep[o]; - } output_type_iterate_end; - } - } unit_list_iterate_end; - } city_list_iterate_end; + unit_list_iterate(client.conn.playing->units, punit) { + Unit_type_id uti = utype_index(unit_type(punit)); + + (unitarray[uti].active_count)++; + if (punit->homecity) { + output_type_iterate(o) { + unitarray[uti].upkeep[o] += punit->upkeep[o]; + } output_type_iterate_end; + } + } unit_list_iterate_end; city_list_iterate(client.conn.playing->cities,pcity) { if (VUT_UTYPE == pcity->production.kind) { diff -Nru freeciv-2.3.0/client/helpdata.c freeciv-2.3.1/client/helpdata.c --- freeciv-2.3.0/client/helpdata.c 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/client/helpdata.c 2011-11-19 20:22:07.000000000 +0000 @@ -45,9 +45,11 @@ #include "requirements.h" #include "specialist.h" #include "unit.h" +#include "version.h" /* client */ #include "client_main.h" +#include "gui_main_g.h" /* client_string */ #include "helpdata.h" @@ -123,11 +125,9 @@ } /**************************************************************************** - Insert generated data for the helpdate name. - - Currently only for terrain ("TerrainAlterations") is such a table created. + Insert generated text for the helpdata "name". ****************************************************************************/ -static void insert_generated_table(char *outbuf, size_t outlen, const char *name) +static void insert_generated_text(char *outbuf, size_t outlen, const char *name) { if (0 == strcmp (name, "TerrainAlterations")) { int rail_time = -1, clean_pollution_time = -1, clean_fallout_time = -1; @@ -243,6 +243,13 @@ } } base_type_iterate_end; } + } else if (0 == strcmp (name, "FreecivVersion")) { + const char *ver = freeciv_name_version(); + cat_snprintf(outbuf, outlen, + /* TRANS: First %s is version string, e.g., + * "Freeciv version 2.3.0-beta1 (beta version)" (translated). + * Second %s is client_string, e.g., "gui-gtk-2.0". */ + _("This is %s, %s client."), ver, client_string); } return; } @@ -906,7 +913,7 @@ nations_iterate(pnation) { pitem = new_help_item(current_type); fc_snprintf(name, sizeof(name), "%*s%s", level, "", - nation_rule_name(pnation)); + _(nation_rule_name(pnation))); pitem->topic = fc_strdup(name); pitem->text = fc_strdup(""); help_list_append(category_nodes, pitem); @@ -937,7 +944,7 @@ for (i=0; i 0 @@ -2007,7 +2007,8 @@ flush_dirty(); gui_flush(); - usleep_since_timer_start(anim_timer, 20000); + usleep_since_timer_start(anim_timer, + smooth_combat_step_msec * 2 * 1000ul); } } diff -Nru freeciv-2.3.0/client/options.c freeciv-2.3.1/client/options.c --- freeciv-2.3.0/client/options.c 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/client/options.c 2011-11-19 20:22:07.000000000 +0000 @@ -83,6 +83,7 @@ bool sound_bell_at_new_turn = FALSE; int smooth_move_unit_msec = 30; int smooth_center_slide_msec = 200; +int smooth_combat_step_msec = 10; bool do_combat_animation = TRUE; bool ai_manual_turn_done = TRUE; bool auto_center_on_unit = TRUE; @@ -287,8 +288,8 @@ const struct option_int_vtable { int (*get) (const struct option *); int (*def) (const struct option *); - int (*min) (const struct option *); - int (*max) (const struct option *); + int (*minimum) (const struct option *); + int (*maximum) (const struct option *); bool (*set) (struct option *, int); } *int_vtable; /* Specific string accessors (OT_STRING == type). */ @@ -628,7 +629,7 @@ fc_assert_ret_val(NULL != poption, 0); fc_assert_ret_val(OT_INTEGER == poption->type, 0); - return poption->int_vtable->min(poption); + return poption->int_vtable->minimum(poption); } /**************************************************************************** @@ -639,7 +640,7 @@ fc_assert_ret_val(NULL != poption, 0); fc_assert_ret_val(OT_INTEGER == poption->type, 0); - return poption->int_vtable->max(poption); + return poption->int_vtable->maximum(poption); } /**************************************************************************** @@ -1094,8 +1095,8 @@ static const struct option_int_vtable client_option_int_vtable = { .get = client_option_int_get, .def = client_option_int_def, - .min = client_option_int_min, - .max = client_option_int_max, + .minimum = client_option_int_min, + .maximum = client_option_int_max, .set = client_option_int_set }; @@ -1829,6 +1830,10 @@ "option controls how long this slide lasts. Set it to " "0 to disable mapview sliding entirely."), COC_GRAPHICS, GUI_LAST, 200, 0, 5000, NULL), + GEN_INT_OPTION(smooth_combat_step_msec, + N_("Combat animation step time (milliseconds)"), + N_("This option controls the speed of combat animation."), + COC_GRAPHICS, GUI_LAST, 10, 1, 100, NULL), GEN_BOOL_OPTION(do_combat_animation, N_("Show combat animation"), N_("Disabling this option will turn off combat animation " "between units on the mapview."), @@ -2961,8 +2966,8 @@ static const struct option_int_vtable server_option_int_vtable = { .get = server_option_int_get, .def = server_option_int_def, - .min = server_option_int_min, - .max = server_option_int_max, + .minimum = server_option_int_min, + .maximum = server_option_int_max, .set = server_option_int_set }; diff -Nru freeciv-2.3.0/client/options.h freeciv-2.3.1/client/options.h --- freeciv-2.3.0/client/options.h 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/client/options.h 2011-11-19 20:22:07.000000000 +0000 @@ -57,6 +57,7 @@ extern bool sound_bell_at_new_turn; extern int smooth_move_unit_msec; extern int smooth_center_slide_msec; +extern int smooth_combat_step_msec; extern bool do_combat_animation; extern bool ai_manual_turn_done; extern bool auto_center_on_unit; diff -Nru freeciv-2.3.0/client/packhand.c freeciv-2.3.1/client/packhand.c --- freeciv-2.3.0/client/packhand.c 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/client/packhand.c 2011-11-19 20:22:07.000000000 +0000 @@ -1613,6 +1613,7 @@ { bool boot_help; bool update_aifill_button = FALSE; + float seconds_to_phasedone; if (game.info.aifill != pinfo->aifill) { @@ -1643,12 +1644,19 @@ boot_help = (can_client_change_view() && game.info.spacerace != pinfo->spacerace); - if (game.info.timeout != 0 && pinfo->seconds_to_phasedone >= 0) { + if (has_capability("timeout_extended_range", client.conn.capability)) { + /* Centisecond resolution */ + seconds_to_phasedone = pinfo->seconds_to_phasedone2; + } else { + /* ~60 hour range */ + seconds_to_phasedone = pinfo->seconds_to_phasedone; + } + if (game.info.timeout != 0 && seconds_to_phasedone >= 0) { /* If this packet is received in the middle of a turn, this value * represents the number of seconds from now to the end of the turn * (not from the start of the turn). So we need to restart our * timer. */ - set_seconds_to_turndone(pinfo->seconds_to_phasedone); + set_seconds_to_turndone(seconds_to_phasedone); } if (boot_help) { boot_help_texts(client.conn.playing); /* reboot, after setting game.spacerace */ diff -Nru freeciv-2.3.0/client/servers.c freeciv-2.3.1/client/servers.c --- freeciv-2.3.0/client/servers.c 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/client/servers.c 2011-11-19 20:22:07.000000000 +0000 @@ -18,30 +18,30 @@ #include #include +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif #ifdef HAVE_ARPA_INET_H #include #endif #ifdef HAVE_NETDB_H #include #endif -#ifdef HAVE_NETINET_IN_H -#include -#endif #ifdef HAVE_PWD_H #include #endif #ifdef HAVE_SYS_SELECT_H #include #endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif #ifdef HAVE_SYS_TIME_H #include #endif -#ifdef HAVE_SYS_TYPES_H -#include -#endif #ifdef HAVE_SYS_UIO_H #include #endif diff -Nru freeciv-2.3.0/client/text.c freeciv-2.3.1/client/text.c --- freeciv-2.3.0/client/text.c 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/client/text.c 2011-11-19 20:22:07.000000000 +0000 @@ -729,7 +729,7 @@ int total = total_bulbs_required(client_player()); if (perturn > 0) { - int turns = MAX(1, ceil((double) (total - done) / perturn)); + int turns = MAX(1, ceil((double)total) / perturn); astr_add(&str, PL_("Progress: %d turn/advance", "Progress: %d turns/advance", @@ -826,8 +826,8 @@ const char *get_science_goal_text(Tech_type_id goal) { int steps = num_unknown_techs_for_goal(client.conn.playing, goal); - int bulbs = total_bulbs_required_for_goal(client.conn.playing, goal); - int bulbs_needed = bulbs, turns; + int bulbs_needed = total_bulbs_required_for_goal(client.conn.playing, goal); + int turns; int perturn = get_bulbs_per_turn(NULL, NULL, NULL); char buf1[256], buf2[256], buf3[256]; struct player_research* research = player_research_get(client_player()); @@ -848,7 +848,7 @@ fc_snprintf(buf1, sizeof(buf1), PL_("%d step", "%d steps", steps), steps); fc_snprintf(buf2, sizeof(buf2), - PL_("%d bulb", "%d bulbs", bulbs), bulbs); + PL_("%d bulb", "%d bulbs", bulbs_needed), bulbs_needed); if (perturn > 0) { turns = (bulbs_needed + perturn - 1) / perturn; fc_snprintf(buf3, sizeof(buf3), @@ -961,7 +961,7 @@ astr_add_line(&str, _("Global warming chance: %d%% (%+d%%/turn)"), chance, rate); } else { - astr_add_line(&str, _("Global Warming deactivated.")); + astr_add_line(&str, _("Global warming deactivated.")); } if (game.info.nuclear_winter) { @@ -1259,7 +1259,7 @@ astr_clear(&str); if (!game.info.global_warming) { - astr_add_line(&str, _("Global Warming deactivated.")); + astr_add_line(&str, _("Global warming deactivated.")); } else { int chance, rate; global_warming_scaled(&chance, &rate, 100); diff -Nru freeciv-2.3.0/common/aicore/cm.c freeciv-2.3.1/common/aicore/cm.c --- freeciv-2.3.0/common/aicore/cm.c 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/aicore/cm.c 2011-11-19 20:21:56.000000000 +0000 @@ -72,6 +72,9 @@ defines, structs, globals, forward declarations *****************************************************************************/ +/* Maximal iterations before the search loop is stoped. */ +#define CM_MAX_LOOP 25000 + #ifdef DEBUG #define GATHER_TIME_STATS #define CM_DEBUG @@ -1799,6 +1802,8 @@ const struct cm_parameter *const parameter, struct cm_result *result) { + int loop_count = 0; + #ifdef GATHER_TIME_STATS performance.current = &performance.opt; #endif @@ -1807,7 +1812,14 @@ /* search until we find a feasible solution */ while (!bb_next(state)) { - /* nothing */ + /* Limit the number of loops. */ + loop_count++; + + if (loop_count > CM_MAX_LOOP) { + log_error("Did not find a cm solution in %d iterations for %s.", + CM_MAX_LOOP, city_name(state->pcity)); + break; + } } /* convert to the caller's format */ diff -Nru freeciv-2.3.0/common/aicore/Makefile.in freeciv-2.3.1/common/aicore/Makefile.in --- freeciv-2.3.0/common/aicore/Makefile.in 2011-08-08 04:25:53.000000000 +0000 +++ freeciv-2.3.1/common/aicore/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -123,10 +123,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -299,7 +295,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/common/city.c freeciv-2.3.1/common/city.c --- freeciv-2.3.0/common/city.c 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/city.c 2011-11-19 20:21:56.000000000 +0000 @@ -3183,6 +3183,33 @@ } /************************************************************************** + Return TRUE if the city is centered at the given tile. + + NB: This doesn't simply check whether pcity->tile == ptile because that + would miss virtual clones made of city center tiles, which are used by + autosettler to judge whether improvements are worthwhile. The upshot is + that city centers would appear to lose their irrigation/farmland bonuses + as well as their minimum outputs of one food and one shield, and thus + autosettler would rarely transform or mine them. +**************************************************************************/ +bool is_city_center(const struct city *pcity, const struct tile *ptile) +{ + if (!pcity || !pcity->tile || !ptile) { + return FALSE; + } + + return pcity->tile->x == ptile->x && pcity->tile->y == ptile->y; +} + +/************************************************************************** + Return TRUE if the city is worked without using up a citizen. +**************************************************************************/ +bool is_free_worked(const struct city *pcity, const struct tile *ptile) +{ + return is_city_center(pcity, ptile); +} + +/************************************************************************** Return citytile type for a given rule name **************************************************************************/ enum citytile_type citytile_by_rule_name(const char *name) diff -Nru freeciv-2.3.0/common/city.h freeciv-2.3.1/common/city.h --- freeciv-2.3.0/common/city.h 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/city.h 2011-11-19 20:21:56.000000000 +0000 @@ -679,8 +679,9 @@ /* === */ -#define is_city_center(_city, _tile) (_city->tile == _tile) -#define is_free_worked(_city, _tile) (_city->tile == _tile) +bool is_city_center(const struct city *pcity, const struct tile *ptile); +bool is_free_worked(const struct city *pcity, const struct tile *ptile); + #define is_free_worked_index(city_tile_index) \ (CITY_MAP_CENTER_TILE_INDEX == city_tile_index) #define FREE_WORKED_TILES (1) diff -Nru freeciv-2.3.0/common/dataio.c freeciv-2.3.1/common/dataio.c --- freeciv-2.3.0/common/dataio.c 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/dataio.c 2011-11-19 20:21:56.000000000 +0000 @@ -29,14 +29,17 @@ #include #include -#ifdef HAVE_ARPA_INET_H -#include +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include #endif #ifdef HAVE_NETINET_IN_H #include #endif -#ifdef HAVE_SYS_TYPES_H -#include +#ifdef HAVE_ARPA_INET_H +#include #endif #ifdef HAVE_WINSOCK #include diff -Nru freeciv-2.3.0/common/fc_interface.c freeciv-2.3.1/common/fc_interface.c --- freeciv-2.3.0/common/fc_interface.c 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/fc_interface.c 2011-11-19 20:21:56.000000000 +0000 @@ -55,7 +55,7 @@ { fc_funcs = &fc_functions; - /* Test the existence of each function here! */ + /* Test the existence of each required function here! */ fc_assert_exit(fc_funcs->player_tile_vision_get); fc_funcs_defined = TRUE; diff -Nru freeciv-2.3.0/common/fc_interface.h freeciv-2.3.1/common/fc_interface.h --- freeciv-2.3.0/common/fc_interface.h 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/fc_interface.h 2011-11-19 20:21:56.000000000 +0000 @@ -18,9 +18,11 @@ struct player; struct tile; enum vision_layer; +struct base_type; /* The existence of each function should be checked in interface_init()! */ struct functions { + void (*destroy_base)(struct tile *ptile, struct base_type *pbase); /* Returns iff the player 'pplayer' has the vision in the layer 'vision' at tile given by 'ptile'. */ bool (*player_tile_vision_get)(const struct tile *ptile, diff -Nru freeciv-2.3.0/common/generate_packets.py freeciv-2.3.1/common/generate_packets.py --- freeciv-2.3.0/common/generate_packets.py 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/generate_packets.py 2011-11-19 20:21:56.000000000 +0000 @@ -1191,7 +1191,7 @@ no=v.no result=result+' } else if(%(cond)s) {\n variant = %(no)s;\n'%self.get_dict(vars()) if generate_variant_logs and len(self.variants)>1: - log=' log_test("%(name)s: using variant=%%d cap=%%s", variant, pc->capability);\n'%self.get_dict(vars()) + log=' %(log_macro)s("%(name)s: using variant=%%d cap=%%s", variant, pc->capability);\n'%self.get_dict(vars()) else: log="" result=result+''' } else { diff -Nru freeciv-2.3.0/common/Makefile.am freeciv-2.3.1/common/Makefile.am --- freeciv-2.3.0/common/Makefile.am 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/Makefile.am 2011-11-19 20:21:56.000000000 +0000 @@ -125,4 +125,4 @@ .PHONY : fc_svnrev_gen.h fc_svnrev_gen.h : - $(top_srcdir)/bootstrap/generate_svnrev.sh $(top_srcdir) $(top_builddir) + "$(top_srcdir)/bootstrap/generate_svnrev.sh" "$(top_srcdir)" "$(top_builddir)" diff -Nru freeciv-2.3.0/common/Makefile.in freeciv-2.3.1/common/Makefile.in --- freeciv-2.3.0/common/Makefile.in 2011-08-08 04:25:53.000000000 +0000 +++ freeciv-2.3.1/common/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -190,10 +190,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -366,7 +362,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -677,7 +672,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -702,7 +697,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -1013,7 +1008,7 @@ .PHONY : fc_svnrev_gen.h fc_svnrev_gen.h : - $(top_srcdir)/bootstrap/generate_svnrev.sh $(top_srcdir) $(top_builddir) + "$(top_srcdir)/bootstrap/generate_svnrev.sh" "$(top_srcdir)" "$(top_builddir)" # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru freeciv-2.3.0/common/map.c freeciv-2.3.1/common/map.c --- freeciv-2.3.0/common/map.c 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/map.c 2011-11-19 20:21:56.000000000 +0000 @@ -1591,7 +1591,7 @@ fc_assert_ret_val(NULL != map.startpos_table, NULL); psp = startpos_new(ptile); - startpos_hash_replace(map.startpos_table, ptile, psp); + startpos_hash_replace(map.startpos_table, tile_hash_key(ptile), psp); return psp; } @@ -1606,7 +1606,7 @@ fc_assert_ret_val(NULL != ptile, NULL); fc_assert_ret_val(NULL != map.startpos_table, NULL); - startpos_hash_lookup(map.startpos_table, ptile, &psp); + startpos_hash_lookup(map.startpos_table, tile_hash_key(ptile), &psp); return psp; } @@ -1619,7 +1619,7 @@ fc_assert_ret_val(NULL != ptile, FALSE); fc_assert_ret_val(NULL != map.startpos_table, FALSE); - return startpos_hash_remove(map.startpos_table, ptile); + return startpos_hash_remove(map.startpos_table, tile_hash_key(ptile)); } /**************************************************************************** diff -Nru freeciv-2.3.0/common/movement.c freeciv-2.3.1/common/movement.c --- freeciv-2.3.0/common/movement.c 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/movement.c 2011-11-19 20:21:56.000000000 +0000 @@ -443,7 +443,7 @@ 2) The target location is next to the unit. 3) There are no non-allied units on the target tile. 4) Unit can move to a tile where it can't survive on its own if there - is city or free transport capacity. + is free transport capacity. 5) Some units cannot take over a city. 6) Marines are the only land units that can attack from a ocean square. 7) There are no peaceful but un-allied units on the target tile. @@ -483,9 +483,9 @@ } /* 4) */ - if (!can_exist_at_tile(punittype, dst_tile) - && !is_allied_city_tile(dst_tile, unit_owner) - && unit_class_transporter_capacity(dst_tile, unit_owner, utype_class(punittype)) <= 0) { + if (!(can_exist_at_tile(punittype, dst_tile) + || unit_class_transporter_capacity(dst_tile, unit_owner, + utype_class(punittype)) > 0)) { return MR_NO_TRANSPORTER_CAPACITY; } diff -Nru freeciv-2.3.0/common/packets.def freeciv-2.3.1/common/packets.def --- freeciv-2.3.0/common/packets.def 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/packets.def 2011-11-19 20:21:56.000000000 +0000 @@ -165,6 +165,7 @@ # typedefs for numbers type BOOL = bool8(bool) +type FLOAT10x3 = float100(float) type FLOAT = float10000(float) type FLOAT10x7 = float1000000(float) type SINT8 = sint8(int) @@ -368,7 +369,7 @@ end # This packet used to have is_info set but that doesn't work with the -# seconds_to_phasedone field: sending the same value a second time after a +# seconds_to_phasedone fields: sending the same value a second time after a # while has passed means a completely reset timeout. # # The variables in the packet are listed in alphabetical order. @@ -437,7 +438,8 @@ BOOL restrictinfra; BOOL unreachable_protects; UINT32 sciencebox; - FLOAT seconds_to_phasedone; + FLOAT seconds_to_phasedone; remove-cap(timeout_extended_range) + FLOAT10x3 seconds_to_phasedone2; add-cap(timeout_extended_range) UINT32 shieldbox; UINT32 skill_level; BOOL slow_invasions; diff -Nru freeciv-2.3.0/common/packets_gen.c freeciv-2.3.1/common/packets_gen.c --- freeciv-2.3.0/common/packets_gen.c 2011-08-08 04:27:08.000000000 +0000 +++ freeciv-2.3.1/common/packets_gen.c 2011-11-19 20:24:32.000000000 +0000 @@ -3715,6 +3715,1543 @@ } } if (BV_ISSET(fields, 60)) { + log_packet(" got field 'seconds_to_phasedone2'"); + { + int tmp; + + dio_get_uint32(&din, &tmp); + real_packet->seconds_to_phasedone2 = (float)(tmp) / 100.0; + } + } + if (BV_ISSET(fields, 61)) { + log_packet(" got field 'shieldbox'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->shieldbox = readin; + } + } + if (BV_ISSET(fields, 62)) { + log_packet(" got field 'skill_level'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->skill_level = readin; + } + } + real_packet->slow_invasions = BV_ISSET(fields, 63); + real_packet->spacerace = BV_ISSET(fields, 64); + real_packet->team_pooled_research = BV_ISSET(fields, 65); + if (BV_ISSET(fields, 66)) { + log_packet(" got field 'tech'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->tech = readin; + } + } + if (BV_ISSET(fields, 67)) { + log_packet(" got field 'tech_cost_style'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->tech_cost_style = readin; + } + } + if (BV_ISSET(fields, 68)) { + log_packet(" got field 'tech_leakage'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->tech_leakage = readin; + } + } + if (BV_ISSET(fields, 69)) { + log_packet(" got field 'tech_upkeep_divider'"); + { + int readin; + + dio_get_uint16(&din, &readin); + real_packet->tech_upkeep_divider = readin; + } + } + if (BV_ISSET(fields, 70)) { + log_packet(" got field 'tech_upkeep_style'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->tech_upkeep_style = readin; + } + } + if (BV_ISSET(fields, 71)) { + log_packet(" got field 'timeout'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->timeout = readin; + } + } + real_packet->tired_attack = BV_ISSET(fields, 72); + if (BV_ISSET(fields, 73)) { + log_packet(" got field 'trademindist'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->trademindist = readin; + } + } + real_packet->trading_city = BV_ISSET(fields, 74); + real_packet->trading_gold = BV_ISSET(fields, 75); + real_packet->trading_tech = BV_ISSET(fields, 76); + if (BV_ISSET(fields, 77)) { + log_packet(" got field 'turn'"); + { + int readin; + + dio_get_sint16(&din, &readin); + real_packet->turn = readin; + } + } + if (BV_ISSET(fields, 78)) { + log_packet(" got field 'warminglevel'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->warminglevel = readin; + } + } + if (BV_ISSET(fields, 79)) { + log_packet(" got field 'year'"); + { + int readin; + + dio_get_sint16(&din, &readin); + real_packet->year = readin; + } + } + real_packet->year_0_hack = BV_ISSET(fields, 80); + + if (NULL == old) { + old = fc_malloc(sizeof(*old)); + *old = *real_packet; + genhash_insert(*hash, old, old); + } else { + *old = *real_packet; + } + RECEIVE_PACKET_END(real_packet); +} + +static int send_packet_game_info_100(struct connection *pc, const struct packet_game_info *packet) +{ + const struct packet_game_info *real_packet = packet; + packet_game_info_100_fields fields; + struct packet_game_info *old; + bool differ; + struct genhash **hash = pc->phs.sent + PACKET_GAME_INFO; + int different = 0; + SEND_PACKET_START(PACKET_GAME_INFO); + + log_packet("packet_game_info_100: sending info about ()"); + + if (NULL == *hash) { + *hash = genhash_new_full(hash_packet_game_info_100, cmp_packet_game_info_100, + NULL, NULL, NULL, free); + } + BV_CLR_ALL(fields); + + if (!genhash_lookup(*hash, real_packet, (void **) &old)) { + old = fc_malloc(sizeof(*old)); + *old = *real_packet; + genhash_insert(*hash, old, old); + memset(old, 0, sizeof(*old)); + different = 1; /* Force to send. */ + } + + differ = (old->add_to_size_limit != real_packet->add_to_size_limit); + if (differ) { + different++; + BV_SET(fields, 0); + } + + differ = (old->aifill != real_packet->aifill); + if (differ) { + different++; + BV_SET(fields, 1); + } + + differ = (old->airlifting_style != real_packet->airlifting_style); + if (differ) { + different++; + BV_SET(fields, 2); + } + + differ = (old->angrycitizen != real_packet->angrycitizen); + if (differ) { + different++; + BV_SET(fields, 3); + } + + differ = (old->base_pollution != real_packet->base_pollution); + if (differ) { + different++; + BV_SET(fields, 4); + } + + differ = (old->base_tech_cost != real_packet->base_tech_cost); + if (differ) { + different++; + BV_SET(fields, 5); + } + + differ = (old->border_city_radius_sq != real_packet->border_city_radius_sq); + if (differ) { + different++; + BV_SET(fields, 6); + } + + differ = (old->border_size_effect != real_packet->border_size_effect); + if (differ) { + different++; + BV_SET(fields, 7); + } + + differ = (old->borders != real_packet->borders); + if (differ) { + different++; + BV_SET(fields, 8); + } + + differ = (old->calendar_skip_0 != real_packet->calendar_skip_0); + if(differ) { + different++; + } + if (packet->calendar_skip_0) { + BV_SET(fields, 9); + } + + differ = (old->celebratesize != real_packet->celebratesize); + if (differ) { + different++; + BV_SET(fields, 10); + } + + differ = (old->changable_tax != real_packet->changable_tax); + if(differ) { + different++; + } + if (packet->changable_tax) { + BV_SET(fields, 11); + } + + differ = (old->citymindist != real_packet->citymindist); + if (differ) { + different++; + BV_SET(fields, 12); + } + + differ = (old->cooling != real_packet->cooling); + if (differ) { + different++; + BV_SET(fields, 13); + } + + differ = (old->coolinglevel != real_packet->coolinglevel); + if (differ) { + different++; + BV_SET(fields, 14); + } + + differ = (old->diplomacy != real_packet->diplomacy); + if (differ) { + different++; + BV_SET(fields, 15); + } + + differ = (old->fogofwar != real_packet->fogofwar); + if(differ) { + different++; + } + if (packet->fogofwar) { + BV_SET(fields, 16); + } + + differ = (old->food_cost != real_packet->food_cost); + if (differ) { + different++; + BV_SET(fields, 17); + } + + differ = (old->foodbox != real_packet->foodbox); + if (differ) { + different++; + BV_SET(fields, 18); + } + + differ = (old->forced_gold != real_packet->forced_gold); + if (differ) { + different++; + BV_SET(fields, 19); + } + + differ = (old->forced_luxury != real_packet->forced_luxury); + if (differ) { + different++; + BV_SET(fields, 20); + } + + differ = (old->forced_science != real_packet->forced_science); + if (differ) { + different++; + BV_SET(fields, 21); + } + + differ = (old->fulltradesize != real_packet->fulltradesize); + if (differ) { + different++; + BV_SET(fields, 22); + } + + + { + differ = (A_LAST != A_LAST); + if(!differ) { + int i; + for (i = 0; i < A_LAST; i++) { + if (old->global_advances[i] != real_packet->global_advances[i]) { + differ = TRUE; + break; + } + } + } + } + if (differ) { + different++; + BV_SET(fields, 23); + } + + differ = (old->global_warming != real_packet->global_warming); + if(differ) { + different++; + } + if (packet->global_warming) { + BV_SET(fields, 24); + } + + differ = (old->globalwarming != real_packet->globalwarming); + if (differ) { + different++; + BV_SET(fields, 25); + } + + differ = (old->gold != real_packet->gold); + if (differ) { + different++; + BV_SET(fields, 26); + } + + differ = (old->gold_upkeep_style != real_packet->gold_upkeep_style); + if (differ) { + different++; + BV_SET(fields, 27); + } + + differ = (old->government_during_revolution_id != real_packet->government_during_revolution_id); + if (differ) { + different++; + BV_SET(fields, 28); + } + + differ = (old->granary_food_inc != real_packet->granary_food_inc); + if (differ) { + different++; + BV_SET(fields, 29); + } + + + { + differ = (MAX_GRANARY_INIS != MAX_GRANARY_INIS); + if(!differ) { + int i; + for (i = 0; i < MAX_GRANARY_INIS; i++) { + if (old->granary_food_ini[i] != real_packet->granary_food_ini[i]) { + differ = TRUE; + break; + } + } + } + } + if (differ) { + different++; + BV_SET(fields, 30); + } + + differ = (old->granary_num_inis != real_packet->granary_num_inis); + if (differ) { + different++; + BV_SET(fields, 31); + } + + + { + differ = (B_LAST != B_LAST); + if(!differ) { + int i; + for (i = 0; i < B_LAST; i++) { + if (old->great_wonder_owners[i] != real_packet->great_wonder_owners[i]) { + differ = TRUE; + break; + } + } + } + } + if (differ) { + different++; + BV_SET(fields, 32); + } + + differ = (old->happy_cost != real_packet->happy_cost); + if (differ) { + different++; + BV_SET(fields, 33); + } + + differ = (old->happyborders != real_packet->happyborders); + if(differ) { + different++; + } + if (packet->happyborders) { + BV_SET(fields, 34); + } + + differ = (old->heating != real_packet->heating); + if (differ) { + different++; + BV_SET(fields, 35); + } + + differ = (old->illness_base_factor != real_packet->illness_base_factor); + if (differ) { + different++; + BV_SET(fields, 36); + } + + differ = (old->illness_min_size != real_packet->illness_min_size); + if (differ) { + different++; + BV_SET(fields, 37); + } + + differ = (old->illness_on != real_packet->illness_on); + if(differ) { + different++; + } + if (packet->illness_on) { + BV_SET(fields, 38); + } + + differ = (old->illness_pollution_factor != real_packet->illness_pollution_factor); + if (differ) { + different++; + BV_SET(fields, 39); + } + + differ = (old->illness_trade_infection != real_packet->illness_trade_infection); + if (differ) { + different++; + BV_SET(fields, 40); + } + + differ = (old->init_city_radius_sq != real_packet->init_city_radius_sq); + if (differ) { + different++; + BV_SET(fields, 41); + } + + differ = (old->is_edit_mode != real_packet->is_edit_mode); + if(differ) { + different++; + } + if (packet->is_edit_mode) { + BV_SET(fields, 42); + } + + differ = (old->is_new_game != real_packet->is_new_game); + if(differ) { + different++; + } + if (packet->is_new_game) { + BV_SET(fields, 43); + } + + differ = (old->killcitizen != real_packet->killcitizen); + if (differ) { + different++; + BV_SET(fields, 44); + } + + differ = (old->killstack != real_packet->killstack); + if(differ) { + different++; + } + if (packet->killstack) { + BV_SET(fields, 45); + } + + + { + differ = (O_LAST != O_LAST); + if(!differ) { + int i; + for (i = 0; i < O_LAST; i++) { + if (old->min_city_center_output[i] != real_packet->min_city_center_output[i]) { + differ = TRUE; + break; + } + } + } + } + if (differ) { + different++; + BV_SET(fields, 46); + } + + differ = (old->min_dist_bw_cities != real_packet->min_dist_bw_cities); + if (differ) { + different++; + BV_SET(fields, 47); + } + + differ = (strcmp(old->negative_year_label, real_packet->negative_year_label) != 0); + if (differ) { + different++; + BV_SET(fields, 48); + } + + differ = (old->notradesize != real_packet->notradesize); + if (differ) { + different++; + BV_SET(fields, 49); + } + + differ = (old->nuclear_winter != real_packet->nuclear_winter); + if(differ) { + different++; + } + if (packet->nuclear_winter) { + BV_SET(fields, 50); + } + + differ = (old->nuclearwinter != real_packet->nuclearwinter); + if (differ) { + different++; + BV_SET(fields, 51); + } + + differ = (old->phase != real_packet->phase); + if (differ) { + different++; + BV_SET(fields, 52); + } + + differ = (old->phase_mode != real_packet->phase_mode); + if (differ) { + different++; + BV_SET(fields, 53); + } + + differ = (old->pillage_select != real_packet->pillage_select); + if(differ) { + different++; + } + if (packet->pillage_select) { + BV_SET(fields, 54); + } + + differ = (strcmp(old->positive_year_label, real_packet->positive_year_label) != 0); + if (differ) { + different++; + BV_SET(fields, 55); + } + + differ = (old->rapturedelay != real_packet->rapturedelay); + if (differ) { + different++; + BV_SET(fields, 56); + } + + differ = (old->restrictinfra != real_packet->restrictinfra); + if(differ) { + different++; + } + if (packet->restrictinfra) { + BV_SET(fields, 57); + } + + differ = (old->unreachable_protects != real_packet->unreachable_protects); + if(differ) { + different++; + } + if (packet->unreachable_protects) { + BV_SET(fields, 58); + } + + differ = (old->sciencebox != real_packet->sciencebox); + if (differ) { + different++; + BV_SET(fields, 59); + } + + differ = (old->seconds_to_phasedone2 != real_packet->seconds_to_phasedone2); + if (differ) { + different++; + BV_SET(fields, 60); + } + + differ = (old->shieldbox != real_packet->shieldbox); + if (differ) { + different++; + BV_SET(fields, 61); + } + + differ = (old->skill_level != real_packet->skill_level); + if (differ) { + different++; + BV_SET(fields, 62); + } + + differ = (old->slow_invasions != real_packet->slow_invasions); + if(differ) { + different++; + } + if (packet->slow_invasions) { + BV_SET(fields, 63); + } + + differ = (old->spacerace != real_packet->spacerace); + if(differ) { + different++; + } + if (packet->spacerace) { + BV_SET(fields, 64); + } + + differ = (old->team_pooled_research != real_packet->team_pooled_research); + if(differ) { + different++; + } + if (packet->team_pooled_research) { + BV_SET(fields, 65); + } + + differ = (old->tech != real_packet->tech); + if (differ) { + different++; + BV_SET(fields, 66); + } + + differ = (old->tech_cost_style != real_packet->tech_cost_style); + if (differ) { + different++; + BV_SET(fields, 67); + } + + differ = (old->tech_leakage != real_packet->tech_leakage); + if (differ) { + different++; + BV_SET(fields, 68); + } + + differ = (old->tech_upkeep_divider != real_packet->tech_upkeep_divider); + if (differ) { + different++; + BV_SET(fields, 69); + } + + differ = (old->tech_upkeep_style != real_packet->tech_upkeep_style); + if (differ) { + different++; + BV_SET(fields, 70); + } + + differ = (old->timeout != real_packet->timeout); + if (differ) { + different++; + BV_SET(fields, 71); + } + + differ = (old->tired_attack != real_packet->tired_attack); + if(differ) { + different++; + } + if (packet->tired_attack) { + BV_SET(fields, 72); + } + + differ = (old->trademindist != real_packet->trademindist); + if (differ) { + different++; + BV_SET(fields, 73); + } + + differ = (old->trading_city != real_packet->trading_city); + if(differ) { + different++; + } + if (packet->trading_city) { + BV_SET(fields, 74); + } + + differ = (old->trading_gold != real_packet->trading_gold); + if(differ) { + different++; + } + if (packet->trading_gold) { + BV_SET(fields, 75); + } + + differ = (old->trading_tech != real_packet->trading_tech); + if(differ) { + different++; + } + if (packet->trading_tech) { + BV_SET(fields, 76); + } + + differ = (old->turn != real_packet->turn); + if (differ) { + different++; + BV_SET(fields, 77); + } + + differ = (old->warminglevel != real_packet->warminglevel); + if (differ) { + different++; + BV_SET(fields, 78); + } + + differ = (old->year != real_packet->year); + if (differ) { + different++; + BV_SET(fields, 79); + } + + differ = (old->year_0_hack != real_packet->year_0_hack); + if(differ) { + different++; + } + if (packet->year_0_hack) { + BV_SET(fields, 80); + } + + + DIO_BV_PUT(&dout, fields); + + if (BV_ISSET(fields, 0)) { + log_packet(" field 'add_to_size_limit' has changed"); + dio_put_uint8(&dout, real_packet->add_to_size_limit); + } + if (BV_ISSET(fields, 1)) { + log_packet(" field 'aifill' has changed"); + dio_put_uint8(&dout, real_packet->aifill); + } + if (BV_ISSET(fields, 2)) { + log_packet(" field 'airlifting_style' has changed"); + dio_put_uint8(&dout, real_packet->airlifting_style); + } + if (BV_ISSET(fields, 3)) { + log_packet(" field 'angrycitizen' has changed"); + dio_put_uint8(&dout, real_packet->angrycitizen); + } + if (BV_ISSET(fields, 4)) { + log_packet(" field 'base_pollution' has changed"); + dio_put_sint16(&dout, real_packet->base_pollution); + } + if (BV_ISSET(fields, 5)) { + log_packet(" field 'base_tech_cost' has changed"); + dio_put_uint8(&dout, real_packet->base_tech_cost); + } + if (BV_ISSET(fields, 6)) { + log_packet(" field 'border_city_radius_sq' has changed"); + dio_put_uint8(&dout, real_packet->border_city_radius_sq); + } + if (BV_ISSET(fields, 7)) { + log_packet(" field 'border_size_effect' has changed"); + dio_put_uint8(&dout, real_packet->border_size_effect); + } + if (BV_ISSET(fields, 8)) { + log_packet(" field 'borders' has changed"); + dio_put_uint8(&dout, real_packet->borders); + } + /* field 9 is folded into the header */ + if (BV_ISSET(fields, 10)) { + log_packet(" field 'celebratesize' has changed"); + dio_put_uint8(&dout, real_packet->celebratesize); + } + /* field 11 is folded into the header */ + if (BV_ISSET(fields, 12)) { + log_packet(" field 'citymindist' has changed"); + dio_put_uint8(&dout, real_packet->citymindist); + } + if (BV_ISSET(fields, 13)) { + log_packet(" field 'cooling' has changed"); + dio_put_uint32(&dout, real_packet->cooling); + } + if (BV_ISSET(fields, 14)) { + log_packet(" field 'coolinglevel' has changed"); + dio_put_uint32(&dout, real_packet->coolinglevel); + } + if (BV_ISSET(fields, 15)) { + log_packet(" field 'diplomacy' has changed"); + dio_put_uint8(&dout, real_packet->diplomacy); + } + /* field 16 is folded into the header */ + if (BV_ISSET(fields, 17)) { + log_packet(" field 'food_cost' has changed"); + dio_put_uint8(&dout, real_packet->food_cost); + } + if (BV_ISSET(fields, 18)) { + log_packet(" field 'foodbox' has changed"); + dio_put_uint32(&dout, real_packet->foodbox); + } + if (BV_ISSET(fields, 19)) { + log_packet(" field 'forced_gold' has changed"); + dio_put_uint8(&dout, real_packet->forced_gold); + } + if (BV_ISSET(fields, 20)) { + log_packet(" field 'forced_luxury' has changed"); + dio_put_uint8(&dout, real_packet->forced_luxury); + } + if (BV_ISSET(fields, 21)) { + log_packet(" field 'forced_science' has changed"); + dio_put_uint8(&dout, real_packet->forced_science); + } + if (BV_ISSET(fields, 22)) { + log_packet(" field 'fulltradesize' has changed"); + dio_put_uint8(&dout, real_packet->fulltradesize); + } + if (BV_ISSET(fields, 23)) { + log_packet(" field 'global_advances' has changed"); + + { + int i; + + fc_assert(A_LAST < 255); + + for (i = 0; i < A_LAST; i++) { + if(old->global_advances[i] != real_packet->global_advances[i]) { + dio_put_uint8(&dout, i); + dio_put_bool8(&dout, real_packet->global_advances[i]); + } + } + dio_put_uint8(&dout, 255); + } + } + /* field 24 is folded into the header */ + if (BV_ISSET(fields, 25)) { + log_packet(" field 'globalwarming' has changed"); + dio_put_uint32(&dout, real_packet->globalwarming); + } + if (BV_ISSET(fields, 26)) { + log_packet(" field 'gold' has changed"); + dio_put_uint32(&dout, real_packet->gold); + } + if (BV_ISSET(fields, 27)) { + log_packet(" field 'gold_upkeep_style' has changed"); + dio_put_uint8(&dout, real_packet->gold_upkeep_style); + } + if (BV_ISSET(fields, 28)) { + log_packet(" field 'government_during_revolution_id' has changed"); + dio_put_uint8(&dout, real_packet->government_during_revolution_id); + } + if (BV_ISSET(fields, 29)) { + log_packet(" field 'granary_food_inc' has changed"); + dio_put_uint8(&dout, real_packet->granary_food_inc); + } + if (BV_ISSET(fields, 30)) { + log_packet(" field 'granary_food_ini' has changed"); + + { + int i; + + for (i = 0; i < MAX_GRANARY_INIS; i++) { + dio_put_uint8(&dout, real_packet->granary_food_ini[i]); + } + } + } + if (BV_ISSET(fields, 31)) { + log_packet(" field 'granary_num_inis' has changed"); + dio_put_uint8(&dout, real_packet->granary_num_inis); + } + if (BV_ISSET(fields, 32)) { + log_packet(" field 'great_wonder_owners' has changed"); + + { + int i; + + fc_assert(B_LAST < 255); + + for (i = 0; i < B_LAST; i++) { + if(old->great_wonder_owners[i] != real_packet->great_wonder_owners[i]) { + dio_put_uint8(&dout, i); + dio_put_sint8(&dout, real_packet->great_wonder_owners[i]); + } + } + dio_put_uint8(&dout, 255); + } + } + if (BV_ISSET(fields, 33)) { + log_packet(" field 'happy_cost' has changed"); + dio_put_uint8(&dout, real_packet->happy_cost); + } + /* field 34 is folded into the header */ + if (BV_ISSET(fields, 35)) { + log_packet(" field 'heating' has changed"); + dio_put_uint32(&dout, real_packet->heating); + } + if (BV_ISSET(fields, 36)) { + log_packet(" field 'illness_base_factor' has changed"); + dio_put_uint8(&dout, real_packet->illness_base_factor); + } + if (BV_ISSET(fields, 37)) { + log_packet(" field 'illness_min_size' has changed"); + dio_put_uint8(&dout, real_packet->illness_min_size); + } + /* field 38 is folded into the header */ + if (BV_ISSET(fields, 39)) { + log_packet(" field 'illness_pollution_factor' has changed"); + dio_put_uint8(&dout, real_packet->illness_pollution_factor); + } + if (BV_ISSET(fields, 40)) { + log_packet(" field 'illness_trade_infection' has changed"); + dio_put_uint8(&dout, real_packet->illness_trade_infection); + } + if (BV_ISSET(fields, 41)) { + log_packet(" field 'init_city_radius_sq' has changed"); + dio_put_uint8(&dout, real_packet->init_city_radius_sq); + } + /* field 42 is folded into the header */ + /* field 43 is folded into the header */ + if (BV_ISSET(fields, 44)) { + log_packet(" field 'killcitizen' has changed"); + dio_put_uint8(&dout, real_packet->killcitizen); + } + /* field 45 is folded into the header */ + if (BV_ISSET(fields, 46)) { + log_packet(" field 'min_city_center_output' has changed"); + + { + int i; + + for (i = 0; i < O_LAST; i++) { + dio_put_uint8(&dout, real_packet->min_city_center_output[i]); + } + } + } + if (BV_ISSET(fields, 47)) { + log_packet(" field 'min_dist_bw_cities' has changed"); + dio_put_uint8(&dout, real_packet->min_dist_bw_cities); + } + if (BV_ISSET(fields, 48)) { + log_packet(" field 'negative_year_label' has changed"); + dio_put_string(&dout, real_packet->negative_year_label); + } + if (BV_ISSET(fields, 49)) { + log_packet(" field 'notradesize' has changed"); + dio_put_uint8(&dout, real_packet->notradesize); + } + /* field 50 is folded into the header */ + if (BV_ISSET(fields, 51)) { + log_packet(" field 'nuclearwinter' has changed"); + dio_put_uint32(&dout, real_packet->nuclearwinter); + } + if (BV_ISSET(fields, 52)) { + log_packet(" field 'phase' has changed"); + dio_put_sint16(&dout, real_packet->phase); + } + if (BV_ISSET(fields, 53)) { + log_packet(" field 'phase_mode' has changed"); + dio_put_uint8(&dout, real_packet->phase_mode); + } + /* field 54 is folded into the header */ + if (BV_ISSET(fields, 55)) { + log_packet(" field 'positive_year_label' has changed"); + dio_put_string(&dout, real_packet->positive_year_label); + } + if (BV_ISSET(fields, 56)) { + log_packet(" field 'rapturedelay' has changed"); + dio_put_uint8(&dout, real_packet->rapturedelay); + } + /* field 57 is folded into the header */ + /* field 58 is folded into the header */ + if (BV_ISSET(fields, 59)) { + log_packet(" field 'sciencebox' has changed"); + dio_put_uint32(&dout, real_packet->sciencebox); + } + if (BV_ISSET(fields, 60)) { + log_packet(" field 'seconds_to_phasedone2' has changed"); + dio_put_uint32(&dout, (int)(real_packet->seconds_to_phasedone2 * 100)); + } + if (BV_ISSET(fields, 61)) { + log_packet(" field 'shieldbox' has changed"); + dio_put_uint32(&dout, real_packet->shieldbox); + } + if (BV_ISSET(fields, 62)) { + log_packet(" field 'skill_level' has changed"); + dio_put_uint32(&dout, real_packet->skill_level); + } + /* field 63 is folded into the header */ + /* field 64 is folded into the header */ + /* field 65 is folded into the header */ + if (BV_ISSET(fields, 66)) { + log_packet(" field 'tech' has changed"); + dio_put_uint32(&dout, real_packet->tech); + } + if (BV_ISSET(fields, 67)) { + log_packet(" field 'tech_cost_style' has changed"); + dio_put_uint8(&dout, real_packet->tech_cost_style); + } + if (BV_ISSET(fields, 68)) { + log_packet(" field 'tech_leakage' has changed"); + dio_put_uint8(&dout, real_packet->tech_leakage); + } + if (BV_ISSET(fields, 69)) { + log_packet(" field 'tech_upkeep_divider' has changed"); + dio_put_uint16(&dout, real_packet->tech_upkeep_divider); + } + if (BV_ISSET(fields, 70)) { + log_packet(" field 'tech_upkeep_style' has changed"); + dio_put_uint8(&dout, real_packet->tech_upkeep_style); + } + if (BV_ISSET(fields, 71)) { + log_packet(" field 'timeout' has changed"); + dio_put_uint32(&dout, real_packet->timeout); + } + /* field 72 is folded into the header */ + if (BV_ISSET(fields, 73)) { + log_packet(" field 'trademindist' has changed"); + dio_put_uint8(&dout, real_packet->trademindist); + } + /* field 74 is folded into the header */ + /* field 75 is folded into the header */ + /* field 76 is folded into the header */ + if (BV_ISSET(fields, 77)) { + log_packet(" field 'turn' has changed"); + dio_put_sint16(&dout, real_packet->turn); + } + if (BV_ISSET(fields, 78)) { + log_packet(" field 'warminglevel' has changed"); + dio_put_uint32(&dout, real_packet->warminglevel); + } + if (BV_ISSET(fields, 79)) { + log_packet(" field 'year' has changed"); + dio_put_sint16(&dout, real_packet->year); + } + /* field 80 is folded into the header */ + + *old = *real_packet; + SEND_PACKET_END; +} + +#define hash_packet_game_info_101 hash_const + +#define cmp_packet_game_info_101 cmp_const + +BV_DEFINE(packet_game_info_101_fields, 81); + +static struct packet_game_info *receive_packet_game_info_101(struct connection *pc, enum packet_type type) +{ + packet_game_info_101_fields fields; + struct packet_game_info *old; + struct genhash **hash = pc->phs.received + type; + RECEIVE_PACKET_START(packet_game_info, real_packet); + + DIO_BV_GET(&din, fields); + + log_packet("packet_game_info_101: got info about ()"); + + if (NULL == *hash) { + *hash = genhash_new_full(hash_packet_game_info_101, cmp_packet_game_info_101, + NULL, NULL, NULL, free); + } + + if (genhash_lookup(*hash, real_packet, (void **) &old)) { + *real_packet = *old; + } else { + log_packet(" no old info"); + memset(real_packet, 0, sizeof(*real_packet)); + } + + if (BV_ISSET(fields, 0)) { + log_packet(" got field 'add_to_size_limit'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->add_to_size_limit = readin; + } + } + if (BV_ISSET(fields, 1)) { + log_packet(" got field 'aifill'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->aifill = readin; + } + } + if (BV_ISSET(fields, 2)) { + log_packet(" got field 'airlifting_style'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->airlifting_style = readin; + } + } + if (BV_ISSET(fields, 3)) { + log_packet(" got field 'angrycitizen'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->angrycitizen = readin; + } + } + if (BV_ISSET(fields, 4)) { + log_packet(" got field 'base_pollution'"); + { + int readin; + + dio_get_sint16(&din, &readin); + real_packet->base_pollution = readin; + } + } + if (BV_ISSET(fields, 5)) { + log_packet(" got field 'base_tech_cost'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->base_tech_cost = readin; + } + } + if (BV_ISSET(fields, 6)) { + log_packet(" got field 'border_city_radius_sq'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->border_city_radius_sq = readin; + } + } + if (BV_ISSET(fields, 7)) { + log_packet(" got field 'border_size_effect'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->border_size_effect = readin; + } + } + if (BV_ISSET(fields, 8)) { + log_packet(" got field 'borders'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->borders = readin; + } + } + real_packet->calendar_skip_0 = BV_ISSET(fields, 9); + if (BV_ISSET(fields, 10)) { + log_packet(" got field 'celebratesize'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->celebratesize = readin; + } + } + real_packet->changable_tax = BV_ISSET(fields, 11); + if (BV_ISSET(fields, 12)) { + log_packet(" got field 'citymindist'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->citymindist = readin; + } + } + if (BV_ISSET(fields, 13)) { + log_packet(" got field 'cooling'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->cooling = readin; + } + } + if (BV_ISSET(fields, 14)) { + log_packet(" got field 'coolinglevel'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->coolinglevel = readin; + } + } + if (BV_ISSET(fields, 15)) { + log_packet(" got field 'diplomacy'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->diplomacy = readin; + } + } + real_packet->fogofwar = BV_ISSET(fields, 16); + if (BV_ISSET(fields, 17)) { + log_packet(" got field 'food_cost'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->food_cost = readin; + } + } + if (BV_ISSET(fields, 18)) { + log_packet(" got field 'foodbox'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->foodbox = readin; + } + } + if (BV_ISSET(fields, 19)) { + log_packet(" got field 'forced_gold'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->forced_gold = readin; + } + } + if (BV_ISSET(fields, 20)) { + log_packet(" got field 'forced_luxury'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->forced_luxury = readin; + } + } + if (BV_ISSET(fields, 21)) { + log_packet(" got field 'forced_science'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->forced_science = readin; + } + } + if (BV_ISSET(fields, 22)) { + log_packet(" got field 'fulltradesize'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->fulltradesize = readin; + } + } + if (BV_ISSET(fields, 23)) { + log_packet(" got field 'global_advances'"); + + for (;;) { + int i; + + dio_get_uint8(&din, &i); + if(i == 255) { + break; + } + if(i > A_LAST) { + log_error("packets_gen.c: WARNING: ignoring intra array diff"); + } else { + dio_get_bool8(&din, &real_packet->global_advances[i]); + } + } + } + real_packet->global_warming = BV_ISSET(fields, 24); + if (BV_ISSET(fields, 25)) { + log_packet(" got field 'globalwarming'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->globalwarming = readin; + } + } + if (BV_ISSET(fields, 26)) { + log_packet(" got field 'gold'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->gold = readin; + } + } + if (BV_ISSET(fields, 27)) { + log_packet(" got field 'gold_upkeep_style'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->gold_upkeep_style = readin; + } + } + if (BV_ISSET(fields, 28)) { + log_packet(" got field 'government_during_revolution_id'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->government_during_revolution_id = readin; + } + } + if (BV_ISSET(fields, 29)) { + log_packet(" got field 'granary_food_inc'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->granary_food_inc = readin; + } + } + if (BV_ISSET(fields, 30)) { + log_packet(" got field 'granary_food_ini'"); + + { + int i; + + for (i = 0; i < MAX_GRANARY_INIS; i++) { + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->granary_food_ini[i] = readin; + } + } + } + } + if (BV_ISSET(fields, 31)) { + log_packet(" got field 'granary_num_inis'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->granary_num_inis = readin; + } + } + if (BV_ISSET(fields, 32)) { + log_packet(" got field 'great_wonder_owners'"); + + for (;;) { + int i; + + dio_get_uint8(&din, &i); + if(i == 255) { + break; + } + if(i > B_LAST) { + log_error("packets_gen.c: WARNING: ignoring intra array diff"); + } else { + { + int readin; + + dio_get_sint8(&din, &readin); + real_packet->great_wonder_owners[i] = readin; + } + } + } + } + if (BV_ISSET(fields, 33)) { + log_packet(" got field 'happy_cost'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->happy_cost = readin; + } + } + real_packet->happyborders = BV_ISSET(fields, 34); + if (BV_ISSET(fields, 35)) { + log_packet(" got field 'heating'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->heating = readin; + } + } + if (BV_ISSET(fields, 36)) { + log_packet(" got field 'illness_base_factor'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->illness_base_factor = readin; + } + } + if (BV_ISSET(fields, 37)) { + log_packet(" got field 'illness_min_size'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->illness_min_size = readin; + } + } + real_packet->illness_on = BV_ISSET(fields, 38); + if (BV_ISSET(fields, 39)) { + log_packet(" got field 'illness_pollution_factor'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->illness_pollution_factor = readin; + } + } + if (BV_ISSET(fields, 40)) { + log_packet(" got field 'illness_trade_infection'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->illness_trade_infection = readin; + } + } + if (BV_ISSET(fields, 41)) { + log_packet(" got field 'init_city_radius_sq'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->init_city_radius_sq = readin; + } + } + real_packet->is_edit_mode = BV_ISSET(fields, 42); + real_packet->is_new_game = BV_ISSET(fields, 43); + if (BV_ISSET(fields, 44)) { + log_packet(" got field 'killcitizen'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->killcitizen = readin; + } + } + real_packet->killstack = BV_ISSET(fields, 45); + if (BV_ISSET(fields, 46)) { + log_packet(" got field 'min_city_center_output'"); + + { + int i; + + for (i = 0; i < O_LAST; i++) { + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->min_city_center_output[i] = readin; + } + } + } + } + if (BV_ISSET(fields, 47)) { + log_packet(" got field 'min_dist_bw_cities'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->min_dist_bw_cities = readin; + } + } + if (BV_ISSET(fields, 48)) { + log_packet(" got field 'negative_year_label'"); + dio_get_string(&din, real_packet->negative_year_label, sizeof(real_packet->negative_year_label)); + } + if (BV_ISSET(fields, 49)) { + log_packet(" got field 'notradesize'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->notradesize = readin; + } + } + real_packet->nuclear_winter = BV_ISSET(fields, 50); + if (BV_ISSET(fields, 51)) { + log_packet(" got field 'nuclearwinter'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->nuclearwinter = readin; + } + } + if (BV_ISSET(fields, 52)) { + log_packet(" got field 'phase'"); + { + int readin; + + dio_get_sint16(&din, &readin); + real_packet->phase = readin; + } + } + if (BV_ISSET(fields, 53)) { + log_packet(" got field 'phase_mode'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->phase_mode = readin; + } + } + real_packet->pillage_select = BV_ISSET(fields, 54); + if (BV_ISSET(fields, 55)) { + log_packet(" got field 'positive_year_label'"); + dio_get_string(&din, real_packet->positive_year_label, sizeof(real_packet->positive_year_label)); + } + if (BV_ISSET(fields, 56)) { + log_packet(" got field 'rapturedelay'"); + { + int readin; + + dio_get_uint8(&din, &readin); + real_packet->rapturedelay = readin; + } + } + real_packet->restrictinfra = BV_ISSET(fields, 57); + real_packet->unreachable_protects = BV_ISSET(fields, 58); + if (BV_ISSET(fields, 59)) { + log_packet(" got field 'sciencebox'"); + { + int readin; + + dio_get_uint32(&din, &readin); + real_packet->sciencebox = readin; + } + } + if (BV_ISSET(fields, 60)) { log_packet(" got field 'seconds_to_phasedone'"); { int tmp; @@ -3850,20 +5387,20 @@ RECEIVE_PACKET_END(real_packet); } -static int send_packet_game_info_100(struct connection *pc, const struct packet_game_info *packet) +static int send_packet_game_info_101(struct connection *pc, const struct packet_game_info *packet) { const struct packet_game_info *real_packet = packet; - packet_game_info_100_fields fields; + packet_game_info_101_fields fields; struct packet_game_info *old; bool differ; struct genhash **hash = pc->phs.sent + PACKET_GAME_INFO; int different = 0; SEND_PACKET_START(PACKET_GAME_INFO); - log_packet("packet_game_info_100: sending info about ()"); + log_packet("packet_game_info_101: sending info about ()"); if (NULL == *hash) { - *hash = genhash_new_full(hash_packet_game_info_100, cmp_packet_game_info_100, + *hash = genhash_new_full(hash_packet_game_info_101, cmp_packet_game_info_101, NULL, NULL, NULL, free); } BV_CLR_ALL(fields); @@ -4770,12 +6307,15 @@ } if(FALSE) { - } else if(TRUE) { + } else if((has_capability("timeout_extended_range", pc->capability) && has_capability("timeout_extended_range", our_capability))) { variant = 100; + } else if(!(has_capability("timeout_extended_range", pc->capability) && has_capability("timeout_extended_range", our_capability))) { + variant = 101; } else { log_error("Unknown PACKET_GAME_INFO variant for connection %s", conn_description(pc)); variant = -2; /* Keep something invalid. */ } + log_packet("packet_game_info: using variant=%d cap=%s", variant, pc->capability); pc->phs.variant[PACKET_GAME_INFO] = variant; } @@ -4795,6 +6335,8 @@ switch(pc->phs.variant[PACKET_GAME_INFO]) { case 100: return receive_packet_game_info_100(pc, type); + case 101: + return receive_packet_game_info_101(pc, type); default: log_debug("Unknown PACKET_GAME_INFO variant for connection %s", conn_description(pc)); return NULL; @@ -4817,6 +6359,8 @@ case 100: return send_packet_game_info_100(pc, packet); + case 101: + return send_packet_game_info_101(pc, packet); default: log_debug("Unknown PACKET_GAME_INFO variant for connection %s", conn_description(pc)); return -1; diff -Nru freeciv-2.3.0/common/packets_gen.h freeciv-2.3.1/common/packets_gen.h --- freeciv-2.3.0/common/packets_gen.h 2011-08-08 04:27:08.000000000 +0000 +++ freeciv-2.3.1/common/packets_gen.h 2011-11-19 20:24:32.000000000 +0000 @@ -141,6 +141,7 @@ bool unreachable_protects; int sciencebox; float seconds_to_phasedone; + float seconds_to_phasedone2; int shieldbox; int skill_level; bool slow_invasions; diff -Nru freeciv-2.3.0/common/player.c freeciv-2.3.1/common/player.c --- freeciv-2.3.0/common/player.c 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/player.c 2011-11-19 20:21:56.000000000 +0000 @@ -420,6 +420,21 @@ return player_slots.slots + player_id; } +/**************************************************************************** + Return the highest used player slot index. +****************************************************************************/ +int player_slot_max_used_number(void) +{ + int max_pslot = 0; + + player_slots_iterate(pslot) { + if (player_slot_is_used(pslot)) { + max_pslot = player_slot_index(pslot); + } + } player_slots_iterate_end; + + return max_pslot; +} /**************************************************************************** Creates a new player for the slot. If slot is NULL, it will lookup to a diff -Nru freeciv-2.3.0/common/player.h freeciv-2.3.1/common/player.h --- freeciv-2.3.0/common/player.h 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/player.h 2011-11-19 20:21:56.000000000 +0000 @@ -259,6 +259,7 @@ struct player *player_slot_get_player(const struct player_slot *pslot); bool player_slot_is_used(const struct player_slot *pslot); struct player_slot *player_slot_by_number(int player_id); +int player_slot_max_used_number(void); /* General player accessor functions. */ struct player *player_new(struct player_slot *pslot); diff -Nru freeciv-2.3.0/common/tile.c freeciv-2.3.1/common/tile.c --- freeciv-2.3.0/common/tile.c 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/tile.c 2011-11-19 20:21:56.000000000 +0000 @@ -117,7 +117,16 @@ ****************************************************************************/ void tile_set_terrain(struct tile *ptile, struct terrain *pterrain) { + /* The terrain change is valid if one of the following is TRUE: + * - pterrain is NULL (= unknown terrain) + * - ptile is a virtual tile + * - pterrain does not has the flag TER_NO_CITIES + * - there is no city on ptile. + * This should be read as: The terrain change is INVALID if a terrain with + * the flag TER_NO_CITIES is given for a real tile with a city (i.e. all + * check evaluate to TRUE). */ fc_assert_msg(NULL == pterrain + || tile_virtual_check(ptile) || !terrain_has_flag(pterrain, TER_NO_CITIES) || NULL == tile_city(ptile), "At (%d, %d), the terrain \"%s\" (nb %d) doesn't " @@ -440,12 +449,27 @@ /**************************************************************************** Clear all infrastructure (man-made specials) from the tile. ****************************************************************************/ -static void tile_clear_infrastructure(struct tile *ptile) +static void tile_clear_unsupported_infrastructure(struct tile *ptile) { int i; + bool city_present = tile_city(ptile) != NULL; + struct terrain *pterr = tile_terrain(ptile); + bool ocean = is_ocean(pterr); for (i = 0; infrastructure_specials[i] != S_LAST; i++) { - tile_clear_special(ptile, infrastructure_specials[i]); + switch (infrastructure_specials[i]) { + case S_ROAD: + case S_RAILROAD: + if (!city_present && pterr->road_time == 0) { + tile_clear_special(ptile, infrastructure_specials[i]); + } + break; + default: + if (ocean) { + tile_clear_special(ptile, infrastructure_specials[i]); + } + break; + } } } @@ -466,9 +490,9 @@ void tile_change_terrain(struct tile *ptile, struct terrain *pterrain) { tile_set_terrain(ptile, pterrain); - if (is_ocean(pterrain)) { - tile_clear_infrastructure(ptile); + tile_clear_unsupported_infrastructure(ptile); + if (is_ocean(pterrain)) { /* The code can't handle these specials in ocean. */ tile_clear_special(ptile, S_RIVER); tile_clear_special(ptile, S_HUT); @@ -493,6 +517,11 @@ base_type_iterate(pbase) { if (tile_has_base(ptile, pbase) && !is_native_tile_to_base(pbase, ptile)) { + if (fc_funcs->destroy_base != NULL) { + fc_funcs->destroy_base(ptile, pbase); + } else { + tile_remove_base(ptile, pbase); + } tile_remove_base(ptile, pbase); } } base_type_iterate_end; @@ -818,6 +847,11 @@ vtile->spec_sprite = NULL; if (ptile) { + /* Used by is_city_center to give virtual tiles the output bonuses + * they deserve */ + vtile->x = ptile->x; + vtile->y = ptile->y; + /* Copy all but the unit list. */ tile_special_type_iterate(spe) { if (BV_ISSET(ptile->special, spe)) { @@ -825,6 +859,10 @@ } } tile_special_type_iterate_end; + if (BV_ISSET(ptile->special, S_RESOURCE_VALID)) { + BV_SET(vtile->special, S_RESOURCE_VALID); + } + base_type_iterate(pbase) { if (BV_ISSET(ptile->bases, base_number(pbase))) { BV_SET(vtile->bases, base_number(pbase)); @@ -877,3 +915,39 @@ free(vtile); } + +/**************************************************************************** + Check if the given tile is a virtual one or not. +****************************************************************************/ +bool tile_virtual_check(struct tile *vtile) +{ + int tindex; + + if (!vtile || map_is_empty()) { + return FALSE; + } + + tindex = tile_index(vtile); + + if (tindex == -1) { + /* This is a virtual tile. */ + return TRUE; + } + + fc_assert_ret_val(0 <= tindex && tindex < map_num_tiles(), FALSE); + + return (vtile != map.tiles + tindex); +} + +/**************************************************************************** + Returns key that should be used when storing tile to hash or when + retrieving it from there. +****************************************************************************/ +void *tile_hash_key(const struct tile *ptile) +{ + void *key = 0; /* Initialize whole sizeof(void *) */ + + key = FC_INT_TO_PTR(ptile->index); + + return key; +} diff -Nru freeciv-2.3.0/common/tile.h freeciv-2.3.1/common/tile.h --- freeciv-2.3.0/common/tile.h 2011-08-08 04:20:40.000000000 +0000 +++ freeciv-2.3.1/common/tile.h 2011-11-19 20:21:56.000000000 +0000 @@ -152,5 +152,8 @@ /* Virtual tiles are tiles that do not exist on the game map. */ struct tile *tile_virtual_new(const struct tile *ptile); void tile_virtual_destroy(struct tile *vtile); +bool tile_virtual_check(struct tile *vtile); + +void *tile_hash_key(const struct tile *ptile); #endif /* FC__TILE_H */ diff -Nru freeciv-2.3.0/configure freeciv-2.3.1/configure --- freeciv-2.3.0/configure 2011-08-08 04:25:47.000000000 +0000 +++ freeciv-2.3.1/configure 2011-11-19 20:24:02.000000000 +0000 @@ -1,10 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for freeciv 2.3.0. +# Generated by GNU Autoconf 2.65 for freeciv 2.3.1. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software -# Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -673,7 +675,8 @@ -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -695,8 +698,8 @@ # Identity of this package. PACKAGE_NAME='freeciv' PACKAGE_TARNAME='freeciv' -PACKAGE_VERSION='2.3.0' -PACKAGE_STRING='freeciv 2.3.0' +PACKAGE_VERSION='2.3.1' +PACKAGE_STRING='freeciv 2.3.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -910,7 +913,6 @@ LTLIBICONV LIBICONV UNAME -CXXCPP OTOOL64 OTOOL LIPO @@ -927,12 +929,6 @@ FGREP LIBTOOL LN_S -am__fastdepCXX_FALSE -am__fastdepCXX_TRUE -CXXDEPMODE -ac_ct_CXX -CXXFLAGS -CXX MAKE_CLIENT_INCLUDE_FALSE MAKE_CLIENT_INCLUDE_TRUE MAKE_DATA_FALSE @@ -1054,6 +1050,7 @@ enable_silent_rules enable_auth with_mysql_prefix +with_mysql_libdir enable_server enable_ipv6 with_readline @@ -1122,10 +1119,6 @@ PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS -CXX -CXXFLAGS -CCC -CXXCPP XMKMF PNG_CFLAGS PNG_LIBS @@ -1672,7 +1665,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures freeciv 2.3.0 to adapt to many kinds of systems. +\`configure' configures freeciv 2.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1746,7 +1739,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of freeciv 2.3.0:";; + short | recursive ) echo "Configuration of freeciv 2.3.1:";; esac cat <<\_ACEOF @@ -1795,6 +1788,7 @@ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-mysql-prefix=PFX Prefix where MySQL is installed (optional) + --with-mysql-libdir=Where MySQL library is installed (optional) --with-readline support fancy command line editing --with-xaw use the Xaw widget set for the xaw client --with-xaw3d use the Xaw3d widget set for the xaw client @@ -1849,16 +1843,13 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility CAIRO_CFLAGS C compiler flags for CAIRO, overriding pkg-config CAIRO_LIBS linker flags for CAIRO, overriding pkg-config - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor XMKMF Path to xmkmf, Makefile generator for X Window System PNG_CFLAGS C compiler flags for PNG, overriding pkg-config PNG_LIBS linker flags for PNG, overriding pkg-config @@ -1933,8 +1924,8 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -freeciv configure 2.3.0 -generated by GNU Autoconf 2.64 +freeciv configure 2.3.1 +generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1981,7 +1972,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -2018,7 +2009,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -2147,7 +2138,7 @@ fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -2224,7 +2215,7 @@ # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -2295,127 +2286,6 @@ } # ac_fn_c_check_func -# ac_fn_cxx_try_compile LINENO -# ---------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval - -} # ac_fn_cxx_try_compile - -# ac_fn_cxx_try_cpp LINENO -# ------------------------ -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval - -} # ac_fn_cxx_try_cpp - -# ac_fn_cxx_try_link LINENO -# ------------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval - -} # ac_fn_cxx_try_link - # ac_fn_c_check_type LINENO TYPE VAR INCLUDES # ------------------------------------------- # Tests whether TYPE exists after having included INCLUDES, setting cache @@ -2473,8 +2343,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by freeciv $as_me 2.3.0, which was -generated by GNU Autoconf 2.64. Invocation command line was +It was created by freeciv $as_me 2.3.1, which was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2727,7 +2597,7 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 @@ -2736,9 +2606,9 @@ done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in @@ -3241,32 +3111,30 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + int main () { -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -3328,10 +3196,10 @@ else ac_file='' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } if test -z "$ac_file"; then : - $as_echo "$as_me: failed program was:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -3339,51 +3207,18 @@ { as_fn_set_status 77 as_fn_error "C compiler cannot create executables See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" @@ -3416,13 +3251,72 @@ as_fn_error "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." "$LINENO" 5; } fi -rm -f conftest$ac_cv_exeext +rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then : @@ -4186,7 +4080,7 @@ MAJOR_VERSION="2" MINOR_VERSION="3" -PATCH_VERSION="0" +PATCH_VERSION="1" VERSION_LABEL="" IS_DEVEL_VERSION=0 @@ -4208,7 +4102,7 @@ # as long as possible. We want to maintain network compatibility with # the stable branch for as long as possible. NETWORK_CAPSTRING_MANDATORY="+Freeciv-2.3-network" -NETWORK_CAPSTRING_OPTIONAL="" +NETWORK_CAPSTRING_OPTIONAL="timeout_extended_range" if test x$VERSION_SCRIPT_SILENT != xyes ; then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL} @@ -4601,6 +4495,7 @@ fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -4608,7 +4503,6 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi @@ -4787,7 +4681,7 @@ # Define the identity of the package. PACKAGE='freeciv' - VERSION='2.3.0' + VERSION='2.3.1' cat >>confdefs.h <<_ACEOF @@ -4992,6 +4886,17 @@ fi + if test "x$mysql_prefix" != "x" ; then + mysql_libdir="$mysql_prefix/lib/mysql" + fi + + +# Check whether --with-mysql-libdir was given. +if test "${with_mysql_libdir+set}" = set; then : + withval=$with_mysql_libdir; mysql_libdir="$withval" +fi + + if test x$auth = xyes ; then if test x$mysql_prefix = x ; then @@ -5006,8 +4911,8 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 + if test "x$mysql_libdir" = "x" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 $as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; } if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -5048,19 +4953,18 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql libs in normal locations" >&5 $as_echo "$as_me: WARNING: couldn't find mysql libs in normal locations" >&2;}; - auth=no + auth=no fi + if test x$auth = xno ; then + fc_preauth_LDFLAGS="$LDFLAGS" + fc_mysql_lib_loc="-L/usr/lib/mysql -L/usr/local/lib/mysql" - if test x$auth = xno ; then - fc_preauth_LDFLAGS="$LDFLAGS" - fc_mysql_lib_loc="-L/usr/lib/mysql -L/usr/local/lib/mysql" - - for __ldpath in $fc_mysql_lib_loc; do - unset ac_cv_lib_mysqlclient_mysql_query - LDFLAGS="$LDFLAGS $__ldpath" + for __ldpath in $fc_mysql_lib_loc; do + unset ac_cv_lib_mysqlclient_mysql_query + LDFLAGS="$LDFLAGS $__ldpath" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 $as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; } if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -5098,46 +5002,94 @@ $as_echo "$ac_cv_lib_mysqlclient_mysql_query" >&6; } if test "x$ac_cv_lib_mysqlclient_mysql_query" = x""yes; then : AUTH_LIBS="-lmysqlclient $AUTH_LIBS"; - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: had to add $__ldpath to LDFLAGS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: had to add $__ldpath to LDFLAGS" >&5 $as_echo "$as_me: WARNING: had to add $__ldpath to LDFLAGS" >&2;} - auth=yes + auth=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql libs in $__ldpath" >&5 $as_echo "$as_me: WARNING: couldn't find mysql libs in $__ldpath" >&2;} fi - if test x$auth = xyes; then - break - else - LDFLAGS="$fc_preauth_LDFLAGS" - fi - done - - if test x$auth = xno ; then - as_fn_error "couldn't find mysql libs at all" "$LINENO" 5 + if test x$auth = xyes; then + break + else + LDFLAGS="$fc_preauth_LDFLAGS" + fi + done fi - fi - else - AUTH_CFLAGS="-I$mysql_prefix/include $AUTH_CFLAGS" - AUTH_LIBS="-L$mysql_prefix/lib/mysql -lmysqlclient $AUTH_LIBS" - auth_saved_cflags="$CFLAGS" - auth_saved_cppflags="$CPPFLAGS" - auth_saved_libs="$LIBS" - CFLAGS="$CFLAGS $AUTH_CFLAGS" - CPPFLAGS="$CPPFLAGS $AUTH_CFLAGS" - LIBS="$LIBS $AUTH_LIBS" - ac_fn_c_check_header_mongrel "$LINENO" "mysql/mysql.h" "ac_cv_header_mysql_mysql_h" "$ac_includes_default" -if test "x$ac_cv_header_mysql_mysql_h" = x""yes; then : - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql header in $mysql_prefix/include" >&5 -$as_echo "$as_me: WARNING: couldn't find mysql header in $mysql_prefix/include" >&2;}; - auth=no -fi - - if test x$auth = xyes; then + else + LDFLAGS="$LDFLAGS -L$mysql_libdir" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 +$as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; } +if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmysqlclient $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mysql_query (); +int +main () +{ +return mysql_query (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mysqlclient_mysql_query=yes +else + ac_cv_lib_mysqlclient_mysql_query=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_query" >&5 +$as_echo "$ac_cv_lib_mysqlclient_mysql_query" >&6; } +if test "x$ac_cv_lib_mysqlclient_mysql_query" = x""yes; then : + AUTH_LIBS="-lmysqlclient $AUTH_LIBS" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql libs in $mysql_libdir" >&5 +$as_echo "$as_me: WARNING: couldn't find mysql libs in $mysql_libdir" >&2;}; + auth=no +fi + + fi + + if test x$auth = xno ; then + as_fn_error "couldn't find mysql libs at all" "$LINENO" 5 + fi + else + AUTH_CFLAGS="-I$mysql_prefix/include $AUTH_CFLAGS" + AUTH_LIBS="-L$mysql_libdir -lmysqlclient $AUTH_LIBS" + auth_saved_cflags="$CFLAGS" + auth_saved_cppflags="$CPPFLAGS" + auth_saved_libs="$LIBS" + CFLAGS="$CFLAGS $AUTH_CFLAGS" + CPPFLAGS="$CPPFLAGS $AUTH_CFLAGS" + LIBS="$LIBS $AUTH_LIBS" + ac_fn_c_check_header_mongrel "$LINENO" "mysql/mysql.h" "ac_cv_header_mysql_mysql_h" "$ac_includes_default" +if test "x$ac_cv_header_mysql_mysql_h" = x""yes; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql header in $mysql_prefix/include" >&5 +$as_echo "$as_me: WARNING: couldn't find mysql header in $mysql_prefix/include" >&2;}; + auth=no +fi + + + if test x$auth = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5 $as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; } if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then : @@ -5182,8 +5134,8 @@ LIBS="-lmysqlclient $LIBS" else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql libs in $mysql_prefix/lib/mysql" >&5 -$as_echo "$as_me: WARNING: couldn't find mysql libs in $mysql_prefix/lib/mysql" >&2;}; + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql libs in $mysql_libdir" >&5 +$as_echo "$as_me: WARNING: couldn't find mysql libs in $mysql_libdir" >&2;}; auth=no fi @@ -6104,8 +6056,8 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -6459,481 +6411,58 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5 -$as_echo_n "checking whether the C++ compiler works... " >&6; } -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + +# Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + enable_shared=no fi - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - test -n "$ac_ct_CXX" && break -done - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + + +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C++ compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - -# Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=no -fi - - - - - - - - - -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.2.6' -macro_revision='1.3012' +macro_version='2.2.6b' +macro_revision='1.3017' @@ -7403,13 +6932,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:7406: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6935: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7409: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6938: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7412: output\"" >&5) + (eval echo "\"\$as_me:6941: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7864,11 +7393,11 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -8603,7 +8132,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8606 "configure"' > conftest.$ac_ext + echo '#line 8135 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9365,612 +8894,86 @@ -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +# Set options -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + enable_dlopen=no - test -n "$ac_ct_CXX" && break -done + enable_win32_dll=no - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : - $as_echo_n "(cached) " >&6 + # Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + enable_static=yes +fi -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : -else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi + pic_mode=default fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +test -z "$pic_mode" && pic_mode=default - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= + + + + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" ;; - none) break ;; esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -_lt_caught_CXX_error=yes; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -else - _lt_caught_CXX_error=yes -fi - - - - -# Set options - - - - enable_dlopen=no - - - enable_win32_dll=no - - - - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes -fi - - - - - - - - - - -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" -else - pic_mode=default -fi - - -test -z "$pic_mode" && pic_mode=default - - - - - - - - # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_fast_install=yes + enable_fast_install=yes fi @@ -10357,11 +9360,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10360: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9363: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10364: \$? = $ac_status" >&5 + echo "$as_me:9367: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10526,7 +9529,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -10696,11 +9699,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10699: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9702: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10703: \$? = $ac_status" >&5 + echo "$as_me:9706: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10801,11 +9804,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10804: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9807: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10808: \$? = $ac_status" >&5 + echo "$as_me:9811: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10856,11 +9859,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10859: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9862: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10863: \$? = $ac_status" >&5 + echo "$as_me:9866: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10975,6 +9978,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -10996,6 +10002,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -11087,7 +10094,7 @@ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -11157,7 +10164,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -11332,6 +10339,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -11658,7 +10666,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -12548,7 +11556,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -12603,6 +11611,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -13223,7 +12243,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13226 "configure" +#line 12246 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13319,7 +12339,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13322 "configure" +#line 12342 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13414,2861 +12434,11 @@ *) enable_dlopen_self=unknown ;; esac - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - - - - - - - - - - - - - - - - -striplib= -old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac -fi - - - - - - - - - - - - - # Report which library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } - - - - -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -compiler_needs_object_CXX=no -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_direct_absolute_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -inherit_rpath_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - - ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' - else - lt_prog_compiler_no_builtin_flag_CXX= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if test "${lt_cv_path_LD+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - ld_shlibs_CXX=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - file_list_spec_CXX='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_CXX=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - export_dynamic_flag_spec_CXX='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; - darwin* | rhapsody*) - - - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - whole_archive_flag_spec_CXX='' - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - - else - ld_shlibs_CXX=no - fi - - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - ld_shlibs_CXX=no - ;; - - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - - gnu*) - ;; - - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - inherit_rpath_CXX=yes - ;; - - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [1-5]* | *pgcpp\ [1-5]*) - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 will use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - xl*) - # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object_CXX=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - ld_shlibs_CXX=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - hardcode_direct_absolute_CXX=yes - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=echo - else - ld_shlibs_CXX=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - case $host in - osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - ;; - *) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - ;; - esac - - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - - output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - GCC_CXX="$GXX" - LD_CXX="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - # Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= - -cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF - -if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - ;; - - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi - -$RM -f confest.$objext - -# PORTME: override above test on systems where it is broken -case $host_os in -interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac - - -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac - compiler_lib_search_dirs_CXX= -if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic_CXX='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - else - case $host_os in - aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - xlc* | xlC*) - # IBM XL 8.0 on PPC - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-qpic' - lt_prog_compiler_static_CXX='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } - - - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15278: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:15282: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi - -fi - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes - fi - else - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15377: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:15381: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15429: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:15433: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -with_gnu_ld_CXX=$with_gnu_ld - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5 -$as_echo "$archive_cmds_need_lc_CXX" >&6; } - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; - - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd1*) - dynamic_linker=no - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - -interix[3-9]*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - shlibpath_overrides_runpath=yes -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - - - - - - - - - - + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi @@ -16286,6 +12456,35 @@ +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac +fi @@ -16295,69 +12494,58 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || - test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then - # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 -$as_echo "$hardcode_action_CXX" >&6; } -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi + # Report which library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } - fi # test -n "$compiler" - CC=$lt_save_CC - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +CC="$lt_save_CC" + @@ -18490,196 +14678,24 @@ $as_echo "no" >&6; } as_fn_error "You are unable to create *.gmo files. This is development version which doesn't include them. Please update your -gettext package. We recommend you versions >= 0.10.38. Or use ---disable-nls instead." "$LINENO" 5 - - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - fi -else - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $lang.po" - done - -fi - -EXTRA_DEBUG_CFLAGS="" - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -flags_save="`eval echo '$'CFLAGS`" -accepted_flags="" - -for flag in -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wno-unused-but-set-variable -do - CFLAGS="$flags_save $accepted_flags $flag " - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int a; -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -old_value="`eval echo '$'accepted_flags`" -if test "x$old_value" = "x" ; then - accepted_flags="$flag" -elif test "x$flag" != "x" ; then - accepted_flags="$old_value $flag" -fi - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - -old_value="`eval echo '$'EXTRA_DEBUG_CFLAGS`" -if test "x$old_value" = "x" ; then - EXTRA_DEBUG_CFLAGS="$accepted_flags" -elif test "x$accepted_flags" != "x" ; then - EXTRA_DEBUG_CFLAGS="$old_value $accepted_flags" -fi - - -CFLAGS="$flags_save" - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; case "${enableval}" in - yes) enable_debug=yes ;; - some) enable_debug=some ;; - checks) enable_debug=checks ;; - no) enable_debug=no ;; - *) as_fn_error "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; -esac -else - enable_debug=some -fi - - -if test "x$enable_debug" = "xyes" -o "x$enable_debug" = "xchecks"; then - -$as_echo "#define DEBUG 1" >>confdefs.h - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -flags_save="`eval echo '$'CFLAGS`" -accepted_flags="" - -for flag in -Werror -do - CFLAGS="$flags_save $accepted_flags $flag " - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int a; -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -old_value="`eval echo '$'accepted_flags`" -if test "x$old_value" = "x" ; then - accepted_flags="$flag" -elif test "x$flag" != "x" ; then - accepted_flags="$old_value $flag" -fi - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - -old_value="`eval echo '$'EXTRA_DEBUG_CFLAGS`" -if test "x$old_value" = "x" ; then - EXTRA_DEBUG_CFLAGS="$accepted_flags" -elif test "x$accepted_flags" != "x" ; then - EXTRA_DEBUG_CFLAGS="$old_value $accepted_flags" -fi - - -CFLAGS="$flags_save" - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -flags_save="`eval echo '$'CXXFLAGS`" -accepted_flags="" - -for flag in -Werror -do - CXXFLAGS="$flags_save $accepted_flags $flag " - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int a; -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -old_value="`eval echo '$'accepted_flags`" -if test "x$old_value" = "x" ; then - accepted_flags="$flag" -elif test "x$flag" != "x" ; then - accepted_flags="$old_value $flag" -fi - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - -old_value="`eval echo '$'EXTRA_DEBUG_CXXFLAGS`" -if test "x$old_value" = "x" ; then - EXTRA_DEBUG_CXXFLAGS="$accepted_flags" -elif test "x$accepted_flags" != "x" ; then - EXTRA_DEBUG_CXXFLAGS="$old_value $accepted_flags" -fi - - -CXXFLAGS="$flags_save" +gettext package. We recommend you versions >= 0.10.38. Or use +--disable-nls instead." "$LINENO" 5 -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + fi +else + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $lang.po" + done +fi - if test "x$enable_debug" = "xchecks"; then +EXTRA_DEBUG_CFLAGS="" ac_ext=c @@ -18692,7 +14708,7 @@ flags_save="`eval echo '$'CFLAGS`" accepted_flags="" -for flag in -Werror -Wall -Wpointer-arith -Wcast-align +for flag in -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wno-unused-but-set-variable do CFLAGS="$flags_save $accepted_flags $flag " cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18732,6 +14748,26 @@ +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; case "${enableval}" in + yes) enable_debug=yes ;; + some) enable_debug=some ;; + checks) enable_debug=checks ;; + no) enable_debug=no ;; + *) as_fn_error "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; +esac +else + enable_debug=some +fi + + +if test "x$enable_debug" = "xyes" -o "x$enable_debug" = "xchecks"; then + +$as_echo "#define DEBUG 1" >>confdefs.h + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18742,7 +14778,7 @@ flags_save="`eval echo '$'CFLAGS`" accepted_flags="" -for flag in -Wmissing-prototypes -Wmissing-declarations +for flag in -Werror do CFLAGS="$flags_save $accepted_flags $flag " cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18781,6 +14817,8 @@ + if test "x$enable_debug" = "xchecks"; then + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -18792,7 +14830,7 @@ flags_save="`eval echo '$'CFLAGS`" accepted_flags="" -for flag in -Wstrict-prototypes -Wnested-externs -Wl,--no-add-needed +for flag in -Werror -Wall -Wpointer-arith -Wcast-align do CFLAGS="$flags_save $accepted_flags $flag " cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18832,24 +14870,24 @@ -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -flags_save="`eval echo '$'CXXFLAGS`" +flags_save="`eval echo '$'CFLAGS`" accepted_flags="" -for flag in -Werror -Wall -Wpointer-arith -Wcast-align +for flag in -Wmissing-prototypes -Wmissing-declarations do - CXXFLAGS="$flags_save $accepted_flags $flag " + CFLAGS="$flags_save $accepted_flags $flag " cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int a; _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO"; then : old_value="`eval echo '$'accepted_flags`" if test "x$old_value" = "x" ; then @@ -18862,15 +14900,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done -old_value="`eval echo '$'EXTRA_DEBUG_CXXFLAGS`" +old_value="`eval echo '$'EXTRA_DEBUG_CFLAGS`" if test "x$old_value" = "x" ; then - EXTRA_DEBUG_CXXFLAGS="$accepted_flags" + EXTRA_DEBUG_CFLAGS="$accepted_flags" elif test "x$accepted_flags" != "x" ; then - EXTRA_DEBUG_CXXFLAGS="$old_value $accepted_flags" + EXTRA_DEBUG_CFLAGS="$old_value $accepted_flags" fi -CXXFLAGS="$flags_save" +CFLAGS="$flags_save" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -18882,24 +14920,24 @@ -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -flags_save="`eval echo '$'CXXFLAGS`" +flags_save="`eval echo '$'CFLAGS`" accepted_flags="" -for flag in --Wmissing-declarations +for flag in -Wstrict-prototypes -Wnested-externs -Wl,--no-add-needed do - CXXFLAGS="$flags_save $accepted_flags $flag " + CFLAGS="$flags_save $accepted_flags $flag " cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int a; _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO"; then : old_value="`eval echo '$'accepted_flags`" if test "x$old_value" = "x" ; then @@ -18912,15 +14950,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done -old_value="`eval echo '$'EXTRA_DEBUG_CXXFLAGS`" +old_value="`eval echo '$'EXTRA_DEBUG_CFLAGS`" if test "x$old_value" = "x" ; then - EXTRA_DEBUG_CXXFLAGS="$accepted_flags" + EXTRA_DEBUG_CFLAGS="$accepted_flags" elif test "x$accepted_flags" != "x" ; then - EXTRA_DEBUG_CXXFLAGS="$old_value $accepted_flags" + EXTRA_DEBUG_CFLAGS="$old_value $accepted_flags" fi -CXXFLAGS="$flags_save" +CFLAGS="$flags_save" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -18986,56 +15024,6 @@ - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -flags_save="`eval echo '$'CXXFLAGS`" -accepted_flags="" - -for flag in -O3 -fomit-frame-pointer -do - CXXFLAGS="$flags_save $accepted_flags $flag " - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int a; -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -old_value="`eval echo '$'accepted_flags`" -if test "x$old_value" = "x" ; then - accepted_flags="$flag" -elif test "x$flag" != "x" ; then - accepted_flags="$old_value $flag" -fi - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - -old_value="`eval echo '$'EXTRA_DEBUG_CXXFLAGS`" -if test "x$old_value" = "x" ; then - EXTRA_DEBUG_CXXFLAGS="$accepted_flags" -elif test "x$accepted_flags" != "x" ; then - EXTRA_DEBUG_CXXFLAGS="$old_value $accepted_flags" -fi - - -CXXFLAGS="$flags_save" - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - fi fi @@ -19103,56 +15091,6 @@ - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -flags_save="`eval echo '$'CXXFLAGS`" -accepted_flags="" - -for flag in -pg -do - CXXFLAGS="$flags_save $accepted_flags $flag " - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int a; -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -old_value="`eval echo '$'accepted_flags`" -if test "x$old_value" = "x" ; then - accepted_flags="$flag" -elif test "x$flag" != "x" ; then - accepted_flags="$old_value $flag" -fi - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done - -old_value="`eval echo '$'EXTRA_DEBUG_CXXFLAGS`" -if test "x$old_value" = "x" ; then - EXTRA_DEBUG_CXXFLAGS="$accepted_flags" -elif test "x$accepted_flags" != "x" ; then - EXTRA_DEBUG_CXXFLAGS="$old_value $accepted_flags" -fi - - -CXXFLAGS="$flags_save" - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - fi @@ -24625,7 +20563,7 @@ do for j in $libggz_header; do - echo "configure: 24628: $i/$j" >&5 + echo "configure: 20566: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 libggz_incdir=$i @@ -24881,7 +20819,7 @@ do for j in $ggzmod_header; do - echo "configure: 24884: $i/$j" >&5 + echo "configure: 20822: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggzmod_incdir=$i @@ -25011,7 +20949,7 @@ do for j in ggz-config; do - echo "configure: 25014: $i/$j" >&5 + echo "configure: 20952: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggz_config_dir=$i @@ -25240,7 +21178,7 @@ do for j in $ggz_gtk_header; do - echo "configure: 25243: $i/$j" >&5 + echo "configure: 21181: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggz_gtk_incdir=$i @@ -25432,7 +21370,7 @@ do for j in $libggz_header; do - echo "configure: 25435: $i/$j" >&5 + echo "configure: 21373: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 libggz_incdir=$i @@ -25684,7 +21622,7 @@ do for j in $ggzdmod_header; do - echo "configure: 25687: $i/$j" >&5 + echo "configure: 21625: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggzdmod_incdir=$i @@ -26114,7 +22052,7 @@ do for j in $libggz_header; do - echo "configure: 26117: $i/$j" >&5 + echo "configure: 22055: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 libggz_incdir=$i @@ -26370,7 +22308,7 @@ do for j in $ggzmod_header; do - echo "configure: 26373: $i/$j" >&5 + echo "configure: 22311: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggzmod_incdir=$i @@ -26500,7 +22438,7 @@ do for j in ggz-config; do - echo "configure: 26503: $i/$j" >&5 + echo "configure: 22441: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggz_config_dir=$i @@ -26729,7 +22667,7 @@ do for j in $ggz_gtk_header; do - echo "configure: 26732: $i/$j" >&5 + echo "configure: 22670: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggz_gtk_incdir=$i @@ -26921,7 +22859,7 @@ do for j in $libggz_header; do - echo "configure: 26924: $i/$j" >&5 + echo "configure: 22862: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 libggz_incdir=$i @@ -27173,7 +23111,7 @@ do for j in $ggzdmod_header; do - echo "configure: 27176: $i/$j" >&5 + echo "configure: 23114: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 ggzdmod_incdir=$i @@ -27792,6 +23730,8 @@ MP_gtk2_CFLAGS="$MP_gtk2_CFLAGS -mms-bitfields" MP_gtk2_LIBS="$GTK_LIBS" MP_gtk2_LDFLAGS="$MP_gtk2_LDFLAGS -mwindows" + else + MP_gtk2_CFLAGS="$MP_gtk2_CFLAGS -DMPICON_PATH=\"\\\"$datadir/freeciv/misc/mpicon.png\\\"\"" fi fi @@ -30292,7 +26232,7 @@ _ACEOF -ac_config_files="$ac_config_files Makefile data/Makefile data/civclient.dsc data/civserver.dsc data/civserver.room data/hex2t/Makefile data/amplio2/Makefile data/buildings/Makefile data/flags/Makefile data/misc/Makefile data/trident/Makefile data/isophex/Makefile data/isotrident/Makefile data/stdsounds/Makefile data/default/Makefile data/multiplayer/Makefile data/experimental/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/themes/Makefile data/themes/gui-gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile data/themes/gui-sdl/Makefile data/themes/gui-sdl/human/Makefile data/wonders/Makefile data/icons/Makefile utility/Makefile utility/ftwl/Makefile dependencies/Makefile dependencies/lua-5.1/Makefile dependencies/lua-5.1/src/Makefile dependencies/tolua-5.1/Makefile dependencies/tolua-5.1/src/Makefile dependencies/tolua-5.1/src/lib/Makefile dependencies/tolua-5.1/src/bin/Makefile common/Makefile common/aicore/Makefile ai/Makefile tests/Makefile win32/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-sdl/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-ftwl/Makefile client/gui-stub/Makefile server/Makefile server/advisors/Makefile server/generator/Makefile server/scripting/Makefile manual/Makefile modinst/Makefile po/Makefile.in doc/Makefile doc/man/Makefile doc/man/freeciv-client.6 doc/man/freeciv-server.6 doc/ca/Makefile doc/de/Makefile doc/fr/Makefile doc/it/Makefile doc/ja/Makefile doc/nl/Makefile doc/sv/Makefile freeciv.spec:bootstrap/freeciv.spec.in bootstrap/undep.sh data/Freeciv client/freeciv.desktop:bootstrap/freeciv.desktop.in server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in" +ac_config_files="$ac_config_files Makefile data/Makefile data/civclient.dsc data/civserver.dsc data/civserver.room data/hex2t/Makefile data/amplio2/Makefile data/buildings/Makefile data/flags/Makefile data/misc/Makefile data/trident/Makefile data/isophex/Makefile data/isotrident/Makefile data/stdsounds/Makefile data/default/Makefile data/multiplayer/Makefile data/experimental/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/themes/Makefile data/themes/gui-gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile data/themes/gui-sdl/Makefile data/themes/gui-sdl/human/Makefile data/wonders/Makefile data/icons/Makefile utility/Makefile utility/ftwl/Makefile dependencies/Makefile dependencies/lua-5.1/Makefile dependencies/lua-5.1/src/Makefile dependencies/tolua-5.1/Makefile dependencies/tolua-5.1/src/Makefile dependencies/tolua-5.1/src/lib/Makefile dependencies/tolua-5.1/src/bin/Makefile common/Makefile common/aicore/Makefile ai/Makefile tests/Makefile win32/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-sdl/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-ftwl/Makefile client/gui-stub/Makefile server/Makefile server/advisors/Makefile server/generator/Makefile server/scripting/Makefile manual/Makefile modinst/Makefile po/Makefile.in doc/Makefile doc/man/Makefile doc/man/freeciv-client.6 doc/man/freeciv-server.6 doc/man/freeciv-modpack.6 doc/ca/Makefile doc/de/Makefile doc/fr/Makefile doc/it/Makefile doc/ja/Makefile doc/nl/Makefile doc/sv/Makefile freeciv.spec:bootstrap/freeciv.spec.in bootstrap/undep.sh data/Freeciv client/freeciv.desktop:bootstrap/freeciv.desktop.in server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in modinst/freeciv-modpack.desktop:bootstrap/freeciv-modpack.desktop.in" ac_config_files="$ac_config_files civ:bootstrap/civ.in" @@ -30440,14 +26380,6 @@ as_fn_error "conditional \"MAKE_CLIENT_INCLUDE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${GGZ_CLIENT_TRUE}" && test -z "${GGZ_CLIENT_FALSE}"; then as_fn_error "conditional \"GGZ_CLIENT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -30940,8 +26872,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by freeciv $as_me 2.3.0, which was -generated by GNU Autoconf 2.64. Invocation command line was +This file was extended by freeciv $as_me 2.3.1, which was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -30981,6 +26913,7 @@ -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -31003,10 +26936,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -freeciv config.status 2.3.0 -configured by $0, generated by GNU Autoconf 2.64, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +freeciv config.status 2.3.1 +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation @@ -31044,6 +26978,8 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) @@ -31243,59 +27179,6 @@ enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' -predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' -postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' @@ -31359,39 +27242,7 @@ soname_spec \ finish_eval \ old_striplib \ -striplib \ -compiler_lib_search_dirs \ -predep_objects \ -postdep_objects \ -predeps \ -postdeps \ -compiler_lib_search_path \ -LD_CXX \ -compiler_CXX \ -lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_wl_CXX \ -lt_prog_compiler_pic_CXX \ -lt_prog_compiler_static_CXX \ -lt_cv_prog_compiler_c_o_CXX \ -export_dynamic_flag_spec_CXX \ -whole_archive_flag_spec_CXX \ -compiler_needs_object_CXX \ -with_gnu_ld_CXX \ -allow_undefined_flag_CXX \ -no_undefined_flag_CXX \ -hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ -hardcode_libdir_separator_CXX \ -fix_srcfile_path_CXX \ -exclude_expsyms_CXX \ -include_expsyms_CXX \ -file_list_spec_CXX \ -compiler_lib_search_dirs_CXX \ -predep_objects_CXX \ -postdep_objects_CXX \ -predeps_CXX \ -postdeps_CXX \ -compiler_lib_search_path_CXX; do +striplib; do case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" @@ -31420,16 +27271,7 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ -old_archive_cmds_CXX \ -old_archive_from_new_cmds_CXX \ -old_archive_from_expsyms_cmds_CXX \ -archive_cmds_CXX \ -archive_expsym_cmds_CXX \ -module_cmds_CXX \ -module_expsym_cmds_CXX \ -export_symbols_cmds_CXX \ -prelink_cmds_CXX; do +sys_lib_dlsearch_path_spec; do case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" @@ -31471,8 +27313,6 @@ - - FORCE_DIST=$FORCE_DIST _ACEOF @@ -31572,6 +27412,7 @@ "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;; "doc/man/freeciv-client.6") CONFIG_FILES="$CONFIG_FILES doc/man/freeciv-client.6" ;; "doc/man/freeciv-server.6") CONFIG_FILES="$CONFIG_FILES doc/man/freeciv-server.6" ;; + "doc/man/freeciv-modpack.6") CONFIG_FILES="$CONFIG_FILES doc/man/freeciv-modpack.6" ;; "doc/ca/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ca/Makefile" ;; "doc/de/Makefile") CONFIG_FILES="$CONFIG_FILES doc/de/Makefile" ;; "doc/fr/Makefile") CONFIG_FILES="$CONFIG_FILES doc/fr/Makefile" ;; @@ -31584,6 +27425,7 @@ "data/Freeciv") CONFIG_FILES="$CONFIG_FILES data/Freeciv" ;; "client/freeciv.desktop") CONFIG_FILES="$CONFIG_FILES client/freeciv.desktop:bootstrap/freeciv.desktop.in" ;; "server/freeciv-server.desktop") CONFIG_FILES="$CONFIG_FILES server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in" ;; + "modinst/freeciv-modpack.desktop") CONFIG_FILES="$CONFIG_FILES modinst/freeciv-modpack.desktop:bootstrap/freeciv-modpack.desktop.in" ;; "civ") CONFIG_FILES="$CONFIG_FILES civ:bootstrap/civ.in" ;; "ser") CONFIG_FILES="$CONFIG_FILES ser:bootstrap/ser.in" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; @@ -31691,7 +27533,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -31705,7 +27547,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -32316,7 +28158,7 @@ # The names of the tagged configurations supported by this script. -available_tags="CXX " +available_tags="" # ### BEGIN LIBTOOL CONFIG @@ -32666,20 +28508,6 @@ # How to hardcode a shared library path into an executable. hardcode_action=$hardcode_action -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects -postdep_objects=$lt_postdep_objects -predeps=$lt_predeps -postdeps=$lt_postdeps - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path - # ### END LIBTOOL CONFIG _LT_EOF @@ -32915,159 +28743,6 @@ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" - - cat <<_LT_EOF >> "$ofile" - -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_CXX - -# A language specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU compiler? -with_gcc=$GCC_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_CXX - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_CXX - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute_CXX - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_CXX - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_CXX - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path_CXX - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_CXX - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_CXX - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects_CXX -postdep_objects=$lt_postdep_objects_CXX -predeps=$lt_predeps_CXX -postdeps=$lt_postdeps_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# ### END LIBTOOL TAG CONFIG: CXX -_LT_EOF - ;; "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile diff -Nru freeciv-2.3.0/configure.ac freeciv-2.3.1/configure.ac --- freeciv-2.3.0/configure.ac 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/configure.ac 2011-11-19 20:22:07.000000000 +0000 @@ -3,7 +3,7 @@ dnl Initialize with some random file to ensure the source is here. AC_INIT([freeciv], m4_esyscmd([./fc_version | tr -d '\n'])) -AC_PREREQ(2.58) +AC_PREREQ(2.59) AC_CONFIG_SRCDIR([common/game.c]) AC_CONFIG_AUX_DIR(bootstrap) # This can't be quoted or automake will fail AC_CONFIG_MACRO_DIR([m4]) @@ -250,15 +250,6 @@ AC_PROG_AWK AC_PROG_CC AC_PROG_CPP -AC_MSG_CHECKING([whether the C++ compiler works]) -AC_LANG_PUSH([C++]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM()], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no) - AC_MSG_FAILURE(no acceptable C++ compiler found in \$PATH) -) -AC_LANG_POP([C++]) AC_PROG_LN_S AC_DISABLE_SHARED AC_PROG_LIBTOOL @@ -693,6 +684,9 @@ MP_gtk2_CFLAGS="$MP_gtk2_CFLAGS -mms-bitfields" MP_gtk2_LIBS="$GTK_LIBS" MP_gtk2_LDFLAGS="$MP_gtk2_LDFLAGS -mwindows" + else + dnl Hack to get a run-time icon -- not needed on Windows + MP_gtk2_CFLAGS="$MP_gtk2_CFLAGS -DMPICON_PATH=\"\\\"$datadir/freeciv/misc/mpicon.png\\\"\"" fi ])]) AM_CONDITIONAL([MODINST], [test "x$modinst" = "xyes"]) @@ -1069,6 +1063,7 @@ doc/man/Makefile doc/man/freeciv-client.6 doc/man/freeciv-server.6 + doc/man/freeciv-modpack.6 doc/ca/Makefile doc/de/Makefile doc/fr/Makefile @@ -1080,7 +1075,8 @@ bootstrap/undep.sh data/Freeciv client/freeciv.desktop:bootstrap/freeciv.desktop.in - server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in]) + server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in + modinst/freeciv-modpack.desktop:bootstrap/freeciv-modpack.desktop.in]) AC_CONFIG_FILES([civ:bootstrap/civ.in], [chmod +x civ]) AC_CONFIG_FILES([ser:bootstrap/ser.in], [chmod +x ser]) AC_CONFIG_COMMANDS([default],[[ chmod +x bootstrap/undep.sh ; bootstrap/undep.sh ]],[[]]) diff -Nru freeciv-2.3.0/data/amplio2/Makefile.in freeciv-2.3.1/data/amplio2/Makefile.in --- freeciv-2.3.0/data/amplio2/Makefile.in 2011-08-08 04:25:53.000000000 +0000 +++ freeciv-2.3.1/data/amplio2/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ Binary files /tmp/KuHlWxdIDv/freeciv-2.3.0/data/amplio2/medievalcities.png and /tmp/e72AxD8Kxk/freeciv-2.3.1/data/amplio2/medievalcities.png differ diff -Nru freeciv-2.3.0/data/buildings/Makefile.in freeciv-2.3.1/data/buildings/Makefile.in --- freeciv-2.3.0/data/buildings/Makefile.in 2011-08-08 04:25:53.000000000 +0000 +++ freeciv-2.3.1/data/buildings/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/civ1/buildings.ruleset freeciv-2.3.1/data/civ1/buildings.ruleset --- freeciv-2.3.0/data/civ1/buildings.ruleset 2011-08-08 04:17:48.000000000 +0000 +++ freeciv-2.3.1/data/civ1/buildings.ruleset 2011-11-19 20:19:47.000000000 +0000 @@ -562,10 +562,10 @@ - Habitation Module: provides living space for 10,000 people.\ "), _("\ - Life Support Module: provides food and water for the population of\ - one Habitation Module.\ + one Habitation Module.\ "), _("\ - Solar Panels: provides the energy needed for any two of the other\ - Modules.\ + Modules.\ "), _("\ You can build up to 4 Space Modules of each kind.\ "), _("\ diff -Nru freeciv-2.3.0/data/civ1/game.ruleset freeciv-2.3.1/data/civ1/game.ruleset --- freeciv-2.3.0/data/civ1/game.ruleset 2011-08-08 04:17:48.000000000 +0000 +++ freeciv-2.3.1/data/civ1/game.ruleset 2011-11-19 20:19:47.000000000 +0000 @@ -19,12 +19,12 @@ ; Description of the ruleset description = _("You are playing with civ1 style rules. \ -These rules are much more simple than Freeciv default rules. \ -If you know only default rules, spend some time checking the \ +These rules are much simpler than the Freeciv default rules. \ +If you know only the default rules, spend some time checking the \ differences.\ \n\n\ - * There is less technologies, buildings and units\n\ - * Units have no hitpoints. If they win battle, they remain in full health\n\ + * There are fewer technologies, buildings and units.\n\ + * Units have no hitpoints. If they win a battle, they remain in full health.\n\ ") [options] diff -Nru freeciv-2.3.0/data/civ1/Makefile.in freeciv-2.3.1/data/civ1/Makefile.in --- freeciv-2.3.0/data/civ1/Makefile.in 2011-08-08 04:25:54.000000000 +0000 +++ freeciv-2.3.1/data/civ1/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/civ1/terrain.ruleset freeciv-2.3.1/data/civ1/terrain.ruleset --- freeciv-2.3.0/data/civ1/terrain.ruleset 2011-08-08 04:17:48.000000000 +0000 +++ freeciv-2.3.1/data/civ1/terrain.ruleset 2011-11-19 20:19:47.000000000 +0000 @@ -675,6 +675,8 @@ ; conflicts = List of bases that cannot be on the same tile. ; Bases with non-zero border_sq automatically conflict ; with each other. +; native_to = List of unit classes that are considered to +; be inside the base when they are on same tile ; flags ; - "NoAggressive" = Units inside are not considered aggressive ; - "NoStackDeath" = Units inside do not die all at once when attacked diff -Nru freeciv-2.3.0/data/civ2/buildings.ruleset freeciv-2.3.1/data/civ2/buildings.ruleset --- freeciv-2.3.0/data/civ2/buildings.ruleset 2011-08-08 04:17:48.000000000 +0000 +++ freeciv-2.3.1/data/civ2/buildings.ruleset 2011-11-19 20:19:47.000000000 +0000 @@ -561,7 +561,7 @@ helptext = _("\ Reduces the unhappiness caused by aggressively deployed military\ units owned by the city by 2 under Democracy and 1 under Republic\ - -- in other words, it neutralises the unhappiness caused by a single\ + -- in other words, it neutralizes the unhappiness caused by a single\ military unit. This improvement has no effect under other governments.\ ") @@ -800,10 +800,10 @@ - Habitation Module: provides living space for 10,000 people.\ "), _("\ - Life Support Module: provides food and water for the population of\ - one Habitation Module.\ + one Habitation Module.\ "), _("\ - Solar Panels: provides the energy needed for any two of the other\ - Modules.\ + Modules.\ "), _("\ You can build up to 4 Space Modules of each kind.\ "), _("\ @@ -1528,7 +1528,7 @@ Counts as a Police Station in every city. (That is, for each city, it\ reduces the unhappiness caused by aggressively deployed military\ units owned by that city by 2 under Democracy and 1 under Republic --\ - in other words, it neutralises the unhappiness caused by a single\ + in other words, it neutralizes the unhappiness caused by a single\ military unit per city. This wonder has no effect under other\ governments.)\ ") diff -Nru freeciv-2.3.0/data/civ2/Makefile.in freeciv-2.3.1/data/civ2/Makefile.in --- freeciv-2.3.0/data/civ2/Makefile.in 2011-08-08 04:25:54.000000000 +0000 +++ freeciv-2.3.1/data/civ2/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/civ2/terrain.ruleset freeciv-2.3.1/data/civ2/terrain.ruleset --- freeciv-2.3.0/data/civ2/terrain.ruleset 2011-08-08 04:17:48.000000000 +0000 +++ freeciv-2.3.1/data/civ2/terrain.ruleset 2011-11-19 20:19:47.000000000 +0000 @@ -788,6 +788,8 @@ ; conflicts = List of bases that cannot be on the same tile. ; Bases with non-zero border_sq automatically conflict ; with each other. +; native_to = List of unit classes that are considered to +; be inside the base when they are on same tile ; flags ; - "NoAggressive" = Units inside are not considered aggressive ; - "NoStackDeath" = Units inside do not die all at once when attacked diff -Nru freeciv-2.3.0/data/default/buildings.ruleset freeciv-2.3.1/data/default/buildings.ruleset --- freeciv-2.3.0/data/default/buildings.ruleset 2011-08-08 04:17:49.000000000 +0000 +++ freeciv-2.3.1/data/default/buildings.ruleset 2011-11-19 20:19:49.000000000 +0000 @@ -603,7 +603,7 @@ helptext = _("\ Reduces the unhappiness caused by aggressively deployed military\ units owned by the city by 2 under Democracy and 1 under Republic\ - -- in other words, it neutralises the unhappiness caused by a single\ + -- in other words, it neutralizes the unhappiness caused by a single\ military unit. This improvement has no effect under other governments.\ ") ; NOTE: @@ -858,10 +858,10 @@ - Habitation Module: provides living space for 10,000 people.\ "), _("\ - Life Support Module: provides food and water for the population of\ - one Habitation Module.\ + one Habitation Module.\ "), _("\ - Solar Panels: provides the energy needed for any two of the other\ - Modules.\ + Modules.\ "), _("\ You can build up to 4 Space Modules of each kind.\ "), _("\ @@ -1486,7 +1486,7 @@ sound_alt = "w_generic" ; /* xgettext:no-c-format */ helptext = _("\ -Boosts science production in each city with a Research Lab by 100%. \ +Boosts science production in each city with a Research Lab by 100%.\ ") [building_shakespeares_theatre] @@ -1598,7 +1598,7 @@ Counts as a Police Station in every city. (That is, for each city, it\ reduces the unhappiness caused by aggressively deployed military\ units owned by that city by 2 under Democracy and 1 under Republic --\ - in other words, it neutralises the unhappiness caused by a single\ + in other words, it neutralizes the unhappiness caused by a single\ military unit per city. This wonder has no effect under other\ governments.)\ ") diff -Nru freeciv-2.3.0/data/default/Makefile.in freeciv-2.3.1/data/default/Makefile.in --- freeciv-2.3.0/data/default/Makefile.in 2011-08-08 04:25:54.000000000 +0000 +++ freeciv-2.3.1/data/default/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/default/terrain.ruleset freeciv-2.3.1/data/default/terrain.ruleset --- freeciv-2.3.0/data/default/terrain.ruleset 2011-08-08 04:17:49.000000000 +0000 +++ freeciv-2.3.1/data/default/terrain.ruleset 2011-11-19 20:19:49.000000000 +0000 @@ -896,6 +896,8 @@ ; conflicts = List of bases that cannot be on the same tile. ; Bases with non-zero border_sq automatically conflict ; with each other. +; native_to = List of unit classes that are considered to +; be inside the base when they are on same tile ; flags ; - "NoAggressive" = Units inside are not considered aggressive ; - "NoStackDeath" = Units inside do not die all at once when attacked diff -Nru freeciv-2.3.0/data/experimental/buildings.ruleset freeciv-2.3.1/data/experimental/buildings.ruleset --- freeciv-2.3.0/data/experimental/buildings.ruleset 2011-08-08 04:19:03.000000000 +0000 +++ freeciv-2.3.1/data/experimental/buildings.ruleset 2011-11-19 20:20:09.000000000 +0000 @@ -90,7 +90,10 @@ sound_alt = "b_generic" helptext = _("\ Allows a city to grow larger than size 8 and reduces the chance of plague\ - within the city. A Sewer System is required for a city to grow larger\ + within the city. After Industrialization is researched this effect of\ + the Aqueduct is reduced.\ +"), _("\ +A Sewer System is required for a city to grow larger\ than size 12.\ ") ; NB: plague (illness) has to be activated in the ruleset @@ -392,7 +395,7 @@ sound_alt = "b_generic" helptext = _("\ A Hospital is used to treat the ill, and sometimes for medical research.\ - A city with a Hospital is less like to suffer from plagues.\ + A city with a Hospital is less likely to suffer from plagues.\ ") [building_hydro_plant] @@ -652,7 +655,7 @@ helptext = _("\ Reduces the unhappiness caused by aggressively deployed military\ units owned by the city by 2 under Democracy and 1 under Republic\ - -- in other words, it neutralises the unhappiness caused by a single\ + -- in other words, it neutralizes the unhappiness caused by a single\ military unit. This improvement has no effect under other governments.\ ") ; NOTE: @@ -907,10 +910,10 @@ - Habitation Module: provides living space for 10,000 people.\ "), _("\ - Life Support Module: provides food and water for the population of\ - one Habitation Module.\ + one Habitation Module.\ "), _("\ - Solar Panels: provides the energy needed for any two of the other\ - Modules.\ + Modules.\ "), _("\ You can build up to 4 Space Modules of each kind.\ "), _("\ @@ -1035,6 +1038,8 @@ this effect. With both Mysticism and the Oracle, 4 citizens are\ made content. Does not affect citizens made unhappy by military\ activity.\ +"), _("\ +The work of the priests also reduces the effect of plague in the city.\ ") [building_university] @@ -1538,7 +1543,7 @@ sound_alt = "w_generic" ; /* xgettext:no-c-format */ helptext = _("\ -Boosts science production in each city with a Research Lab by 100%. \ +Boosts science production in each city with a Research Lab by 100%.\ ") [building_shakespeares_theatre] @@ -1650,7 +1655,7 @@ Counts as a Police Station in every city. (That is, for each city, it\ reduces the unhappiness caused by aggressively deployed military\ units owned by that city by 2 under Democracy and 1 under Republic --\ - in other words, it neutralises the unhappiness caused by a single\ + in other words, it neutralizes the unhappiness caused by a single\ military unit per city. This wonder has no effect under other\ governments.)\ ") diff -Nru freeciv-2.3.0/data/experimental/effects.ruleset freeciv-2.3.1/data/experimental/effects.ruleset --- freeciv-2.3.0/data/experimental/effects.ruleset 2011-08-08 04:19:03.000000000 +0000 +++ freeciv-2.3.1/data/experimental/effects.ruleset 2011-11-19 20:20:09.000000000 +0000 @@ -806,7 +806,7 @@ "Building", "Aqueduct", "City" } -[effect_aqueduct_health] +[effect_aqueduct_health_1] name = "Health_Pct" value = 30 reqs = @@ -814,6 +814,18 @@ "Building", "Aqueduct", "City" } +[effect_aqueduct_health_2] +name = "Health_Pct" +value = 20 +reqs = + { "type", "name", "range" + "Building", "Aqueduct", "City" + } +nreqs = + { "type", "name", "range" + "Tech", "Industrialization", "Player" + } + [effect_bank] name = "Output_Bonus" value = 50 @@ -1814,6 +1826,14 @@ "Building", "Temple", "City" } +[effect_temple_2] +name = "Health_Pct" +value = 20 +reqs = + { "type", "name", "range" + "Building", "Temple", "City" + } + [effect_university] name = "Output_Bonus" value = 150 diff -Nru freeciv-2.3.0/data/experimental/Makefile.in freeciv-2.3.1/data/experimental/Makefile.in --- freeciv-2.3.0/data/experimental/Makefile.in 2011-08-08 04:25:54.000000000 +0000 +++ freeciv-2.3.1/data/experimental/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/experimental/terrain.ruleset freeciv-2.3.1/data/experimental/terrain.ruleset --- freeciv-2.3.0/data/experimental/terrain.ruleset 2011-08-08 04:19:03.000000000 +0000 +++ freeciv-2.3.1/data/experimental/terrain.ruleset 2011-11-19 20:20:09.000000000 +0000 @@ -898,6 +898,8 @@ ; conflicts = List of bases that cannot be on the same tile. ; Bases with non-zero border_sq automatically conflict ; with each other. +; native_to = List of unit classes that are considered to +; be inside the base when they are on same tile ; flags ; - "NoAggressive" = Units inside are not considered aggressive ; - "NoStackDeath" = Units inside do not die all at once when attacked diff -Nru freeciv-2.3.0/data/experimental/units.ruleset freeciv-2.3.1/data/experimental/units.ruleset --- freeciv-2.3.0/data/experimental/units.ruleset 2011-08-08 04:19:03.000000000 +0000 +++ freeciv-2.3.1/data/experimental/units.ruleset 2011-11-19 20:20:09.000000000 +0000 @@ -140,7 +140,7 @@ move_type = "Both" min_speed = 2 hp_loss_pct = 0 -flags = "TerrainSpeed", "DamageSlows", "RiverNative" +flags = "DamageSlows", "RiverNative" [unitclass_heli] ; /* TRANS: Unit class: used adjectivally */ diff -Nru freeciv-2.3.0/data/flags/Makefile.in freeciv-2.3.1/data/flags/Makefile.in --- freeciv-2.3.0/data/flags/Makefile.in 2011-08-08 04:25:54.000000000 +0000 +++ freeciv-2.3.1/data/flags/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/Freeciv freeciv-2.3.1/data/Freeciv --- freeciv-2.3.0/data/Freeciv 2011-08-08 04:26:50.000000000 +0000 +++ freeciv-2.3.1/data/Freeciv 2011-11-19 20:24:20.000000000 +0000 @@ -5,7 +5,7 @@ ! none widgets resources ! gotAppDefFile MUST be the first entry! Freeciv*gotAppDefFile: True -Freeciv*version: 2.3.0 +Freeciv*version: 2.3.1 Freeciv.title: Freeciv Freeciv.iconName: Freeciv Freeciv*borderColor: black @@ -70,102 +70,120 @@ Freeciv*connectdialog*translations: #override \ Return: key-dialog-connect-connect() -Freeciv*connectdialog.*.cheadline.label: _("Freeciv Server Selection") -Freeciv*connectdialog.*.cheadline.width: 300 - -Freeciv*connectdialog.*.cmsgl.label: -Freeciv*connectdialog.*.cmsgl.fromVert: cheadline -Freeciv*connectdialog.*.cmsgl.resizable: True - -Freeciv*connectdialog.*.cnamel.label: _("Name") -Freeciv*connectdialog.*.cnamel.fromVert: cmsgl - -Freeciv*connectdialog.*.cnamei.fromVert: cmsgl -Freeciv*connectdialog.*.cnamei.fromHoriz: cnamel -Freeciv*connectdialog.*.cnamei.*.editType: edit -Freeciv*connectdialog.*.cnamei.width: 256 - -Freeciv*connectdialog.*.chostl.label: _("Host") -Freeciv*connectdialog.*.chostl.fromVert: cnamel - -Freeciv*connectdialog.*.chosti.fromVert: cnamel -Freeciv*connectdialog.*.chosti.fromHoriz: chostl -Freeciv*connectdialog.*.chosti.*.editType: edit -Freeciv*connectdialog.*.chosti.width: 256 - -Freeciv*connectdialog.*.cportl.label: _("Port") -Freeciv*connectdialog.*.cportl.fromVert: chostl - -Freeciv*connectdialog.*.cporti.fromVert: chostl -Freeciv*connectdialog.*.cporti.fromHoriz: cportl -Freeciv*connectdialog.*.cporti.*.editType: edit -Freeciv*connectdialog.*.cporti.width: 256 - -Freeciv*connectdialog.*.cconnectc.label: _("Connect") -Freeciv*connectdialog.*.cconnectc.fromVert: cportl - -Freeciv*connectdialog.*.cmetac.label: _("Metaserver") -Freeciv*connectdialog.*.cmetac.fromVert: cportl -Freeciv*connectdialog.*.cmetac.fromHoriz: cconnectc - -Freeciv*connectdialog.*.clanc.label: _("LAN Servers") -Freeciv*connectdialog.*.clanc.fromVert: cportl -Freeciv*connectdialog.*.clanc.fromHoriz: cmetac - -Freeciv*connectdialog.*.cquitc.label: _("Quit") -Freeciv*connectdialog.*.cquitc.fromVert: cportl -Freeciv*connectdialog.*.cquitc.fromHoriz: clanc - -Freeciv*connectdialog.*.cbetaline.fromVert: cconnectc -Freeciv*connectdialog.*.cbetaline.justify: left -Freeciv*connectdialog.*.cbetaline.background: grey -Freeciv*connectdialog.*.cbetaline.foreground: red -Freeciv*connectdialog.*.cbetaline.width: 300 +Freeciv*connectdialog.*.connbetalabel.justify: left +Freeciv*connectdialog.*.connbetalabel.background: grey +Freeciv*connectdialog.*.connbetalabel.foreground: red +Freeciv*connectdialog.*.connbetalabel.width: 300 + +Freeciv*connectdialog.*.connselectlabel.label: _("Freeciv Server Selection") +Freeciv*connectdialog.*.connselectlabel.width: 300 + +Freeciv*connectdialog.*.connhostlabel.label: _("Host") +Freeciv*connectdialog.*.connhostlabel.fromVert: connselectlabel + +Freeciv*connectdialog.*.connhosttext.fromVert: connselectlabel +Freeciv*connectdialog.*.connhosttext.fromHoriz: connhostlabel +Freeciv*connectdialog.*.connhosttext.*.editType: edit +Freeciv*connectdialog.*.connhosttext.width: 256 + +Freeciv*connectdialog.*.connportlabel.label: _("Port") +Freeciv*connectdialog.*.connportlabel.fromVert: connhostlabel + +Freeciv*connectdialog.*.connporttext.fromVert: connhostlabel +Freeciv*connectdialog.*.connporttext.fromHoriz: connportlabel +Freeciv*connectdialog.*.connporttext.*.editType: edit +Freeciv*connectdialog.*.connporttext.width: 256 + +Freeciv*connectdialog.*.connloginlabel.label: _("Name") +Freeciv*connectdialog.*.connloginlabel.fromVert: connportlabel + +Freeciv*connectdialog.*.connlogintext.fromVert: connportlabel +Freeciv*connectdialog.*.connlogintext.fromHoriz: connloginlabel +Freeciv*connectdialog.*.connlogintext.*.editType: edit +Freeciv*connectdialog.*.connlogintext.width: 256 + +Freeciv*connectdialog.*.connpasswordlabel.label: _("Password") +Freeciv*connectdialog.*.connpasswordlabel.fromVert: connloginlabel + +Freeciv*connectdialog.*.connpasswordtext.fromVert: connloginlabel +Freeciv*connectdialog.*.connpasswordtext.fromHoriz: connpasswordlabel +Freeciv*connectdialog.*.connpasswordtext.*.editType: edit +Freeciv*connectdialog.*.connpasswordtext.width: 256 + +Freeciv*connectdialog.*.connverifylabel.label: _("Verify Password") +Freeciv*connectdialog.*.connverifylabel.fromVert: connpasswordlabel + +Freeciv*connectdialog.*.connverifytext.fromVert: connpasswordlabel +Freeciv*connectdialog.*.connverifytext.fromHoriz: connverifylabel +Freeciv*connectdialog.*.connverifytext.*.editType: edit +Freeciv*connectdialog.*.connverifytext.width: 256 + +Freeciv*connectdialog.*.connmessagelabel.label: +Freeciv*connectdialog.*.connmessagelabel.fromVert: connverifylabel +Freeciv*connectdialog.*.connmessagelabel.resizable: True + +Freeciv*connectdialog.*.connconnectbutton.label: _("Connect") +Freeciv*connectdialog.*.connconnectbutton.fromVert: connmessagelabel + +Freeciv*connectdialog.*.connlanbutton.label: _("LAN Servers") +Freeciv*connectdialog.*.connlanbutton.fromVert: connmessagelabel +Freeciv*connectdialog.*.connlanbutton.fromHoriz: connconnectbutton + +Freeciv*connectdialog.*.connmetabutton.label: _("Metaserver") +Freeciv*connectdialog.*.connmetabutton.fromVert: connmessagelabel +Freeciv*connectdialog.*.connmetabutton.fromHoriz: connlanbutton + +Freeciv*connectdialog.*.connquitbutton.label: _("Quit") +Freeciv*connectdialog.*.connquitbutton.fromVert: connmessagelabel +Freeciv*connectdialog.*.connquitbutton.fromHoriz: connmetabutton ! ! Metaserver dialog ! -Freeciv*metadialog.title: _("Freeciv Server List") -Freeciv*metadialog.allowShellResize: True +Freeciv*serverlistdialog.title: _("Freeciv Server List") +Freeciv*serverlistdialog.allowShellResize: True +Freeciv*serverlistdialog.width: 600 -Freeciv*metadialog.*.legend.label: _("\ +Freeciv*serverlistdialog.*.legendlabel.label: _("\ Server Name Port Version Status Players Comment") -Freeciv*metadialog.*.legend.justify: Left -Freeciv*metadialog.*.legend.left: ChainLeft -Freeciv*metadialog.*.legend.right: ChainLeft -Freeciv*metadialog.*.legend.top: ChainTop -Freeciv*metadialog.*.legend.bottom: ChainTop -Freeciv*metadialog.*.legend.resizable: True - -Freeciv*metadialog.*.metaviewport.allowVert: True -Freeciv*metadialog.*.metaviewport.allowHoriz: True -Freeciv*metadialog.*.metaviewport.useBottom: True -Freeciv*metadialog.*.metaviewport.fromVert: legend - -Freeciv*metadialog.*.metalist.forceColumns: True -Freeciv*metadialog.*.metalist.defaultColumns: 1 -Freeciv*metadialog.*.metalist.verticalList: True -Freeciv*metadialog.*.metalist.left: ChainLeft -Freeciv*metadialog.*.metalist.right: ChainRight -Freeciv*metadialog.*.metalist.top: ChainTop -Freeciv*metadialog.*.metalist.bottom: ChainBottom -Freeciv*metadialog.*.metalist.resizable: True - -Freeciv*metadialog.*.update.label: _("Update") -Freeciv*metadialog.*.update.left: ChainLeft -Freeciv*metadialog.*.update.right: ChainLeft -Freeciv*metadialog.*.update.top: ChainBottom -Freeciv*metadialog.*.update.bottom: ChainBottom -Freeciv*metadialog.*.update.fromVert: metaviewport - -Freeciv*metadialog.*.closecommand.label: _("Close") -Freeciv*metadialog.*.closecommand.left: ChainLeft -Freeciv*metadialog.*.closecommand.right: ChainLeft -Freeciv*metadialog.*.closecommand.top: ChainBottom -Freeciv*metadialog.*.closecommand.bottom: ChainBottom -Freeciv*metadialog.*.closecommand.fromVert: metaviewport -Freeciv*metadialog.*.closecommand.fromHoriz: update +Freeciv*serverlistdialog.*.legendlabel.justify: Left +Freeciv*serverlistdialog.*.legendlabel.left: ChainLeft +Freeciv*serverlistdialog.*.legendlabel.right: ChainLeft +Freeciv*serverlistdialog.*.legendlabel.top: ChainTop +Freeciv*serverlistdialog.*.legendlabel.bottom: ChainTop +Freeciv*serverlistdialog.*.legendlabel.resizable: True + +Freeciv*serverlistdialog.*.viewport.allowVert: True +Freeciv*serverlistdialog.*.viewport.allowHoriz: True +Freeciv*serverlistdialog.*.viewport.useBottom: True +Freeciv*serverlistdialog.*.viewport.fromVert: legendlabel +Freeciv*serverlistdialog.*.viewport.height: 200 +Freeciv*serverlistdialog.*.viewport.width: 600 + +Freeciv*serverlistdialog.*.serverlist.forceColumns: True +Freeciv*serverlistdialog.*.serverlist.defaultColumns: 1 +Freeciv*serverlistdialog.*.serverlist.verticalList: True +Freeciv*serverlistdialog.*.serverlist.left: ChainLeft +Freeciv*serverlistdialog.*.serverlist.right: ChainRight +Freeciv*serverlistdialog.*.serverlist.top: ChainTop +Freeciv*serverlistdialog.*.serverlist.bottom: ChainBottom +Freeciv*serverlistdialog.*.serverlist.resizable: True + +Freeciv*serverlistdialog.*.updatebutton.label: _("Update") +Freeciv*serverlistdialog.*.updatebutton.left: ChainLeft +Freeciv*serverlistdialog.*.updatebutton.right: ChainLeft +Freeciv*serverlistdialog.*.updatebutton.top: ChainBottom +Freeciv*serverlistdialog.*.updatebutton.bottom: ChainBottom +Freeciv*serverlistdialog.*.updatebutton.fromVert: viewport + +Freeciv*serverlistdialog.*.closebutton.label: _("Close") +Freeciv*serverlistdialog.*.closebutton.left: ChainLeft +Freeciv*serverlistdialog.*.closebutton.right: ChainLeft +Freeciv*serverlistdialog.*.closebutton.top: ChainBottom +Freeciv*serverlistdialog.*.closebutton.bottom: ChainBottom +Freeciv*serverlistdialog.*.closebutton.fromVert: viewport +Freeciv*serverlistdialog.*.closebutton.fromHoriz: updatebutton ! ! inteligence dialog @@ -2817,7 +2835,7 @@ Freeciv*outputwindowtext*String: _("\ Freeciv is free software and you are welcome to distribute copies of it\n\ under certain conditions; See the \"Copying\" item on the Help menu.\n\ -Now.. Go give'em hell!") +Now ... Go give 'em hell!") Freeciv*inputlinetext.Width: 710 Freeciv*inputlinetext.*.editType: edit diff -Nru freeciv-2.3.0/data/Freeciv.in freeciv-2.3.1/data/Freeciv.in --- freeciv-2.3.0/data/Freeciv.in 2011-08-08 04:20:01.000000000 +0000 +++ freeciv-2.3.1/data/Freeciv.in 2011-11-19 20:21:19.000000000 +0000 @@ -70,102 +70,120 @@ Freeciv*connectdialog*translations: #override \ Return: key-dialog-connect-connect() -Freeciv*connectdialog.*.cheadline.label: _("Freeciv Server Selection") -Freeciv*connectdialog.*.cheadline.width: 300 - -Freeciv*connectdialog.*.cmsgl.label: -Freeciv*connectdialog.*.cmsgl.fromVert: cheadline -Freeciv*connectdialog.*.cmsgl.resizable: True - -Freeciv*connectdialog.*.cnamel.label: _("Name") -Freeciv*connectdialog.*.cnamel.fromVert: cmsgl - -Freeciv*connectdialog.*.cnamei.fromVert: cmsgl -Freeciv*connectdialog.*.cnamei.fromHoriz: cnamel -Freeciv*connectdialog.*.cnamei.*.editType: edit -Freeciv*connectdialog.*.cnamei.width: 256 - -Freeciv*connectdialog.*.chostl.label: _("Host") -Freeciv*connectdialog.*.chostl.fromVert: cnamel - -Freeciv*connectdialog.*.chosti.fromVert: cnamel -Freeciv*connectdialog.*.chosti.fromHoriz: chostl -Freeciv*connectdialog.*.chosti.*.editType: edit -Freeciv*connectdialog.*.chosti.width: 256 - -Freeciv*connectdialog.*.cportl.label: _("Port") -Freeciv*connectdialog.*.cportl.fromVert: chostl - -Freeciv*connectdialog.*.cporti.fromVert: chostl -Freeciv*connectdialog.*.cporti.fromHoriz: cportl -Freeciv*connectdialog.*.cporti.*.editType: edit -Freeciv*connectdialog.*.cporti.width: 256 - -Freeciv*connectdialog.*.cconnectc.label: _("Connect") -Freeciv*connectdialog.*.cconnectc.fromVert: cportl - -Freeciv*connectdialog.*.cmetac.label: _("Metaserver") -Freeciv*connectdialog.*.cmetac.fromVert: cportl -Freeciv*connectdialog.*.cmetac.fromHoriz: cconnectc - -Freeciv*connectdialog.*.clanc.label: _("LAN Servers") -Freeciv*connectdialog.*.clanc.fromVert: cportl -Freeciv*connectdialog.*.clanc.fromHoriz: cmetac - -Freeciv*connectdialog.*.cquitc.label: _("Quit") -Freeciv*connectdialog.*.cquitc.fromVert: cportl -Freeciv*connectdialog.*.cquitc.fromHoriz: clanc - -Freeciv*connectdialog.*.cbetaline.fromVert: cconnectc -Freeciv*connectdialog.*.cbetaline.justify: left -Freeciv*connectdialog.*.cbetaline.background: grey -Freeciv*connectdialog.*.cbetaline.foreground: red -Freeciv*connectdialog.*.cbetaline.width: 300 +Freeciv*connectdialog.*.connbetalabel.justify: left +Freeciv*connectdialog.*.connbetalabel.background: grey +Freeciv*connectdialog.*.connbetalabel.foreground: red +Freeciv*connectdialog.*.connbetalabel.width: 300 + +Freeciv*connectdialog.*.connselectlabel.label: _("Freeciv Server Selection") +Freeciv*connectdialog.*.connselectlabel.width: 300 + +Freeciv*connectdialog.*.connhostlabel.label: _("Host") +Freeciv*connectdialog.*.connhostlabel.fromVert: connselectlabel + +Freeciv*connectdialog.*.connhosttext.fromVert: connselectlabel +Freeciv*connectdialog.*.connhosttext.fromHoriz: connhostlabel +Freeciv*connectdialog.*.connhosttext.*.editType: edit +Freeciv*connectdialog.*.connhosttext.width: 256 + +Freeciv*connectdialog.*.connportlabel.label: _("Port") +Freeciv*connectdialog.*.connportlabel.fromVert: connhostlabel + +Freeciv*connectdialog.*.connporttext.fromVert: connhostlabel +Freeciv*connectdialog.*.connporttext.fromHoriz: connportlabel +Freeciv*connectdialog.*.connporttext.*.editType: edit +Freeciv*connectdialog.*.connporttext.width: 256 + +Freeciv*connectdialog.*.connloginlabel.label: _("Name") +Freeciv*connectdialog.*.connloginlabel.fromVert: connportlabel + +Freeciv*connectdialog.*.connlogintext.fromVert: connportlabel +Freeciv*connectdialog.*.connlogintext.fromHoriz: connloginlabel +Freeciv*connectdialog.*.connlogintext.*.editType: edit +Freeciv*connectdialog.*.connlogintext.width: 256 + +Freeciv*connectdialog.*.connpasswordlabel.label: _("Password") +Freeciv*connectdialog.*.connpasswordlabel.fromVert: connloginlabel + +Freeciv*connectdialog.*.connpasswordtext.fromVert: connloginlabel +Freeciv*connectdialog.*.connpasswordtext.fromHoriz: connpasswordlabel +Freeciv*connectdialog.*.connpasswordtext.*.editType: edit +Freeciv*connectdialog.*.connpasswordtext.width: 256 + +Freeciv*connectdialog.*.connverifylabel.label: _("Verify Password") +Freeciv*connectdialog.*.connverifylabel.fromVert: connpasswordlabel + +Freeciv*connectdialog.*.connverifytext.fromVert: connpasswordlabel +Freeciv*connectdialog.*.connverifytext.fromHoriz: connverifylabel +Freeciv*connectdialog.*.connverifytext.*.editType: edit +Freeciv*connectdialog.*.connverifytext.width: 256 + +Freeciv*connectdialog.*.connmessagelabel.label: +Freeciv*connectdialog.*.connmessagelabel.fromVert: connverifylabel +Freeciv*connectdialog.*.connmessagelabel.resizable: True + +Freeciv*connectdialog.*.connconnectbutton.label: _("Connect") +Freeciv*connectdialog.*.connconnectbutton.fromVert: connmessagelabel + +Freeciv*connectdialog.*.connlanbutton.label: _("LAN Servers") +Freeciv*connectdialog.*.connlanbutton.fromVert: connmessagelabel +Freeciv*connectdialog.*.connlanbutton.fromHoriz: connconnectbutton + +Freeciv*connectdialog.*.connmetabutton.label: _("Metaserver") +Freeciv*connectdialog.*.connmetabutton.fromVert: connmessagelabel +Freeciv*connectdialog.*.connmetabutton.fromHoriz: connlanbutton + +Freeciv*connectdialog.*.connquitbutton.label: _("Quit") +Freeciv*connectdialog.*.connquitbutton.fromVert: connmessagelabel +Freeciv*connectdialog.*.connquitbutton.fromHoriz: connmetabutton ! ! Metaserver dialog ! -Freeciv*metadialog.title: _("Freeciv Server List") -Freeciv*metadialog.allowShellResize: True +Freeciv*serverlistdialog.title: _("Freeciv Server List") +Freeciv*serverlistdialog.allowShellResize: True +Freeciv*serverlistdialog.width: 600 -Freeciv*metadialog.*.legend.label: _("\ +Freeciv*serverlistdialog.*.legendlabel.label: _("\ Server Name Port Version Status Players Comment") -Freeciv*metadialog.*.legend.justify: Left -Freeciv*metadialog.*.legend.left: ChainLeft -Freeciv*metadialog.*.legend.right: ChainLeft -Freeciv*metadialog.*.legend.top: ChainTop -Freeciv*metadialog.*.legend.bottom: ChainTop -Freeciv*metadialog.*.legend.resizable: True - -Freeciv*metadialog.*.metaviewport.allowVert: True -Freeciv*metadialog.*.metaviewport.allowHoriz: True -Freeciv*metadialog.*.metaviewport.useBottom: True -Freeciv*metadialog.*.metaviewport.fromVert: legend - -Freeciv*metadialog.*.metalist.forceColumns: True -Freeciv*metadialog.*.metalist.defaultColumns: 1 -Freeciv*metadialog.*.metalist.verticalList: True -Freeciv*metadialog.*.metalist.left: ChainLeft -Freeciv*metadialog.*.metalist.right: ChainRight -Freeciv*metadialog.*.metalist.top: ChainTop -Freeciv*metadialog.*.metalist.bottom: ChainBottom -Freeciv*metadialog.*.metalist.resizable: True - -Freeciv*metadialog.*.update.label: _("Update") -Freeciv*metadialog.*.update.left: ChainLeft -Freeciv*metadialog.*.update.right: ChainLeft -Freeciv*metadialog.*.update.top: ChainBottom -Freeciv*metadialog.*.update.bottom: ChainBottom -Freeciv*metadialog.*.update.fromVert: metaviewport - -Freeciv*metadialog.*.closecommand.label: _("Close") -Freeciv*metadialog.*.closecommand.left: ChainLeft -Freeciv*metadialog.*.closecommand.right: ChainLeft -Freeciv*metadialog.*.closecommand.top: ChainBottom -Freeciv*metadialog.*.closecommand.bottom: ChainBottom -Freeciv*metadialog.*.closecommand.fromVert: metaviewport -Freeciv*metadialog.*.closecommand.fromHoriz: update +Freeciv*serverlistdialog.*.legendlabel.justify: Left +Freeciv*serverlistdialog.*.legendlabel.left: ChainLeft +Freeciv*serverlistdialog.*.legendlabel.right: ChainLeft +Freeciv*serverlistdialog.*.legendlabel.top: ChainTop +Freeciv*serverlistdialog.*.legendlabel.bottom: ChainTop +Freeciv*serverlistdialog.*.legendlabel.resizable: True + +Freeciv*serverlistdialog.*.viewport.allowVert: True +Freeciv*serverlistdialog.*.viewport.allowHoriz: True +Freeciv*serverlistdialog.*.viewport.useBottom: True +Freeciv*serverlistdialog.*.viewport.fromVert: legendlabel +Freeciv*serverlistdialog.*.viewport.height: 200 +Freeciv*serverlistdialog.*.viewport.width: 600 + +Freeciv*serverlistdialog.*.serverlist.forceColumns: True +Freeciv*serverlistdialog.*.serverlist.defaultColumns: 1 +Freeciv*serverlistdialog.*.serverlist.verticalList: True +Freeciv*serverlistdialog.*.serverlist.left: ChainLeft +Freeciv*serverlistdialog.*.serverlist.right: ChainRight +Freeciv*serverlistdialog.*.serverlist.top: ChainTop +Freeciv*serverlistdialog.*.serverlist.bottom: ChainBottom +Freeciv*serverlistdialog.*.serverlist.resizable: True + +Freeciv*serverlistdialog.*.updatebutton.label: _("Update") +Freeciv*serverlistdialog.*.updatebutton.left: ChainLeft +Freeciv*serverlistdialog.*.updatebutton.right: ChainLeft +Freeciv*serverlistdialog.*.updatebutton.top: ChainBottom +Freeciv*serverlistdialog.*.updatebutton.bottom: ChainBottom +Freeciv*serverlistdialog.*.updatebutton.fromVert: viewport + +Freeciv*serverlistdialog.*.closebutton.label: _("Close") +Freeciv*serverlistdialog.*.closebutton.left: ChainLeft +Freeciv*serverlistdialog.*.closebutton.right: ChainLeft +Freeciv*serverlistdialog.*.closebutton.top: ChainBottom +Freeciv*serverlistdialog.*.closebutton.bottom: ChainBottom +Freeciv*serverlistdialog.*.closebutton.fromVert: viewport +Freeciv*serverlistdialog.*.closebutton.fromHoriz: updatebutton ! ! inteligence dialog @@ -2817,7 +2835,7 @@ Freeciv*outputwindowtext*String: _("\ Freeciv is free software and you are welcome to distribute copies of it\n\ under certain conditions; See the \"Copying\" item on the Help menu.\n\ -Now.. Go give'em hell!") +Now ... Go give 'em hell!") Freeciv*inputlinetext.Width: 710 Freeciv*inputlinetext.*.editType: edit diff -Nru freeciv-2.3.0/data/helpdata.txt freeciv-2.3.1/data/helpdata.txt --- freeciv-2.3.0/data/helpdata.txt 2011-08-08 04:20:01.000000000 +0000 +++ freeciv-2.3.1/data/helpdata.txt 2011-11-19 20:21:19.000000000 +0000 @@ -82,7 +82,7 @@ 1. Mapping the countryside.\n\ 2. Defending the cities.\n\ 3. Deciding which units to build first.\n\ - 4. Building agriculture improvements.\n\ + 4. Improving the land.\n\ 5. Deciding where to build cities.\n\ 6. Taking care of the cities.\n\ 7. Interacting with other players (diplomacy).\n\ @@ -130,21 +130,24 @@ 3. Deciding which units to build first.\ \n\n\ After building one or two Warrior units, start building \ -Settlers. The second Settler can be used to build roads and \ -irrigate the land close to the city, and the third can be \ -used to build a new city. Or, you can use the second Settler to \ -build another city, and use the third Settler for agricultural \ -improvements in the land around the cities. Keep in mind \ -that a large population increases both the amount of \ -productivity and your civilization's research rate.\ +Settlers. Settlers are best put to use founding new cities; \ +while they can also build agricultural improvements (see the \ +next section), it is better to use Workers for this when \ +available, as unlike Settlers, Workers do not consume food from \ +their parent city. Keep in mind that a large population increases \ +both the amount of productivity and your civilization's research \ +rate, not to mention that cities secure land for your empire, \ +so founding new cities should be a high priority initially.\ "), _("\ - 4. Building agriculture improvements.\ + 4. Improving the land.\ \n\n\ Each city has an area of land around it that can be used \ -for growing food, producing goods, and generating trade. This \ -can be increased by using Settlers to improve the land. \ -The land can be improved with roads, irrigation, mines, and \ -others.\ +for growing food, producing goods, and generating trade. This output \ +can be increased by using Workers (or Settlers) to improve the land \ +close to your cities. The land can be improved with irrigation \ +(increasing food), roads (allowing units to move faster and \ +increasing trade), and mines (increasing production), among other \ +improvements.\ "), _("\ 5. Deciding where to build cities.\ \n\n\ @@ -854,7 +857,7 @@ of pollution also affects the risk of plague, if enabled in the \ ruleset; see the section on Plague.)\ "), _("\ -Pollution appears as gunk covering of the terrain tiles around the \ +Pollution appears as gunk covering the terrain tiles around the \ city. A polluted tile generates only half its usual food, production, \ and trade. The pollution can only be cleared by dispatching Workers, \ Settlers, or Engineers with the \"clean pollution\" order.\ @@ -1083,7 +1086,7 @@ [help_combat] name = _("Combat") -text = _("Default Combat Rules\n---------------------"), +text = _("Default Combat Rules\n--------------------"), _("\ When one unit attacks another unit, either the attacker will be \ destroyed, or the defender will be destroyed -- never both (unless \ @@ -1535,8 +1538,8 @@ ", _("\ The client can fetch this page, too: use the Metaserver button \ in the connection dialog. If it never shows any results, check \ -whether your WWW browser is using a HTTP proxy; to make civclient \ -use the same proxy, before starting civclient, \ +whether your WWW browser is using a HTTP proxy; to make the client \ +use the same proxy, before starting the client, \ set the $http_proxy environment variable to:\ "), "\ http://proxyhost:proxyportnumber/\ @@ -2242,7 +2245,9 @@ [help_about] name = _("About Freeciv") -text = _("\ +text = "\ +$FreecivVersion\ +", _("\ Original authors:\n\ (they are no longer involved, please don't mail them!)\ "), "\ @@ -2254,13 +2259,14 @@ "), "\ Marko Lindqvist - cazfi74@gmail.com\n\ R. Daniel Markstedt - markstedt@gmail.com\n\ - Christian Prochaska - cp.ml.freeciv.dev@googlemail.com\n\ + Christian Prochaska - cp.ml.freeciv.dev@googlemail.com\ ", _("\ If you find any bugs, then please send us a bug report. This is \ best done by visiting the Freeciv Bug Tracking System, at:\ "), "\ http://gna.org/projects/freeciv/\ ", _("\ +Please quote the above version information. \ For more information about submitting bug reports see the file BUGS \ in the Freeciv distribution. For more information in general, \ visit the Freeciv website, at:\ diff -Nru freeciv-2.3.0/data/hex2t/Makefile.in freeciv-2.3.1/data/hex2t/Makefile.in --- freeciv-2.3.0/data/hex2t/Makefile.in 2011-08-08 04:25:54.000000000 +0000 +++ freeciv-2.3.1/data/hex2t/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/hex2t.tilespec freeciv-2.3.1/data/hex2t.tilespec --- freeciv-2.3.0/data/hex2t.tilespec 2011-08-08 04:20:02.000000000 +0000 +++ freeciv-2.3.1/data/hex2t.tilespec 2011-11-19 20:21:19.000000000 +0000 @@ -86,7 +86,7 @@ "misc/treaty.spec", "misc/icons.spec", "misc/editor.spec", - "amplio/nuke.spec" + "amplio2/nuke.spec" ; Include color definitions Binary files /tmp/KuHlWxdIDv/freeciv-2.3.0/data/icons/128x128/freeciv-modpack.png and /tmp/e72AxD8Kxk/freeciv-2.3.1/data/icons/128x128/freeciv-modpack.png differ Binary files /tmp/KuHlWxdIDv/freeciv-2.3.0/data/icons/16x16/freeciv-modpack.png and /tmp/e72AxD8Kxk/freeciv-2.3.1/data/icons/16x16/freeciv-modpack.png differ Binary files /tmp/KuHlWxdIDv/freeciv-2.3.0/data/icons/32x32/freeciv-modpack.png and /tmp/e72AxD8Kxk/freeciv-2.3.1/data/icons/32x32/freeciv-modpack.png differ Binary files /tmp/KuHlWxdIDv/freeciv-2.3.0/data/icons/48x48/freeciv-modpack.png and /tmp/e72AxD8Kxk/freeciv-2.3.1/data/icons/48x48/freeciv-modpack.png differ Binary files /tmp/KuHlWxdIDv/freeciv-2.3.0/data/icons/64x64/freeciv-modpack.png and /tmp/e72AxD8Kxk/freeciv-2.3.1/data/icons/64x64/freeciv-modpack.png differ diff -Nru freeciv-2.3.0/data/icons/Makefile.am freeciv-2.3.1/data/icons/Makefile.am --- freeciv-2.3.0/data/icons/Makefile.am 2011-08-08 04:20:01.000000000 +0000 +++ freeciv-2.3.1/data/icons/Makefile.am 2011-11-19 20:21:19.000000000 +0000 @@ -38,9 +38,29 @@ icons_128_s = endif +if MODINST +icons_16_m = \ + 16x16/freeciv-modpack.png +icons_32_m = \ + 32x32/freeciv-modpack.png +icons_48_m = \ + 48x48/freeciv-modpack.png +icons_64_m = \ + 64x64/freeciv-modpack.png +icons_128_m = \ + 128x128/freeciv-modpack.png +else +icons_16_m = +icons_32_m = +icons_48_m = +icons_64_m = +icons_128_m = +endif + #icons_svg = \ # scalable/freeciv-client.svg \ -# scalable/freeciv-server.svg +# scalable/freeciv-server.svg \ +# scalable/freeciv-modpack.svg icon16dir = $(datadir)/icons/hicolor/16x16/apps icon32dir = $(datadir)/icons/hicolor/32x32/apps @@ -49,22 +69,26 @@ icon128dir = $(datadir)/icons/hicolor/128x128/apps #iconscalabledir = $(datadir)/icons/hicolor/scalable/apps -icon16_DATA = $(icons_16_c) $(icons_16_s) -icon32_DATA = $(icons_32_c) $(icons_32_s) -icon48_DATA = $(icons_48_c) $(icons_48_s) -icon64_DATA = $(icons_64_c) $(icons_64_s) -icon128_DATA = $(icons_128_c) $(icons_128_s) +icon16_DATA = $(icons_16_c) $(icons_16_s) $(icons_16_m) +icon32_DATA = $(icons_32_c) $(icons_32_s) $(icons_32_m) +icon48_DATA = $(icons_48_c) $(icons_48_s) $(icons_48_m) +icon64_DATA = $(icons_64_c) $(icons_64_s) $(icons_64_m) +icon128_DATA = $(icons_128_c) $(icons_128_s) $(icons_128_m) #iconscalable_DATA = $(icons_svg) EXTRA_DIST = \ $(icons_16_c) \ $(icons_16_s) \ + $(icons_16_m) \ $(icons_32_c) \ $(icons_32_s) \ + $(icons_32_m) \ $(icons_48_c) \ $(icons_48_s) \ + $(icons_48_m) \ $(icons_64_c) \ $(icons_64_s) \ + $(icons_64_m) \ $(icons_128_c) \ - $(icons_128_s) - + $(icons_128_s) \ + $(icons_128_m) diff -Nru freeciv-2.3.0/data/icons/Makefile.in freeciv-2.3.1/data/icons/Makefile.in --- freeciv-2.3.0/data/icons/Makefile.in 2011-08-08 04:25:54.000000000 +0000 +++ freeciv-2.3.1/data/icons/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -119,10 +119,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -295,7 +291,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -400,33 +395,59 @@ @SERVER_TRUE@icons_128_s = \ @SERVER_TRUE@ 128x128/freeciv-server.png +@MODINST_FALSE@icons_16_m = +@MODINST_TRUE@icons_16_m = \ +@MODINST_TRUE@ 16x16/freeciv-modpack.png + +@MODINST_FALSE@icons_32_m = +@MODINST_TRUE@icons_32_m = \ +@MODINST_TRUE@ 32x32/freeciv-modpack.png + +@MODINST_FALSE@icons_48_m = +@MODINST_TRUE@icons_48_m = \ +@MODINST_TRUE@ 48x48/freeciv-modpack.png + +@MODINST_FALSE@icons_64_m = +@MODINST_TRUE@icons_64_m = \ +@MODINST_TRUE@ 64x64/freeciv-modpack.png + +@MODINST_FALSE@icons_128_m = +@MODINST_TRUE@icons_128_m = \ +@MODINST_TRUE@ 128x128/freeciv-modpack.png + #icons_svg = \ # scalable/freeciv-client.svg \ -# scalable/freeciv-server.svg +# scalable/freeciv-server.svg \ +# scalable/freeciv-modpack.svg icon16dir = $(datadir)/icons/hicolor/16x16/apps icon32dir = $(datadir)/icons/hicolor/32x32/apps icon48dir = $(datadir)/icons/hicolor/48x48/apps icon64dir = $(datadir)/icons/hicolor/64x64/apps icon128dir = $(datadir)/icons/hicolor/128x128/apps #iconscalabledir = $(datadir)/icons/hicolor/scalable/apps -icon16_DATA = $(icons_16_c) $(icons_16_s) -icon32_DATA = $(icons_32_c) $(icons_32_s) -icon48_DATA = $(icons_48_c) $(icons_48_s) -icon64_DATA = $(icons_64_c) $(icons_64_s) -icon128_DATA = $(icons_128_c) $(icons_128_s) +icon16_DATA = $(icons_16_c) $(icons_16_s) $(icons_16_m) +icon32_DATA = $(icons_32_c) $(icons_32_s) $(icons_32_m) +icon48_DATA = $(icons_48_c) $(icons_48_s) $(icons_48_m) +icon64_DATA = $(icons_64_c) $(icons_64_s) $(icons_64_m) +icon128_DATA = $(icons_128_c) $(icons_128_s) $(icons_128_m) #iconscalable_DATA = $(icons_svg) EXTRA_DIST = \ $(icons_16_c) \ $(icons_16_s) \ + $(icons_16_m) \ $(icons_32_c) \ $(icons_32_s) \ + $(icons_32_m) \ $(icons_48_c) \ $(icons_48_s) \ + $(icons_48_m) \ $(icons_64_c) \ $(icons_64_s) \ + $(icons_64_m) \ $(icons_128_c) \ - $(icons_128_s) + $(icons_128_s) \ + $(icons_128_m) all: all-am diff -Nru freeciv-2.3.0/data/isophex/Makefile.in freeciv-2.3.1/data/isophex/Makefile.in --- freeciv-2.3.0/data/isophex/Makefile.in 2011-08-08 04:25:55.000000000 +0000 +++ freeciv-2.3.1/data/isophex/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/isotrident/Makefile.in freeciv-2.3.1/data/isotrident/Makefile.in --- freeciv-2.3.0/data/isotrident/Makefile.in 2011-08-08 04:25:55.000000000 +0000 +++ freeciv-2.3.1/data/isotrident/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/Makefile.in freeciv-2.3.1/data/Makefile.in --- freeciv-2.3.0/data/Makefile.in 2011-08-08 04:25:53.000000000 +0000 +++ freeciv-2.3.1/data/Makefile.in 2011-11-19 20:24:04.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -167,10 +167,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -343,7 +339,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -596,7 +591,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -621,7 +616,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -Nru freeciv-2.3.0/data/misc/icons.spec freeciv-2.3.1/data/misc/icons.spec --- freeciv-2.3.0/data/misc/icons.spec 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/misc/icons.spec 2011-11-19 20:19:53.000000000 +0000 @@ -8,6 +8,7 @@ artists = " James Blewitt (civicon) + yd (mpicon) " [extra] @@ -15,4 +16,5 @@ { "tag", "file" "icon.freeciv", "misc/civicon" "icon.citydlg", "misc/cityicon" + ; misc/mpicon.png is referenced directly from configure.ac } diff -Nru freeciv-2.3.0/data/misc/Makefile.am freeciv-2.3.1/data/misc/Makefile.am --- freeciv-2.3.0/data/misc/Makefile.am 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/misc/Makefile.am 2011-11-19 20:19:53.000000000 +0000 @@ -24,6 +24,7 @@ flags.spec \ icons.spec \ intro.png \ + mpicon.png \ overlays.png \ overlays.spec \ radar.png \ diff -Nru freeciv-2.3.0/data/misc/Makefile.in freeciv-2.3.1/data/misc/Makefile.in --- freeciv-2.3.0/data/misc/Makefile.in 2011-08-08 04:25:55.000000000 +0000 +++ freeciv-2.3.1/data/misc/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -378,6 +373,7 @@ flags.spec \ icons.spec \ intro.png \ + mpicon.png \ overlays.png \ overlays.spec \ radar.png \ Binary files /tmp/KuHlWxdIDv/freeciv-2.3.0/data/misc/mpicon.png and /tmp/e72AxD8Kxk/freeciv-2.3.1/data/misc/mpicon.png differ diff -Nru freeciv-2.3.0/data/multiplayer/buildings.ruleset freeciv-2.3.1/data/multiplayer/buildings.ruleset --- freeciv-2.3.0/data/multiplayer/buildings.ruleset 2011-08-08 04:17:48.000000000 +0000 +++ freeciv-2.3.1/data/multiplayer/buildings.ruleset 2011-11-19 20:19:47.000000000 +0000 @@ -593,7 +593,7 @@ helptext = _("\ Reduces the unhappiness caused by aggressively deployed military\ units owned by the city by 4 under Democracy and 2 under Republic\ - -- in other words, it neutralises the unhappiness caused by two\ + -- in other words, it neutralizes the unhappiness caused by two\ military units. This improvement has no effect under other governments.\ ") @@ -840,10 +840,10 @@ - Habitation Module: provides living space for 10,000 people.\ "), _("\ - Life Support Module: provides food and water for the population of\ - one Habitation Module.\ + one Habitation Module.\ "), _("\ - Solar Panels: provides the energy needed for any two of the other\ - Modules.\ + Modules.\ "), _("\ You can build up to 4 Space Modules of each kind.\ "), _("\ @@ -1568,7 +1568,7 @@ Counts as a Police Station in every city on the same continent.\ (That is, for each city, it reduces the unhappiness caused by\ aggressively deployed military units owned by that city by 4 under\ - Democracy and 2 under Republic -- in other words, it neutralises\ + Democracy and 2 under Republic -- in other words, it neutralizes\ the unhappiness caused by two military units per city. This wonder\ has no effect under other governments.)\ ") diff -Nru freeciv-2.3.0/data/multiplayer/Makefile.in freeciv-2.3.1/data/multiplayer/Makefile.in --- freeciv-2.3.0/data/multiplayer/Makefile.in 2011-08-08 04:25:55.000000000 +0000 +++ freeciv-2.3.1/data/multiplayer/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/multiplayer/script.lua freeciv-2.3.1/data/multiplayer/script.lua --- freeciv-2.3.0/data/multiplayer/script.lua 2011-08-08 04:17:48.000000000 +0000 +++ freeciv-2.3.1/data/multiplayer/script.lua 2011-11-19 20:19:47.000000000 +0000 @@ -39,7 +39,13 @@ phil_id = phil_tech.id function tech_researched_handler(tech, player, how) - local id = tech.id + local id + + if tech == nil then + return + end + + id = tech.id if id == phil_id and how == "researched" then give_technology(player, nil, "researched") end diff -Nru freeciv-2.3.0/data/multiplayer/terrain.ruleset freeciv-2.3.1/data/multiplayer/terrain.ruleset --- freeciv-2.3.0/data/multiplayer/terrain.ruleset 2011-08-08 04:17:48.000000000 +0000 +++ freeciv-2.3.1/data/multiplayer/terrain.ruleset 2011-11-19 20:19:47.000000000 +0000 @@ -896,6 +896,8 @@ ; conflicts = List of bases that cannot be on the same tile. ; Bases with non-zero border_sq automatically conflict ; with each other. +; native_to = List of unit classes that are considered to +; be inside the base when they are on same tile ; flags ; - "NoAggressive" = Units inside are not considered aggressive ; - "NoStackDeath" = Units inside do not die all at once when attacked diff -Nru freeciv-2.3.0/data/nation/angolan.ruleset freeciv-2.3.1/data/nation/angolan.ruleset --- freeciv-2.3.0/data/nation/angolan.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/angolan.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -3,11 +3,11 @@ name=_("Angolan") plural=_("?plural:Angolans") groups="Modern", "African" -legend=_("When the Portuguese arrived to Angola in the 15th century the\ +legend=_("When the Portuguese arrived in Angola in the 15th century the\ region was controlled by several Bantu kingdoms. Angola became an\ important source of slave traders until well into the 19th century.\ After two decades of guerrilla war against the Portuguese colonial\ - authorities Angola finally achieved indepdence in 1975. Soon the various\ + authorities Angola finally achieved independence in 1975. Soon the various\ guerilla groups started fighting each other. After half a century of war\ a peace agreement was finally reached in 2002.") diff -Nru freeciv-2.3.0/data/nation/belgian.ruleset freeciv-2.3.1/data/nation/belgian.ruleset --- freeciv-2.3.0/data/nation/belgian.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/belgian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -3,7 +3,7 @@ name=_("Belgian") plural=_("?plural:Belgians") groups="Modern", "European" -legend = _("Belgium gained independance from the Dutch Kingdom in 1830.\ +legend = _("Belgium gained independence from the Dutch Kingdom in 1830.\ Belgium is mainly characterized by its movement from a unified state\ to a federal one. This is the result of the Flemish and the\ Walloon's nationalist (almost) peaceful fights.") diff -Nru freeciv-2.3.0/data/nation/bhutanese.ruleset freeciv-2.3.1/data/nation/bhutanese.ruleset --- freeciv-2.3.0/data/nation/bhutanese.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/bhutanese.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -4,8 +4,8 @@ plural=_("?plural:Bhutanese") groups="Early Modern", "Modern", "Asian" legend=_("Located in the Himalayas, Bhutan is one of the most isolated\ - countries in the world. Bhutan has never been conquered or occupied\ - by foreign invadors for a millennium if not more. In the 17th century\ + countries in the world. Bhutan has not been conquered or occupied\ + by foreign invaders for a millennium if not more. In the 17th century\ Bhutan became a unified nation under Shabdrung Ngawang Namgyal, who\ repelled a Mongol invasion and united the rivaling Bhutanese tribes.") diff -Nru freeciv-2.3.0/data/nation/brandenburgian.ruleset freeciv-2.3.1/data/nation/brandenburgian.ruleset --- freeciv-2.3.0/data/nation/brandenburgian.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/brandenburgian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -7,7 +7,7 @@ an electorate of the Holy Roman Empire in the 12th century. The rulers of\ Brandenburg acquired Prussia in 1618 and was absorbed by Prussia in 1701.\ Brandenburg kept its nominal independence until 1806, when it became\ - a province of Prussia. Currenty it is one of the states of the Federal\ + a province of Prussia. Currently it is one of the states of the Federal\ Republic of Germany.") leaders = { "name", "sex" diff -Nru freeciv-2.3.0/data/nation/cham.ruleset freeciv-2.3.1/data/nation/cham.ruleset --- freeciv-2.3.0/data/nation/cham.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/cham.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -10,7 +10,7 @@ neighboring Khmer and Dai Viet states for centuries, Champa was\ essentially subdued by Dai Viet in the late 15th century. By this\ time, most of the Cham nobility had converted to Islam. The majority of\ - Muslims in modern Vietnam are of Cham ethniticity.") + Muslims in modern Vietnam are of Cham ethnicity.") leaders = { "name", "sex" diff -Nru freeciv-2.3.0/data/nation/elamite.ruleset freeciv-2.3.1/data/nation/elamite.ruleset --- freeciv-2.3.0/data/nation/elamite.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/elamite.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -5,7 +5,7 @@ groups="Asian", "Ancient" legend=_("Elam was an ancient civilization located in the area of modern\ southwest Iran, which arose around 3100 BC. The Elamite language,\ - written in cuneiform, is of unkown origin. In 643 BC the Elamite\ + written in cuneiform, is of unknown origin. In 643 BC the Elamite\ civilization was destroyed by the Assyrians under Assurbanipal.") leaders = { diff -Nru freeciv-2.3.0/data/nation/franconian.ruleset freeciv-2.3.1/data/nation/franconian.ruleset --- freeciv-2.3.0/data/nation/franconian.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/franconian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -6,7 +6,7 @@ legend=_("Franconia was one of the stem duchies of the Holy Roman\ Empire. Founded in the 9th century, unlike the other stem duchies it\ didn't manage to consolidate itself and by the 12th century it had\ - completely dissappeared. Franconia continues to exist as a cultural\ + completely disappeared. Franconia continues to exist as a cultural\ region in the modern states of Bavaria, Thuringia and Baden-Wuerttemberg.") leaders = { diff -Nru freeciv-2.3.0/data/nation/frisian.ruleset freeciv-2.3.1/data/nation/frisian.ruleset --- freeciv-2.3.0/data/nation/frisian.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/frisian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -8,7 +8,7 @@ Middle Ages the Frisians controlled a kingdom stretching from the\ Scheldt to Jutland. Although eventually defeated by the Franks, they\ kept enjoying the famous Frisian freedom, refusing to recognize the rule\ - of any feudal lord. In the 15h and 16th century Frisian territory was\ + of any feudal lord. In the 15th and 16th centuries Frisian territory was\ eventually carved up, the core becoming a province of the United\ Netherlands. In 1782 the Estates of Friesland was the first foreign\ government to recognize the independence of the United States of\ diff -Nru freeciv-2.3.0/data/nation/greenlander.ruleset freeciv-2.3.1/data/nation/greenlander.ruleset --- freeciv-2.3.0/data/nation/greenlander.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/greenlander.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -3,7 +3,7 @@ name=_("Greenlander") plural=_("?plural:Greenlanders") groups="American" -legend=_("Legend says that the Great Shaman Qitdlarssuaq lead the Inuit\ +legend=_("Legend says that the Great Shaman Qitdlarssuaq led the Inuit\ people to Thule (Qaanaaq) on the west coast of Greenland in the 10th\ century. Around the same time, Scandinavian settlers arrived at the fjords\ on the southwestern tip of the island. Today, Greenland is a self-governing\ diff -Nru freeciv-2.3.0/data/nation/hansa.ruleset freeciv-2.3.1/data/nation/hansa.ruleset --- freeciv-2.3.0/data/nation/hansa.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/hansa.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -4,9 +4,9 @@ plural=_("?plural:Hanseatic League") groups="Medieval", "Early Modern", "European" legend=_("The Hanseatic League was a powerful alliance of trading cities\ - existing from the 12th to the 19th century. Hanseatic cities were found\ - in the North Sea and Baltic region. Members of the league had their own\ - law system and occasionaly the Hansa went to war with rivalling powers.") + which existed from the 12th to the 19th century. Hanseatic cities were found\ + in the North Sea and Baltic regions. Members of the league had their own\ + law system and occasionally the Hansa went to war with rival powers.") leaders = { "name", "sex" diff -Nru freeciv-2.3.0/data/nation/holyroman.ruleset freeciv-2.3.1/data/nation/holyroman.ruleset --- freeciv-2.3.0/data/nation/holyroman.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/holyroman.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -6,8 +6,8 @@ legend = _("The Holy Roman Empire was considered the successor to the\ Roman Empire, but as Voltaire once quipped it was neither Holy, nor Roman\ - nor even less an Empire. Notheless it proved to be extremely durable, and\ - lost territory only very slowly. For most of its existance it was a\ + nor even less an Empire. Nonetheless it proved to be extremely durable, and\ + lost territory only very slowly. For most of its existence it was a\ complex patchwork consisting of an uncountable number of counties,\ duchies, electorates, imperial free cities and other territories. In 1806\ it was dissolved by Napoleon and replaced by the Confederation of the\ diff -Nru freeciv-2.3.0/data/nation/inca.ruleset freeciv-2.3.1/data/nation/inca.ruleset --- freeciv-2.3.0/data/nation/inca.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/inca.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -14,7 +14,7 @@ Spanish conquest and was maintained through a complex, hierarchical\ and pragmatic administrative system. They were, however, wracked as\ many kingdoms have been by crises of succession. When the Spanish\ - arrived, the Inca were in the middle of one such crisis-- the war\ + arrived, the Inca were in the middle of one such crisis - the war\ between Atawallpa and Waskhar. They were the sons of the late ruler\ Wayna Qhapaq, who had died from disease - likely smallpox - that was\ sweeping through the land.") diff -Nru freeciv-2.3.0/data/nation/kazakh.ruleset freeciv-2.3.1/data/nation/kazakh.ruleset --- freeciv-2.3.0/data/nation/kazakh.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/kazakh.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -4,8 +4,8 @@ plural=_("?plural:Kazakhs") groups="Early Modern", "Modern", "Asian" legend=_("Kazakhs are descendants of Turkic and Mongolian nomadic tribes.\ - Conquered by Russia in the 18th century, Kazahstan became independent in\ - 1991 with the dissolution of the Soviet Union. It is one of ten largest\ + Conquered by Russia in the 18th century, Kazakhstan became independent in\ + 1991 with the dissolution of the Soviet Union. It is one of the ten largest\ states in the world by area.") leaders = { diff -Nru freeciv-2.3.0/data/nation/kurd.ruleset freeciv-2.3.1/data/nation/kurd.ruleset --- freeciv-2.3.0/data/nation/kurd.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/kurd.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -5,13 +5,13 @@ groups="Asian", "Medieval" legend=_("The Kurds are a distinct ethno-linguistic group speaking an\ Indo-Aryan language. Their traditional homeland Kurdistan is situated in\ - northern Middle East and partitioned between Iraq, Turkey, Syria, and\ + the northern Middle East and partitioned between Iraq, Turkey, Syria, and\ Iran. The medieval era saw the rise of several principalities ruled by\ Kurdish dynasties, including Shaddadid, Rawadid, Hasanwayhid, Annazid,\ and Marwanid. Subsequently subdued by the Ottomans, the Kurds' struggle\ for self-rule and independence took off again after the fall of the\ Ottoman Empire and the end of the colonial era. Today, Iraq's Kurdistan\ - Autonomous Region is the only Kurd-dominated politial entity in the\ + Autonomous Region is the only Kurd-dominated political entity in the\ world.") leaders = { diff -Nru freeciv-2.3.0/data/nation/lithuanian.ruleset freeciv-2.3.1/data/nation/lithuanian.ruleset --- freeciv-2.3.0/data/nation/lithuanian.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/lithuanian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -4,8 +4,8 @@ plural=_("?plural:Lithuanians") groups="Medieval", "Early Modern", "Modern", "European" legend=_("Lithuania is a small country on the south coast of the Baltic\ - Sea, northeast of Poland. Lithuanian is the most archaic and complex of\ - the northern Indo-European languages") + Sea, northeast of Poland. Lithuanian is the most archaic and complex of\ + the northern Indo-European languages.") leaders = { "name", "sex" diff -Nru freeciv-2.3.0/data/nation/Makefile.in freeciv-2.3.1/data/nation/Makefile.in --- freeciv-2.3.0/data/nation/Makefile.in 2011-08-08 04:25:56.000000000 +0000 +++ freeciv-2.3.1/data/nation/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -118,10 +118,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -294,7 +290,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/nation/manx.ruleset freeciv-2.3.1/data/nation/manx.ruleset --- freeciv-2.3.0/data/nation/manx.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/manx.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -3,12 +3,12 @@ name=_("Manx") plural=_("?plural:Manx") groups="Medieval", "European" -legend=_("The Isle of Man is a island in the British Isles located\ +legend=_("The Isle of Man is an island in the British Isles located\ between Britain and Ireland. Formally not a part of United Kingdom, it\ is a self-governing British Crown Dependency. In the Middle Ages it was\ the center of the Kingdom of Mann and the Isles, and later of the\ Lordship of Man. Man is noted for having the oldest still functioning\ - parliament in the world, the Tynwald, which exists since 979 AD. Since\ + parliament in the world, the Tynwald, which has existed since 979 AD. Since\ 1765 the island depends on Great Britain.") leaders = { diff -Nru freeciv-2.3.0/data/nation/mexican.ruleset freeciv-2.3.1/data/nation/mexican.ruleset --- freeciv-2.3.0/data/nation/mexican.ruleset 2011-08-08 04:17:50.000000000 +0000 +++ freeciv-2.3.1/data/nation/mexican.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -12,7 +12,7 @@ Maximilian of Austria as emperor under French occupation. The French and\ conservatives were ultimately defeated by the liberals of Benito Juarez\ in 1867. Mexico entered the modern era under Porifirio Diaz (1876-1911)\ - but social unequality and political repression led to the Mexican\ + but social inequality and political repression led to the Mexican\ Revolution of 1910 which left more than a million dead. The Revolution\ led to the establishment of a corporatist one party state in 1929. Only\ in 2000 did Mexico see its first democratic transfer of power.") diff -Nru freeciv-2.3.0/data/nation/miao.ruleset freeciv-2.3.1/data/nation/miao.ruleset --- freeciv-2.3.0/data/nation/miao.ruleset 2011-08-08 04:17:50.000000000 +0000 +++ freeciv-2.3.1/data/nation/miao.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -8,7 +8,7 @@ of Zhuolu in the 26th century BC. For the Miao people of modern-day China,\ Chi You - whom they refer to as \"Txiv Yawg\" - is a mythical king and\ founding father of their nation. Most Miao live in southern China, but\ - there is a significant disapora in southeast Asian countries as well as\ + there is a significant diaspora in southeast Asian countries as well as\ Europe and North America, of which many belong to the \"Hmong\"\ sub-group.") diff -Nru freeciv-2.3.0/data/nation/miskito.ruleset freeciv-2.3.1/data/nation/miskito.ruleset --- freeciv-2.3.0/data/nation/miskito.ruleset 2011-08-08 04:17:50.000000000 +0000 +++ freeciv-2.3.1/data/nation/miskito.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -4,7 +4,7 @@ plural=_("?plural:Miskito") groups="American", "Early Modern" legend=_("Living along the eponymous Miskito Coast of Nicaragua and\ - Honduras, the Miskito now number around 200,000 people. In 1625, the\ + Honduras, the Miskito now number around 200,000 people. In 1625, the\ Miskito came into a long-lasting political relationship with the British\ Empire, whose interests in the Caribbean were contrary to those of the\ Spanish Empire. A loosely constructed Miskito 'kingdom' was formed in\ diff -Nru freeciv-2.3.0/data/nation/mixtec.ruleset freeciv-2.3.1/data/nation/mixtec.ruleset --- freeciv-2.3.0/data/nation/mixtec.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/mixtec.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -12,7 +12,7 @@ Tilantongo around 1100 AD, was famous in all of ancient Mexico. In the\ late 15th century most of the Mixtec territory was occupied by the\ Aztecs, though parts remained independent until the arrival of the\ - Spanish. Nowadays there are about 700.000 Mixtecs living in the Mexican\ + Spanish. Nowadays there are about 700,000 Mixtecs living in the Mexican\ states of Oaxaca, Guerrero and Puebla, as well as in emigrant\ communities in Northern Mexico and the US.") diff -Nru freeciv-2.3.0/data/nation/moldovan.ruleset freeciv-2.3.1/data/nation/moldovan.ruleset --- freeciv-2.3.0/data/nation/moldovan.ruleset 2011-08-08 04:17:50.000000000 +0000 +++ freeciv-2.3.1/data/nation/moldovan.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -5,8 +5,8 @@ groups="Modern", "European" legend=_("Moldova was conquered by the Ottomans in the 16th century.\ Then in 1812 Moldova became part of the Russian Empire.\ - From 1918 Moldova was part of Romania until inclusion \ - in the Soviet Union in 1940. The modern Republic of Moldova \ + From 1918 Moldova was part of Romania until inclusion\ + in the Soviet Union in 1940. The modern Republic of Moldova\ gained independence from the Soviet Union in 1991.") leaders = { diff -Nru freeciv-2.3.0/data/nation/moravian.ruleset freeciv-2.3.1/data/nation/moravian.ruleset --- freeciv-2.3.0/data/nation/moravian.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/moravian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -3,13 +3,13 @@ name=_("Moravian") plural=_("?plural:Moravians") groups="Medieval", "European" -legend=_("Great Moravia was a Slavic medieval monarchy, whose center was\ +legend=_("Great Moravia was a Slavic medieval monarchy whose center was\ located in the areas of modern Moravia region in Czech Republic. Moravia\ - conquered areas of the Bohemia, Slovakia, Pannonia and large parts of\ + conquered areas of Bohemia, Slovakia, Pannonia and large parts of\ southern Poland and Lusatia. The first ruler and founder of this state\ - was duke Mojmir I. The Great Moravian state was destructed as a result\ - of the Hungarian invasion from eastern steppes. After the defeat of the\ - Hungarians by the Holy Roman Empire Moravia was turned into a\ + was duke Mojmir I. The Great Moravian state was destroyed as a result\ + of the Hungarian invasion from the eastern steppes. After the defeat of the\ + Hungarians by the Holy Roman Empire, Moravia was turned into a\ principality, which was in a personal union with Bohemia for most of its\ history.") diff -Nru freeciv-2.3.0/data/nation/northkorean.ruleset freeciv-2.3.1/data/nation/northkorean.ruleset --- freeciv-2.3.0/data/nation/northkorean.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/northkorean.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -4,9 +4,9 @@ plural=_("?plural:North Koreans") groups="Modern", "Asian" legend=_("In 1945 Korea was split by the Soviet Union and\ - the United States into two states along 38th parallel\ - forming North Korea and South Korea. Even 60 years since\ - then, North Korea remains a communist state of Stalinist type.") + the United States into two states along the 38th parallel,\ + forming North Korea and South Korea. 60 years on,\ + North Korea remains a communist state of the Stalinist type.") leaders = { "name", "sex" diff -Nru freeciv-2.3.0/data/nation/nubian.ruleset freeciv-2.3.1/data/nation/nubian.ruleset --- freeciv-2.3.0/data/nation/nubian.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/nubian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -11,7 +11,7 @@ ruled by Egypt. The 25th Dynasty of Egypt, however, was a Nubian dynasty,\ and one that saw conflict with Assyria, which eventually wrested Egypt\ from Nubia. Brief conflict occurred with Rome in 24 BC when Nubian armies\ - routed the Roman garrison with it's famed archers. Nubia was a nation\ + routed the Roman garrison with its famed archers. Nubia was a nation\ shaped by its position between the Mediterranean world and the African\ interior. Large Nubian states centered on Napata and later Meroe broke\ into smaller Christian kingdoms which persisted into medieval times\ diff -Nru freeciv-2.3.0/data/nation/panamanian.ruleset freeciv-2.3.1/data/nation/panamanian.ruleset --- freeciv-2.3.0/data/nation/panamanian.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/panamanian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -7,7 +7,7 @@ Panama is world famous for the Panama canal. Panama declared\ independence from Colombia in 1903 under US protection. Panamanian\ politics remained dominated by the United States for most of the 20th\ - century, most notabily in 1989 when the United States launched a\ + century, most notably in 1989 when the United States launched a\ military invasion to unseat and arrest General Noriega. Sovereignty over\ the Canal Zone was transferred to Panama in 1999. Panama is one of the\ few countries in the world without a standing army.") diff -Nru freeciv-2.3.0/data/nation/phoenician.ruleset freeciv-2.3.1/data/nation/phoenician.ruleset --- freeciv-2.3.0/data/nation/phoenician.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/phoenician.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -4,13 +4,13 @@ plural=_("?plural:Phoenicians") groups="Ancient", "Asian" legend=_("Phoenicia was an ancient civilization, based in what is now the\ - coastal regions of Lebanon and Syria. They spoke a Canaanite language\ - related to Hebrew and were famed mariners. Their alphabet served as the\ + coastal regions of Lebanon and Syria. They spoke a Canaanite language\ + related to Hebrew and were famed mariners. Their alphabet served as the\ source of the Greek alphabet, and from there evolved into the Etruscan\ - and Latin alphabets as well. The Greeks and Romans knew them for their\ + and Latin alphabets as well. The Greeks and Romans knew them for their\ manufacture of purple dye from the murex shell, which gave them their\ - Greek and Latin names. They referred to themselves a Kan'ani and their\ - Punic (Carthaginian) descendents in St. Augustine's day called themselves\ + Greek and Latin names. They referred to themselves as Kan'ani and their\ + Punic (Carthaginian) descendants in St. Augustine's day called themselves\ Chanani.") leaders = { diff -Nru freeciv-2.3.0/data/nation/salvadoran.ruleset freeciv-2.3.1/data/nation/salvadoran.ruleset --- freeciv-2.3.0/data/nation/salvadoran.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/salvadoran.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -17,7 +17,7 @@ 'fourteen families' having dominated the country's political and\ economic life since independence. In the 1930s general Hernandez\ Martinez established a dictatorship. A nonviolent revolution overthrew\ - Hernandez in 1944 but the country remained instable and from 1979-1992\ + Hernandez in 1944 but the country remained unstable and from 1979-1992\ the country lived through another bloody civil war.") leaders = { diff -Nru freeciv-2.3.0/data/nation/samogitian.ruleset freeciv-2.3.1/data/nation/samogitian.ruleset --- freeciv-2.3.0/data/nation/samogitian.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/samogitian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -5,7 +5,7 @@ groups="Medieval", "European" legend=_("Samogitia - historical country near the Baltic Sea - home to the\ last pagans in Europe (official until 1413). Today, Samogitia is a region\ - of Lithuania") + of Lithuania.") leaders = { "name", "sex" diff -Nru freeciv-2.3.0/data/nation/sarmatian.ruleset freeciv-2.3.1/data/nation/sarmatian.ruleset --- freeciv-2.3.0/data/nation/sarmatian.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/sarmatian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -3,7 +3,7 @@ name=_("Sarmatian") plural=_("?plural:Sarmatians") groups="Ancient", "Asian", "European" -legend=_("The Sarmatians were Iranian pastoralic tribes from Central Asia\ +legend=_("The Sarmatians were Iranian pastoral tribes from Central Asia\ and Southwest Siberia. They were closely related to the Saka and the\ Scythians. The myth of the origin from the Sarmatians formed the basis\ of the Polish culture from the 15th to the 18th century.") diff -Nru freeciv-2.3.0/data/nation/seleucid.ruleset freeciv-2.3.1/data/nation/seleucid.ruleset --- freeciv-2.3.0/data/nation/seleucid.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/seleucid.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -6,7 +6,7 @@ legend=_("The Seleucid Empire was one of the diadochi states founded when\ Alexander the Great's generals carved up his empire after his death. It\ was named after its founder Seleucus I Nicator. Centered in Syria, the\ - Seleucids where the most powerful of the diadochi states but eventually\ + Seleucids were the most powerful of the diadochi states but eventually\ succumbed to Rome in the last century BC.") leaders = { diff -Nru freeciv-2.3.0/data/nation/shawnee.ruleset freeciv-2.3.1/data/nation/shawnee.ruleset --- freeciv-2.3.0/data/nation/shawnee.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/shawnee.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -4,9 +4,9 @@ plural=_("?plural:Shawnee") groups="American" legend=_("An Algonquian people, the Shawnee were led by Tikamthi (better\ - known as Tecumseh) and his brother Tenskwatawa in trying to create a pan-\ - native alliance against American expansionism but were ultimately\ - unsuccessful and made to resettle in Indian Territory (modern Oklahoma).") + known as Tecumseh) and his brother Tenskwatawa in trying to create a\ + pan-native alliance against American expansionism but were ultimately\ + unsuccessful and made to resettle in the Indian Territory (modern Oklahoma).") leaders = { "name", "sex" diff -Nru freeciv-2.3.0/data/nation/somali.ruleset freeciv-2.3.1/data/nation/somali.ruleset --- freeciv-2.3.0/data/nation/somali.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/somali.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -3,11 +3,11 @@ name=_("Somali") plural=_("?plural:Somalis") groups="Medieval", "Early Modern", "Modern", "African" -legend=_("Somali is a country in the Horn of Africa. In ancient times\ - Somalia was a trading hub. In the end of the 19th century it was\ +legend=_("Somalia is a country in the Horn of Africa. In ancient times\ + Somalia was a trading hub. At the end of the 19th century it was\ colonized by Britain and Italy. Somalia regained its independence in\ 1960. The military under general Siad Barre seized power in 1969. Siad\ - Barre unsuccesfully tried to root out the country's clan system. In\ + Barre unsuccessfully tried to root out the country's clan system. In\ 1991 he was overthrown. The country has been without a functioning\ government ever since.") diff -Nru freeciv-2.3.0/data/nation/soviet.ruleset freeciv-2.3.1/data/nation/soviet.ruleset --- freeciv-2.3.0/data/nation/soviet.ruleset 2011-08-08 04:17:50.000000000 +0000 +++ freeciv-2.3.1/data/nation/soviet.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -6,7 +6,7 @@ legend=_("The history of the Soviet Union starts in November 1917,\ when under Lenin's leadership a Bolshevik revolution occurred.\ On December 31 1922, four Soviet republics integrated into one\ - country. The Soviet Union became one of most powerful states in\ + country. The Soviet Union became one of the most powerful states in\ the 20th century, but by the end of 1991 it had disintegrated\ into fifteen independent countries due to social and economic\ problems.") diff -Nru freeciv-2.3.0/data/nation/swazi.ruleset freeciv-2.3.1/data/nation/swazi.ruleset --- freeciv-2.3.0/data/nation/swazi.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/swazi.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -3,7 +3,7 @@ name=_("Swazi") plural=_("?plural:Swazis") groups="Modern", "African" -legend=_("The Swazis is a Bantu people of southern Africa. Under the\ +legend=_("The Swazi are a Bantu people of southern Africa. Under the\ leadership of Mswati II (1820 - 1868), the Swazis expanded their territory\ and stabilized the southern frontier with the Zulus.") diff -Nru freeciv-2.3.0/data/nation/taiwanese.ruleset freeciv-2.3.1/data/nation/taiwanese.ruleset --- freeciv-2.3.0/data/nation/taiwanese.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/taiwanese.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -3,7 +3,7 @@ name=_("Taiwanese") plural=_("?plural:Taiwanese") groups="Modern", "Asian" -legend=_("The Republic of China was established in 1912 as the sucessor\ +legend=_("The Republic of China was established in 1912 as the successor\ state of the Qing Empire, ending over two millennia of imperial rule in\ China. When the Chinese Nationalists who ruled the Republic lost a\ civil war against the Chinese Communists in 1949, the Nationalist\ diff -Nru freeciv-2.3.0/data/nation/thai.ruleset freeciv-2.3.1/data/nation/thai.ruleset --- freeciv-2.3.0/data/nation/thai.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/thai.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -4,7 +4,7 @@ plural=_("?plural:Thai") groups="Modern", "Early Modern", "Medieval", "Asian" legend=_("The Thai kingdom was the only country in Southeast Asia to\ - preserve its independence throught the colonial era of the 18th and\ + preserve its independence through the colonial era of the 18th and\ 19th centuries AD.") leaders = { diff -Nru freeciv-2.3.0/data/nation/tocharian.ruleset freeciv-2.3.1/data/nation/tocharian.ruleset --- freeciv-2.3.0/data/nation/tocharian.ruleset 2011-08-08 04:17:50.000000000 +0000 +++ freeciv-2.3.1/data/nation/tocharian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -4,7 +4,7 @@ plural=_("?plural:Tocharians") groups="Asian" -legend=_("The Tocharians were an Indo-European people living what is now\ +legend=_("The Tocharians were an Indo-European people living in what is now\ Xinjiang in western China. Because of their unique geopolitical position,\ their kingdoms of Shanshan, Kucha, and Khotan (as well as other, smaller\ ones) were influenced by Chinese, Persian, Indian, Sogdian, Scythian, and\ diff -Nru freeciv-2.3.0/data/nation/tunisian.ruleset freeciv-2.3.1/data/nation/tunisian.ruleset --- freeciv-2.3.0/data/nation/tunisian.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/tunisian.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -7,7 +7,7 @@ today. Carthage later became a major power in the Mediterranean region\ until it was defeated by the Romans in 146 BC. Later the Arab Muslim\ conquest in the 7th century led to migration from the Arab and Ottoman\ - countries. But there where also a lot of Jews and Spanish Moors who moved\ + countries. But there were also a lot of Jews and Spanish Moors who moved\ there at the end of the 16th century. Tunisia became mostly autonomous from\ the Ottoman empire in 1861. But in 1881 Tunisia was invaded by the French\ and was made a French protectorate. The country became independent in\ diff -Nru freeciv-2.3.0/data/nation/westernroman.ruleset freeciv-2.3.1/data/nation/westernroman.ruleset --- freeciv-2.3.0/data/nation/westernroman.ruleset 2011-08-08 04:17:51.000000000 +0000 +++ freeciv-2.3.1/data/nation/westernroman.ruleset 2011-11-19 20:19:51.000000000 +0000 @@ -6,7 +6,7 @@ legend=_("The Roman Empire was first divided by Diocletian in 286 and\ split for good upon Theodosius' death in 395. Unlike its Eastern\ counterpart, the Byzantine empire, the Western Roman Empire was not\ - capable of resisting barbarian invasions and economic desintegration.\ + capable of resisting barbarian invasions and economic disintegration.\ The last Western Roman emperor was deposed in 476 AD.") leaders = { diff -Nru freeciv-2.3.0/data/scenario/earth-160x90-v2.sav freeciv-2.3.1/data/scenario/earth-160x90-v2.sav --- freeciv-2.3.0/data/scenario/earth-160x90-v2.sav 2011-08-08 04:17:48.000000000 +0000 +++ freeciv-2.3.1/data/scenario/earth-160x90-v2.sav 2011-11-19 20:19:47.000000000 +0000 @@ -15,7 +15,7 @@ tech=3 box_science=150 min_players=1 -max_players=14 +max_players=30 nplayers=0 fogofwar=1 globalwarming=0 @@ -63,101 +63,101 @@ huts=50 generator=0 is_earth=1 -r0sx=28 -r0sy=27 -r0snation="French" -r1sx=30 -r1sy=23 -r1snation="English" -r2sx=23 -r2sy=21 -r2snation="Irish" -r3sx=27 -r3sy=33 -r3snation="Spanish" -r4sx=26 -r4sy=29 -r4snation="Catalan" -r5sx=22 -r5sy=30 -r5snation="Portuguese" -r6sx=37 -r6sy=27 -r6snation="Bavarian" -r7sx=36 -r7sy=33 -r7snation="Roman" -r8sx=31 -r8sy=36 -r8snation="Carthaginian" -r9sx=41 -r9sy=35 -r9snation="Greek" -r10sx=46 -r10sy=37 -r10snation="Israeli" -r11sx=41 -r11sy=39 -r11snation="Egyptian" -r12sx=50 -r12sy=43 -r12snation="Arab" -r13sx=40 -r13sy=69 -r13snation="Zulu" -r14sx=156 +r0sx=35 +r0sy=32 +r0snation="Roman" +r1sx=56 +r1sy=36 +r1snation="Persian" +r2sx=37 +r2sy=25 +r2snation="German" +r3sx=41 +r3sy=40 +r3snation="Egyptian" +r4sx=156 +r4sy=33 +r4snation="Iroquois" +r5sx=41 +r5sy=33 +r5snation="Greek" +r6sx=65 +r6sy=43 +r6snation="Indian" +r7sx=51 +r7sy=22 +r7snation="Russian" +r8sx=43 +r8sy=67 +r8snation="Zulu" +r9sx=29 +r9sy=29 +r9snation="Gallic" +r10sx=142 +r10sy=44 +r10snation="Aztec" +r11sx=81 +r11sy=32 +r11snation="Chinese" +r12sx=29 +r12sy=22 +r12snation="British" +r13sx=80 +r13sy=23 +r13snation="Mongol" +r14sx=157 r14sy=66 -r14snation="Aztec" -r15sx=154 -r15sy=54 -r15snation="Inca" -r16sx=146 -r16sy=45 -r16snation="Mexican" -r17sx=149 -r17sy=34 -r17snation="Sioux" -r18sx=56 -r18sy=36 -r18snation="Persian" -r19sx=67 -r19sy=23 -r19snation="Russian" -r20sx=75 -r20sy=50 -r20snation="Malaysian" -r21sx=82 -r21sy=42 -r21snation="Vietnamese" -r22sx=95 -r22sy=35 -r22snation="Japanese" -r23sx=39 -r23sy=16 -r23snation="Viking" -r24sx=80 -r24sy=23 -r24snation="Mongol" -r25sx=64 -r25sy=45 -r25snation="Indian" -r26sx=46 -r26sy=36 -r26snation="Phoenician" -r27sx=46 -r27sy=58 -r27snation="Kenyan" -r28sx=40 -r28sy=25 -r28snation="Silesian" -r29sx=99 -r29sy=70 -r29snation="Australian Aboriginal" +r14snation="Inca" +r15sx=145 +r15sy=21 +r15snation="Inuit" +r16sx=45 +r16sy=47 +r16snation="Ethiopian" +r17sx=98 +r17sy=58 +r17snation="Papuan" +r18sx=76 +r18sy=47 +r18snation="Cambodian" +r19sx=50 +r19sy=43 +r19snation="Arab" +r20sx=64 +r20sy=26 +r20snation="Turkish" +r21sx=39 +r21sy=17 +r21snation="Viking" +r22sx=147 +r22sy=46 +r22snation="Mayan" +r23sx=31 +r23sy=36 +r23snation="Carthaginian" +r24sx=24 +r24sy=45 +r24snation="Malian" +r25sx=142 +r25sy=31 +r25snation="Sioux" +r26sx=12 +r26sy=61 +r26snation="Tupi" +r27sx=89 +r27sy=32 +r27snation="Korean" +r28sx=95 +r28sy=35 +r28snation="Japanese" +r29sx=92 +r29sy=24 +r29snation="Manchu" t000="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" t001=" aaaa aa aaaaaa aa aa aaaaaaaa aaaa aaaaaa aa aa aa aa aa aa aa aaaa aa " -t002=" :: :: :: :::: :::: :::: :::: :: :::::: :::::::::: :: :::::::::::: " -t003=" :::::::::::::::::::::::: :::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: " -t004=" :::::::::::::::::: :::::::::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: " +t002=" :: :: :: :::::: :::::: :::: :::: :::: :::: :: :::::: :::::::::: :: :::::::::::: " +t003=" :::::::::::::::::::::::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: " +t004=" ::::::::::::::::::: ::::::::::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: " t005=" :::::::::::::::: t :::::::::: t ::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: " t006=" aaaaaaaaaaaaaa ::::::::::::::: ttt ::::::: ::::::::: t :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: aaaa " t007="aaaaaaaaaaaaaaaaa ::::::::::::::: t t :::: ::::: t ::::::::: ::::::::::::::::::::::::::::::::::: aa aaaa a" @@ -165,31 +165,31 @@ t009="aaaaaaaaaaaaaaaaaa ::::::::::::::: tp tttttt :: ::::::::::::::::::::::::: t t t at ta" t010="aaaaaaaaaaaaaaaaat ::::::::::::::::: tp ttpptttttt : ::::::::::::::::::::::: tt tt" t011="tttaaaaaaaaaaaaaat ::::::::::::::: tttt pp tt tttttppttttt :::::::::::::: tt t p t ttt t" -t012=" tttaaaaaaaaaaaatt :::::::::::: pptttttttt ttt tttttttttfffftt ttt ttttt ::: :: tttt " -t013=" tttaaaaaaaaaatt gppptpppttttt ff ppt ttttfttftffffttffttttttt tttftftttt :: tppt t a " -t014=" tttaaaaaaaatt h pphgffggpppttt tttffffpggpptfftttffffffffffgggpfffffffffffpppttttttt ttt tttt tttta " -t015=": tttaaaaaatt t h gphhgffggppppt tttffffffggggpffffffffffffffpgggpfffpffffffffpppttpttttt ttttttttttttttttt tttt ttaa " -t016=":: tttaaaatt ttt h gghpff ggg+fpp ppffffhhfffgppggfffffffpffffffppppppffffggffffffffffgpptpptttt ttptttpttpttttpttttttttpttttttp p ptaa " -t017="::: ttaaatt tt hhh hgmhpf ggffppppppffffhfffggggpgffffpffffffffffpppppffffpgfffffpffffggppppttt tttttptttttttppttptttttttttttpp paaa " -t018=":::: ttaatt pg ffhhfg g+f+ffpffffffhfffgggppggpfffffgpfffpffffpppfffffffppffffffffffffpp ttttttttttppffffffppttpttttppp p pptt " -t019=":::: ttttt ::::::::: gg gp ffggg gggffffffpfffhmffggggppgpppffffgfffffffffpppffffffffpffffffffffff ttpptpttttppfffffffptpppttttp pt " -t020="::::: ttt :::::::::: gpg ff gggg gffppggppffhmffggggssffppgfffffffffpffpppppffpffgffffgggg ff ::: tppptttppfffffgpfffffffppttpt " -t021=":::::: tt :::::::::: gg hff g ggggffggpgggffhmfffggggpgfppggffffffffpppppfppffffffffffgg ff :::: tpppttpfffffffffffffffppttppp tpp " -t022="::::::: :::::::::: gpggg g ggffffgpgggfffhmffffggggpgpppppffpffgggpgpffffffffgggggg fhh ::::: pppp p ppggppffppffffffffffppppttp t tp " -t023=":::::::::::::::::::::: gsgggg gg ggggfffggggggffffhfffgggggggpfggppffffggg+ggffffffffggg fhh ::::: gppffgpfffgfffffffpppttp pttppp " -t024=" :::::::::::::::::::: ggggpppgggffffggffggggppffhfggffffggffffgffffffffgpppppppppgg hpp :::: ::::: ggffffffffffgfffppptttttppfffg" +t012=" tttaaaaaaaaaaaatt ::::::::::::: pptttttttt ttt tttttttttfffftt ttt ttttt ::: :: tttt " +t013=" tttaaaaaaaaaatt :::::: gppptpppttttt ff ppt ttttfttftffffttffttttttt tttftftttt ::: tppt t a " +t014=" tttaaaaaaaatt ::: :: h pphgffggpppttt tttffffpggpptfftttffffffffffgggpfffffffffffpppttttttt :: ttt tttt tttta " +t015=": tttaaaaaatt :t : h gphhgffggppppt tttffffffggggpffffffffffffffpgggpfffpffffffffpppttpttttt : ttttttttttttttttt tttt ttaa " +t016=":: tttaaaatt :: ttt h gghpff ggg+fpp ppffffhhfffgppggfffffffpffffffppppppffffggffffffffffgpptpptttt: ttptttpttpttttpttttttttpttttttp p ptaa " +t017="::: ttaaatt ::: tt hhh hgmhpf ggffppppppffffhfffggggpgffffpffffffffffpppppffffpgfffffpffffggppppttt :: tttttptttttttppttptttttttttttpp paaa " +t018=":::: ttaatt :::: pg ffhhfg g+f+ffpffffffhfffgggppggpfffffgpfffpffffpppfffffffppffffffffffffpp : ttttttttttppffffffppttpttttppp p pptt " +t019=":::: ttttt ::::::::: gg gp ffggg gggffffffpfffhmffggggppgpppffffgfffffffffpppffffffffpffffffffffff :::: ttpptpttttppfffffffptpppttttp pt " +t020="::::: ttt :::::::::: gpg ff gggg gffppggppffhmffggggssffppgfffffffffpffpppppffpffgffffgggg ff ::::: tppptttppfffffgpfffffffppttpt " +t021=":::::: tt :::::::::: gg hff g ggggffggpgggffhmfffggggpgfppggffffffffpppppfppffffffffffgg ff ::::: tpppttpfffffffffffffffppttppp tpp " +t022=" :::::: :::::::::: gpggg g ggffffgpgggfffhmffffggggpgpppppffpffgggpgpffffffffgggggg fhh :::::: pppp p ppggppffppffffffffffppppttp t tp " +t023=" ::::::::::::::::::::: gsgggg gg ggggfffggggggffffhfffgggggggpfggppffffggg+ggffffffffggg fhh :::::: gppffgpfffgfffffffpppttp pttppp " +t024=" :::::::::::::::::::: ggggpppgggffffggffggggppffhfggffffggffffgffffffffgpppppppppgg hpp :::::: ::::: ggffffffffffgfffppptttttppfffg" t025="p ::::::::::::::::::: ggggggggggggpppggffffggffggggppfffhggffffggffffggffffffggppppppppgggg p p ::::::::::::::::::::: ggffffffffffffffpppttttpfffff" t026="pp ::::::::::::::::::: ggpggggpgggggggggffgpggppggggpppppggggpppppppggffpppgggppdpppppppppgg p ::::::::::::::::::::::: pphhfffggfffffffffppggffffff" -t027="p :::::::::::::::: gpgggghghhgggggggffgggpppggppppppppggpppppppppgfgppppgpppddppppppppgg p ::::::::::::::::::::::::: pphhffggggfffgffffppggfffffg" -t028=" pp :::::::::::::: ggggghmmmhhggpppppfggppppppp ggpppddddpgpppgpppgppppdddddppggppppggg ::::::::::::::::::::::::::: ggffhhggggppgpgpp+pffffppf " -t029=" pp :::::::::::: ghggppgghghhggppgppg ppgppp ggpp pddpppgppppppppppdddpddppggppppgg pp :::::::::::::::::::::::::::: gggffhhppgppppppp+++f++ggggg " -t030=" ::::::::::::: ggppppmg hg gppppgg gp pgg pppppddppppppppgpppgpppddddppggppggggg ghg ::::::::::::::::::::::::::: fgpgghhggggppggppggg+ggggggff" +t027="p ::::::::::::::::: gpgggghghhgggggggffgggpppggppppppppggpppppppppgfgppppgpppddppppppppgg p ::::::::::::::::::::::::: pphhffggggfffgffffppggfffffg" +t028=" pp ::::::::::::::: ggggghmmmhhggpppppfggppppppp ggpppddddpgpppgpppgppppdddddppggppppggg ::::::::::::::::::::::::::: ggffhhggggppgpgpp+pffffppf " +t029=" pp ::::::::::::: ghggppgghghhggppgppg ppgppp ggpp pddpppgppppppppppdddpddppggppppgg pp :::::::::::::::::::::::::::: gggffhhppgppppppp+++f++ggggg " +t030=" :::::::::::::: ggppppmg hg gppppgg gp pgg pppppddppppppppgpppgpppddddppggppggggg ghg ::::::::::::::::::::::::::: fgpgghhggggppggppggg+ggggggff" t031="f ::::::::::::::::: ggppppph gh pppggg gg ppppddpgppppppgppppppppddpppggppgggg :::::::::::::::::::::::::::: ffggghmhgggggggggpgpg+gggpgggf" -t032=" :::::::::::::::::: pppdppg gh ggpgp gg ppppppppppgppppppppgpppppg gggg pm :::::::::::::::::::::::::::::: fgpghhmmhgppggggpgggggffggggf " -t033=" ::::::::::::: ::: ppppp h gh ggp ppggppgg pppgppppppppppppppppgppppgg gg pm :::::::::::::::::::::::::::::: ffgphhmmhgppgggggggpggpfgggg " +t032=" :::::::::::::::::: ppphppg gh ggpgp gg ppppppppppgppppppppgpppppg gggg pm :::::::::::::::::::::::::::::: fgpghhmmhgppggggpgggggffggggf " +t033=" ::::::::::::: ::: ppppp h gh ggp gppggppgg pppgppppppppppppppppgppppgg gg pm :::::::::::::::::::::::::::::: ffgphhmmhgppgggggggpggpfgggg " t034=" ::::::::::::: g :::: hppp g g g gg pgffppppppppppppppgphhhhppppgggpppppppgg gg gpmhp ::::::::::::::::::::::::::::::: fggghhmhpppggggggggggghhgg " t035=" :::::::::::::: :::: gp g ggffppppppppppgpppgghhhhhpppggggppppppgg gppmg ::::::::::::::::::::::::::::::: ffpghhhpppppgggggggpghhggg " -t036="::::::::::::::::::::: hgggggggg pppppppppppphhphhhhhhhhhppggggpppppgggg g ::::::::::::::::::::::::::::::: fggppppppggggppgggghhgg :" +t036="::::::::::::::::::::: hgggggggg pppppppppppphhphhhhhhhhhppggggpppppgggg g :::::::::::::::::::::::::::::::: fggppppppggggppgggghhgg :" t037="::::::::::::::::::: gggppppgggg pppppppppppppphhhhmmmhhmhhggggpppggpggg ::::::::::::::::::::::::::::::::::::: gggppphppgggppggghhgg :::" t038=":::::::::::::::::: ppgppphhhhppgggg ggggpppppppddpp ppphhmmmmmmmmhhpgggggggpppggg :::::::::::::::::::::::::::::::::::::: pggpppddpppgggggggg :::::" t039="::::::::::::::::: ppppppdddddphhppgggggggpgppppppdddp pphhhhhmmmmmhhppggggggpgppgg :::::::::::::::::::::::::::::::::::::::: gpggppdddppgggggggg ::: " @@ -236,7 +236,7 @@ t080=" ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::: ggppg " t081=" :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::::::::::::::::::::::::::::::::::::: gpppgg" t082=" :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::: ppgpp " -t083=" g ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::::::::::::::::::::::::::::::::::::::::::: pppp " +t083=" g :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::::::::::::::::::::::::::::::::::::::::::: pppp " t084=" ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: pppf " t085=" :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: pf " t086=" ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: " diff -Nru freeciv-2.3.0/data/scenario/Makefile.in freeciv-2.3.1/data/scenario/Makefile.in --- freeciv-2.3.0/data/scenario/Makefile.in 2011-08-08 04:25:56.000000000 +0000 +++ freeciv-2.3.1/data/scenario/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/stdsounds/Makefile.in freeciv-2.3.1/data/stdsounds/Makefile.in --- freeciv-2.3.0/data/stdsounds/Makefile.in 2011-08-08 04:25:56.000000000 +0000 +++ freeciv-2.3.1/data/stdsounds/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.in 2011-08-08 04:25:56.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.in 2011-08-08 04:25:56.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.in 2011-08-08 04:25:57.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.in 2011-08-08 04:25:57.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.in 2011-08-08 04:25:57.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.in 2011-08-08 04:25:57.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.in 2011-08-08 04:25:57.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.in 2011-08-08 04:25:57.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.in 2011-08-08 04:25:57.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -156,10 +156,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -332,7 +328,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -475,7 +470,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -500,7 +495,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.in 2011-08-08 04:25:57.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.in 2011-08-08 04:25:58.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.in 2011-08-08 04:25:58.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.in 2011-08-08 04:25:58.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.in 2011-08-08 04:25:58.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.in 2011-08-08 04:25:58.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.in 2011-08-08 04:25:58.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.in 2011-08-08 04:25:58.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.in 2011-08-08 04:25:58.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.in 2011-08-08 04:25:58.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Freeciv/Makefile.in 2011-08-08 04:25:56.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Freeciv/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -132,10 +132,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -308,7 +304,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -421,7 +416,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -446,7 +441,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -Nru freeciv-2.3.0/data/themes/gui-gtk-2.0/Makefile.in freeciv-2.3.1/data/themes/gui-gtk-2.0/Makefile.in --- freeciv-2.3.0/data/themes/gui-gtk-2.0/Makefile.in 2011-08-08 04:25:59.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-gtk-2.0/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -132,10 +132,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -308,7 +304,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -421,7 +416,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -446,7 +441,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -Nru freeciv-2.3.0/data/themes/gui-sdl/human/Makefile.in freeciv-2.3.1/data/themes/gui-sdl/human/Makefile.in --- freeciv-2.3.0/data/themes/gui-sdl/human/Makefile.in 2011-08-08 04:25:59.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-sdl/human/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/themes/gui-sdl/Makefile.in freeciv-2.3.1/data/themes/gui-sdl/Makefile.in --- freeciv-2.3.0/data/themes/gui-sdl/Makefile.in 2011-08-08 04:25:59.000000000 +0000 +++ freeciv-2.3.1/data/themes/gui-sdl/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -132,10 +132,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -308,7 +304,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -421,7 +416,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -446,7 +441,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -Nru freeciv-2.3.0/data/themes/Makefile.in freeciv-2.3.1/data/themes/Makefile.in --- freeciv-2.3.0/data/themes/Makefile.in 2011-08-08 04:25:56.000000000 +0000 +++ freeciv-2.3.1/data/themes/Makefile.in 2011-11-19 20:24:05.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -134,10 +134,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -310,7 +306,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -423,7 +418,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -448,7 +443,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -Nru freeciv-2.3.0/data/trident/Makefile.in freeciv-2.3.1/data/trident/Makefile.in --- freeciv-2.3.0/data/trident/Makefile.in 2011-08-08 04:25:59.000000000 +0000 +++ freeciv-2.3.1/data/trident/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/data/wonders/Makefile.in freeciv-2.3.1/data/wonders/Makefile.in --- freeciv-2.3.0/data/wonders/Makefile.in 2011-08-08 04:25:59.000000000 +0000 +++ freeciv-2.3.1/data/wonders/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -116,10 +116,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -292,7 +288,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/debian/changelog freeciv-2.3.1/debian/changelog --- freeciv-2.3.0/debian/changelog 2011-08-29 02:41:05.000000000 +0000 +++ freeciv-2.3.1/debian/changelog 2012-01-10 01:55:47.000000000 +0000 @@ -1,3 +1,15 @@ +freeciv (2.3.1-1) unstable; urgency=low + + * Switch to short style dh with overrides + - Update control to 7.0.50 and compat to 7 + - Various packaging cleanups, fixes various issues with our + packaging that appears to have been broken for some time. + * Change our dependency away from ttf-sazanami-gothic per the + request of its maintainer (Closes: #642944) + * New package freeciv-client-extras with freeciv-modpack in it. + + -- Karl Goetz Sat, 31 Dec 2011 11:39:58 +1100 + freeciv (2.3.0-1) unstable; urgency=low [ Karl Goetz ] diff -Nru freeciv-2.3.0/debian/control freeciv-2.3.1/debian/control --- freeciv-2.3.0/debian/control 2011-08-29 02:41:05.000000000 +0000 +++ freeciv-2.3.1/debian/control 2012-01-10 01:55:47.000000000 +0000 @@ -8,6 +8,7 @@ Vcs-Git: git://git.debian.org/git/pkg-games/freeciv.git Vcs-Browser: http://git.debian.org/?p=pkg-games/freeciv.git;a=summary Build-Depends: debhelper (>= 7.0.50), + dh-autoreconf, gettext, libx11-dev, libxaw7-dev, @@ -74,7 +75,7 @@ Package: freeciv-client-sdl Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, freeciv-data (>= 2.2.0), ttf-dejavu-core, ttf-sazanami-gothic, ttf-unfonts-core, ttf-arphic-uming +Depends: ${misc:Depends}, ${shlibs:Depends}, freeciv-data (>= 2.2.0), ttf-dejavu-core, fonts-ipafont-gothic | fonts-japanese-gothic, ttf-unfonts-core, ttf-arphic-uming Recommends: freeciv-server (>= 2.2.0) Suggests: freeciv-sound Provides: freeciv-client, freeciv @@ -85,6 +86,20 @@ . This is the SDL version of the Freeciv client. +Package: freeciv-client-extras +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, freeciv-data +Description: Civilization turn based strategy game (standard sound pack) + Freeciv is a free clone of the turn based strategy game Civilization. + In this game, each player becomes leader of a civilisation, fighting to + obtain the ultimate goal: the extinction of all other civilisations. + . + This is a collection of supporting scripts and tools which may be + useful to a Freeciv player. These include: + * freeciv-stub: Minimal freeciv client wrapper + * freeciv-manual: Generate an HTML manual for freeciv-server + * freeciv-modpack: GTK modpack, ruleset and tileset downloader + Package: freeciv-data Architecture: all Depends: ${misc:Depends} diff -Nru freeciv-2.3.0/debian/freeciv-client-extras.install freeciv-2.3.1/debian/freeciv-client-extras.install --- freeciv-2.3.0/debian/freeciv-client-extras.install 1970-01-01 00:00:00.000000000 +0000 +++ freeciv-2.3.1/debian/freeciv-client-extras.install 2012-01-10 01:55:47.000000000 +0000 @@ -0,0 +1,6 @@ +debian/tmp/usr/games/freeciv-stub +debian/tmp/usr/games/freeciv-manual +debian/tmp/usr/games/freeciv-modpack +debian/tmp/usr/share/applications/freeciv-modpack.desktop +debian/tmp/usr/share/man/man6/freeciv-modpack.6 +debian/tmp/usr/share/man/man6/freeciv-manual.6 diff -Nru freeciv-2.3.0/debian/freeciv-client-extras.links freeciv-2.3.1/debian/freeciv-client-extras.links --- freeciv-2.3.0/debian/freeciv-client-extras.links 1970-01-01 00:00:00.000000000 +0000 +++ freeciv-2.3.1/debian/freeciv-client-extras.links 2012-01-10 01:55:47.000000000 +0000 @@ -0,0 +1,2 @@ +/usr/share/doc/freeciv-data /usr/share/doc/freeciv-client-extras +/usr/share/man/man6/freeciv-client.6.gz /usr/share/man/man6/freeciv-stub.6.gz diff -Nru freeciv-2.3.0/debian/freeciv-data.install freeciv-2.3.1/debian/freeciv-data.install --- freeciv-2.3.0/debian/freeciv-data.install 2011-08-29 02:41:05.000000000 +0000 +++ freeciv-2.3.1/debian/freeciv-data.install 2012-01-10 01:55:47.000000000 +0000 @@ -2,3 +2,4 @@ debian/tmp/usr/share/games/freeciv debian/tmp/usr/share/locale debian/tmp/usr/share/man/man6/freeciv-client.6 +debian/tmp/usr/share/pixmaps/freeciv-client.png diff -Nru freeciv-2.3.0/debian/freeciv-manual.6 freeciv-2.3.1/debian/freeciv-manual.6 --- freeciv-2.3.0/debian/freeciv-manual.6 1970-01-01 00:00:00.000000000 +0000 +++ freeciv-2.3.1/debian/freeciv-manual.6 2012-01-10 01:55:47.000000000 +0000 @@ -0,0 +1,40 @@ +.TH FREECIV "6" "January 2012" "Debian" "User Commands" +.SH NAME +freeciv-manual - Generate HTML manual for +.IR freeciv-server(6) +.SH SYNOPSIS +.B freeciv-manual +[\fIoption \fR...] +.TP +\fB\-d\fR, \fB\-\-debug\fR NUM +Set debug log level (0 to 3) +.TP +\fB\-h\fR, \fB\-\-help\fR +Print a summary of the options +.TP +\fB\-l\fR, \fB\-\-log\fR FILE +Use FILE as logfile +.HP +\fB\-r\fR, \fB\-\-ruleset\fR RULESET Make manual for RULESET +.TP +\fB\-v\fR, \fB\-\-version\fR +Print the version number +.SH DESCRIPTION +This tool can be used to generate 5 HTML pages with the documentation +for freeciv-server. The pages cover several topics in detail, including: + +\fB*\fP Wonders + +\fB*\fP Buildings + +\fB*\fP Terrain + +\fB*\fP Server commands and + +\fB*\fP Server options + +.SH "REPORTING BUGS" +Report bugs at http://gna.org/projects/freeciv/ +.SH "SEE ALSO" +.IR freeciv-server (6) +and the Client Manual at the Freeciv homepage. diff -Nru freeciv-2.3.0/debian/freeciv-server.install freeciv-2.3.1/debian/freeciv-server.install --- freeciv-2.3.0/debian/freeciv-server.install 2011-08-29 02:41:05.000000000 +0000 +++ freeciv-2.3.1/debian/freeciv-server.install 2012-01-10 01:55:47.000000000 +0000 @@ -1,2 +1,3 @@ debian/tmp/usr/games/freeciv-server +debian/tmp/usr/share/applications/freeciv-server.desktop debian/tmp/usr/share/man/man6/freeciv-server.6 diff -Nru freeciv-2.3.0/debian/patches/debian-changes-2.3.0-1 freeciv-2.3.1/debian/patches/debian-changes-2.3.0-1 --- freeciv-2.3.0/debian/patches/debian-changes-2.3.0-1 2011-08-29 02:43:32.000000000 +0000 +++ freeciv-2.3.1/debian/patches/debian-changes-2.3.0-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,8046 +0,0 @@ -Description: Upstream changes introduced in version 2.3.0-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - freeciv (2.3.0-1) unstable; urgency=low - . - [ Karl Goetz ] - * New upstream version. - * Fix themes_sdl_use_system_fonts.diff to apply cleanly on 2.3.0 - * Massage work_around_unity_induced_breakage.diff to get it - applying to the new codebase (The patch assumes commits made - after 2.3.0 was tagged upstream). - . - [ Clint Adams ] - * Fudge build system to think there is no libtool mismatch. - . - The person named in the Author field signed this changelog entry. -Author: Clint Adams - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- freeciv-2.3.0.orig/aclocal.m4 -+++ freeciv-2.3.0/aclocal.m4 -@@ -8940,7 +8940,12 @@ m4_include([m4/iconv.m4]) - m4_include([m4/lib-ld.m4]) - m4_include([m4/lib-link.m4]) - m4_include([m4/lib-prefix.m4]) -+m4_include([m4/libtool.m4]) - m4_include([m4/locale.m4]) -+m4_include([m4/ltoptions.m4]) -+m4_include([m4/ltsugar.m4]) -+m4_include([m4/ltversion.m4]) -+m4_include([m4/lt~obsolete.m4]) - m4_include([m4/ngettext.m4]) - m4_include([m4/no-client.m4]) - m4_include([m4/pkg.m4]) ---- /dev/null -+++ freeciv-2.3.0/m4/ltoptions.m4 -@@ -0,0 +1,368 @@ -+# Helper functions for option handling. -*- Autoconf -*- -+# -+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gary V. Vaughan, 2004 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+# serial 6 ltoptions.m4 -+ -+# This is to help aclocal find these macros, as it can't see m4_define. -+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) -+ -+ -+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -+# ------------------------------------------ -+m4_define([_LT_MANGLE_OPTION], -+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) -+ -+ -+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -+# --------------------------------------- -+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -+# matching handler defined, dispatch to it. Other OPTION-NAMEs are -+# saved as a flag. -+m4_define([_LT_SET_OPTION], -+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), -+ _LT_MANGLE_DEFUN([$1], [$2]), -+ [m4_warning([Unknown $1 option `$2'])])[]dnl -+]) -+ -+ -+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -+# ------------------------------------------------------------ -+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -+m4_define([_LT_IF_OPTION], -+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) -+ -+ -+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -+# ------------------------------------------------------- -+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -+# are set. -+m4_define([_LT_UNLESS_OPTIONS], -+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), -+ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), -+ [m4_define([$0_found])])])[]dnl -+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -+])[]dnl -+]) -+ -+ -+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -+# ---------------------------------------- -+# OPTION-LIST is a space-separated list of Libtool options associated -+# with MACRO-NAME. If any OPTION has a matching handler declared with -+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -+# the unknown option and exit. -+m4_defun([_LT_SET_OPTIONS], -+[# Set options -+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), -+ [_LT_SET_OPTION([$1], _LT_Option)]) -+ -+m4_if([$1],[LT_INIT],[ -+ dnl -+ dnl Simply set some default values (i.e off) if boolean options were not -+ dnl specified: -+ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no -+ ]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no -+ ]) -+ dnl -+ dnl If no reference was made to various pairs of opposing options, then -+ dnl we run the default mode handler for the pair. For example, if neither -+ dnl `shared' nor `disable-shared' was passed, we enable building of shared -+ dnl archives by default: -+ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], -+ [_LT_ENABLE_FAST_INSTALL]) -+ ]) -+])# _LT_SET_OPTIONS -+ -+ -+## --------------------------------- ## -+## Macros to handle LT_INIT options. ## -+## --------------------------------- ## -+ -+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -+# ----------------------------------------- -+m4_define([_LT_MANGLE_DEFUN], -+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) -+ -+ -+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -+# ----------------------------------------------- -+m4_define([LT_OPTION_DEFINE], -+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -+])# LT_OPTION_DEFINE -+ -+ -+# dlopen -+# ------ -+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -+]) -+ -+AU_DEFUN([AC_LIBTOOL_DLOPEN], -+[_LT_SET_OPTION([LT_INIT], [dlopen]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you -+put the `dlopen' option into LT_INIT's first parameter.]) -+]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) -+ -+ -+# win32-dll -+# --------- -+# Declare package support for building win32 dll's. -+LT_OPTION_DEFINE([LT_INIT], [win32-dll], -+[enable_win32_dll=yes -+ -+case $host in -+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) -+ AC_CHECK_TOOL(AS, as, false) -+ AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+ AC_CHECK_TOOL(OBJDUMP, objdump, false) -+ ;; -+esac -+ -+test -z "$AS" && AS=as -+_LT_DECL([], [AS], [0], [Assembler program])dnl -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl -+ -+test -z "$OBJDUMP" && OBJDUMP=objdump -+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl -+])# win32-dll -+ -+AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+_LT_SET_OPTION([LT_INIT], [win32-dll]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you -+put the `win32-dll' option into LT_INIT's first parameter.]) -+]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) -+ -+ -+# _LT_ENABLE_SHARED([DEFAULT]) -+# ---------------------------- -+# implement the --enable-shared flag, and supports the `shared' and -+# `disable-shared' LT_INIT options. -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+m4_define([_LT_ENABLE_SHARED], -+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -+AC_ARG_ENABLE([shared], -+ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -+ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) -+ -+ _LT_DECL([build_libtool_libs], [enable_shared], [0], -+ [Whether or not to build shared libraries]) -+])# _LT_ENABLE_SHARED -+ -+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) -+ -+# Old names: -+AC_DEFUN([AC_ENABLE_SHARED], -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -+]) -+ -+AC_DEFUN([AC_DISABLE_SHARED], -+[_LT_SET_OPTION([LT_INIT], [disable-shared]) -+]) -+ -+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AM_ENABLE_SHARED], []) -+dnl AC_DEFUN([AM_DISABLE_SHARED], []) -+ -+ -+ -+# _LT_ENABLE_STATIC([DEFAULT]) -+# ---------------------------- -+# implement the --enable-static flag, and support the `static' and -+# `disable-static' LT_INIT options. -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+m4_define([_LT_ENABLE_STATIC], -+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -+AC_ARG_ENABLE([static], -+ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], -+ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; -+ *) -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_static=]_LT_ENABLE_STATIC_DEFAULT) -+ -+ _LT_DECL([build_old_libs], [enable_static], [0], -+ [Whether or not to build static libraries]) -+])# _LT_ENABLE_STATIC -+ -+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) -+ -+# Old names: -+AC_DEFUN([AC_ENABLE_STATIC], -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -+]) -+ -+AC_DEFUN([AC_DISABLE_STATIC], -+[_LT_SET_OPTION([LT_INIT], [disable-static]) -+]) -+ -+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AM_ENABLE_STATIC], []) -+dnl AC_DEFUN([AM_DISABLE_STATIC], []) -+ -+ -+ -+# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -+# ---------------------------------- -+# implement the --enable-fast-install flag, and support the `fast-install' -+# and `disable-fast-install' LT_INIT options. -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+m4_define([_LT_ENABLE_FAST_INSTALL], -+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -+AC_ARG_ENABLE([fast-install], -+ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -+ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) -+ -+_LT_DECL([fast_install], [enable_fast_install], [0], -+ [Whether or not to optimize for fast installation])dnl -+])# _LT_ENABLE_FAST_INSTALL -+ -+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) -+ -+# Old names: -+AU_DEFUN([AC_ENABLE_FAST_INSTALL], -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you put -+the `fast-install' option into LT_INIT's first parameter.]) -+]) -+ -+AU_DEFUN([AC_DISABLE_FAST_INSTALL], -+[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you put -+the `disable-fast-install' option into LT_INIT's first parameter.]) -+]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) -+ -+ -+# _LT_WITH_PIC([MODE]) -+# -------------------- -+# implement the --with-pic flag, and support the `pic-only' and `no-pic' -+# LT_INIT options. -+# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -+m4_define([_LT_WITH_PIC], -+[AC_ARG_WITH([pic], -+ [AS_HELP_STRING([--with-pic], -+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -+ [pic_mode="$withval"], -+ [pic_mode=default]) -+ -+test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) -+ -+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -+])# _LT_WITH_PIC -+ -+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) -+ -+# Old name: -+AU_DEFUN([AC_LIBTOOL_PICMODE], -+[_LT_SET_OPTION([LT_INIT], [pic-only]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you -+put the `pic-only' option into LT_INIT's first parameter.]) -+]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) -+ -+## ----------------- ## -+## LTDL_INIT Options ## -+## ----------------- ## -+ -+m4_define([_LTDL_MODE], []) -+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], -+ [m4_define([_LTDL_MODE], [nonrecursive])]) -+LT_OPTION_DEFINE([LTDL_INIT], [recursive], -+ [m4_define([_LTDL_MODE], [recursive])]) -+LT_OPTION_DEFINE([LTDL_INIT], [subproject], -+ [m4_define([_LTDL_MODE], [subproject])]) -+ -+m4_define([_LTDL_TYPE], []) -+LT_OPTION_DEFINE([LTDL_INIT], [installable], -+ [m4_define([_LTDL_TYPE], [installable])]) -+LT_OPTION_DEFINE([LTDL_INIT], [convenience], -+ [m4_define([_LTDL_TYPE], [convenience])]) ---- /dev/null -+++ freeciv-2.3.0/m4/lt~obsolete.m4 -@@ -0,0 +1,92 @@ -+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -+# -+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -+# Written by Scott James Remnant, 2004. -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+# serial 4 lt~obsolete.m4 -+ -+# These exist entirely to fool aclocal when bootstrapping libtool. -+# -+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -+# which have later been changed to m4_define as they aren't part of the -+# exported API, or moved to Autoconf or Automake where they belong. -+# -+# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -+# using a macro with the same name in our local m4/libtool.m4 it'll -+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -+# and doesn't know about Autoconf macros at all.) -+# -+# So we provide this file, which has a silly filename so it's always -+# included after everything else. This provides aclocal with the -+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -+# because those macros already exist, or will be overwritten later. -+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -+# -+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -+# Yes, that means every name once taken will need to remain here until -+# we give up compatibility with versions before 1.7, at which point -+# we need to keep only those names which we still refer to. -+ -+# This is to help aclocal find these macros, as it can't see m4_define. -+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) -+ -+m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -+m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -+m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -+m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -+m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -+m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -+m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -+m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -+m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -+m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -+m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -+m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -+m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -+m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -+m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -+m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -+m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -+m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -+m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -+m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -+m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -+m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -+m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -+m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -+m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -+m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -+m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -+m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) -+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) ---- /dev/null -+++ freeciv-2.3.0/m4/ltsugar.m4 -@@ -0,0 +1,123 @@ -+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -+# -+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gary V. Vaughan, 2004 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+# serial 6 ltsugar.m4 -+ -+# This is to help aclocal find these macros, as it can't see m4_define. -+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) -+ -+ -+# lt_join(SEP, ARG1, [ARG2...]) -+# ----------------------------- -+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -+# associated separator. -+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -+# versions in m4sugar had bugs. -+m4_define([lt_join], -+[m4_if([$#], [1], [], -+ [$#], [2], [[$2]], -+ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -+m4_define([_lt_join], -+[m4_if([$#$2], [2], [], -+ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) -+ -+ -+# lt_car(LIST) -+# lt_cdr(LIST) -+# ------------ -+# Manipulate m4 lists. -+# These macros are necessary as long as will still need to support -+# Autoconf-2.59 which quotes differently. -+m4_define([lt_car], [[$1]]) -+m4_define([lt_cdr], -+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], -+ [$#], 1, [], -+ [m4_dquote(m4_shift($@))])]) -+m4_define([lt_unquote], $1) -+ -+ -+# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -+# ------------------------------------------ -+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -+# Note that neither SEPARATOR nor STRING are expanded; they are appended -+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -+# No SEPARATOR is output if MACRO-NAME was previously undefined (different -+# than defined and empty). -+# -+# This macro is needed until we can rely on Autoconf 2.62, since earlier -+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -+m4_define([lt_append], -+[m4_define([$1], -+ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) -+ -+ -+ -+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -+# ---------------------------------------------------------- -+# Produce a SEP delimited list of all paired combinations of elements of -+# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -+# has the form PREFIXmINFIXSUFFIXn. -+# Needed until we can rely on m4_combine added in Autoconf 2.62. -+m4_define([lt_combine], -+[m4_if(m4_eval([$# > 3]), [1], -+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -+[[m4_foreach([_Lt_prefix], [$2], -+ [m4_foreach([_Lt_suffix], -+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, -+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) -+ -+ -+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -+# ----------------------------------------------------------------------- -+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -+m4_define([lt_if_append_uniq], -+[m4_ifdef([$1], -+ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], -+ [lt_append([$1], [$2], [$3])$4], -+ [$5])], -+ [lt_append([$1], [$2], [$3])$4])]) -+ -+ -+# lt_dict_add(DICT, KEY, VALUE) -+# ----------------------------- -+m4_define([lt_dict_add], -+[m4_define([$1($2)], [$3])]) -+ -+ -+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -+# -------------------------------------------- -+m4_define([lt_dict_add_subkey], -+[m4_define([$1($2:$3)], [$4])]) -+ -+ -+# lt_dict_fetch(DICT, KEY, [SUBKEY]) -+# ---------------------------------- -+m4_define([lt_dict_fetch], -+[m4_ifval([$3], -+ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), -+ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) -+ -+ -+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -+# ----------------------------------------------------------------- -+m4_define([lt_if_dict_fetch], -+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], -+ [$5], -+ [$6])]) -+ -+ -+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -+# -------------------------------------------------------------- -+m4_define([lt_dict_filter], -+[m4_if([$5], [], [], -+ [lt_join(m4_quote(m4_default([$4], [[, ]])), -+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), -+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -+]) ---- /dev/null -+++ freeciv-2.3.0/m4/libtool.m4 -@@ -0,0 +1,7377 @@ -+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+m4_define([_LT_COPYING], [dnl -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is part of GNU Libtool. -+# -+# GNU Libtool 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 (at your option) any later version. -+# -+# As a special exception to the GNU General Public License, -+# if you distribute this file as part of a program or library that -+# is built using GNU Libtool, you may include this file under the -+# same distribution terms that you use for the rest of that program. -+# -+# GNU Libtool is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with GNU Libtool; see the file COPYING. If not, a copy -+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -+# obtained by writing to the Free Software Foundation, Inc., -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+]) -+ -+# serial 56 LT_INIT -+ -+ -+# LT_PREREQ(VERSION) -+# ------------------ -+# Complain and exit if this libtool version is less that VERSION. -+m4_defun([LT_PREREQ], -+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, -+ [m4_default([$3], -+ [m4_fatal([Libtool version $1 or higher is required], -+ 63)])], -+ [$2])]) -+ -+ -+# _LT_CHECK_BUILDDIR -+# ------------------ -+# Complain if the absolute build directory name contains unusual characters -+m4_defun([_LT_CHECK_BUILDDIR], -+[case `pwd` in -+ *\ * | *\ *) -+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -+esac -+]) -+ -+ -+# LT_INIT([OPTIONS]) -+# ------------------ -+AC_DEFUN([LT_INIT], -+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -+AC_BEFORE([$0], [LT_LANG])dnl -+AC_BEFORE([$0], [LT_OUTPUT])dnl -+AC_BEFORE([$0], [LTDL_INIT])dnl -+m4_require([_LT_CHECK_BUILDDIR])dnl -+ -+dnl Autoconf doesn't catch unexpanded LT_ macros by default: -+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -+dnl unless we require an AC_DEFUNed macro: -+AC_REQUIRE([LTOPTIONS_VERSION])dnl -+AC_REQUIRE([LTSUGAR_VERSION])dnl -+AC_REQUIRE([LTVERSION_VERSION])dnl -+AC_REQUIRE([LTOBSOLETE_VERSION])dnl -+m4_require([_LT_PROG_LTMAIN])dnl -+ -+dnl Parse OPTIONS -+_LT_SET_OPTIONS([$0], [$1]) -+ -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ltmain" -+ -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+AC_SUBST(LIBTOOL)dnl -+ -+_LT_SETUP -+ -+# Only expand once: -+m4_define([LT_INIT]) -+])# LT_INIT -+ -+# Old names: -+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -+dnl AC_DEFUN([AM_PROG_LIBTOOL], []) -+ -+ -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+m4_defun([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+]) -+ -+ -+# _LT_FILEUTILS_DEFAULTS -+# ---------------------- -+# It is okay to use these file commands and assume they have been set -+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -+m4_defun([_LT_FILEUTILS_DEFAULTS], -+[: ${CP="cp -f"} -+: ${MV="mv -f"} -+: ${RM="rm -f"} -+])# _LT_FILEUTILS_DEFAULTS -+ -+ -+# _LT_SETUP -+# --------- -+m4_defun([_LT_SETUP], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+_LT_DECL([], [host_alias], [0], [The host system])dnl -+_LT_DECL([], [host], [0])dnl -+_LT_DECL([], [host_os], [0])dnl -+dnl -+_LT_DECL([], [build_alias], [0], [The build system])dnl -+_LT_DECL([], [build], [0])dnl -+_LT_DECL([], [build_os], [0])dnl -+dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([LT_PATH_LD])dnl -+AC_REQUIRE([LT_PATH_NM])dnl -+dnl -+AC_REQUIRE([AC_PROG_LN_S])dnl -+test -z "$LN_S" && LN_S="ln -s" -+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -+dnl -+AC_REQUIRE([LT_CMD_MAX_LEN])dnl -+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -+dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_CMD_RELOAD])dnl -+m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CMD_OLD_ARCHIVE])dnl -+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+ -+_LT_CONFIG_LIBTOOL_INIT([ -+# See if we are running on zsh, and set the options which allow our -+# commands through without removal of \ escapes INIT. -+if test -n "\${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi -+]) -+if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi -+ -+_LT_CHECK_OBJDIR -+ -+m4_require([_LT_TAG_COMPILER])dnl -+_LT_PROG_ECHO_BACKSLASH -+ -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+ fi -+ ;; -+esac -+ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' -+ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\([["`\\]]\)/\\\1/g' -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to delay expansion of an escaped single quote. -+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+ -+# Global variables: -+ofile=libtool -+can_build_shared=yes -+ -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ -+with_gnu_ld="$lt_cv_prog_gnu_ld" -+ -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" -+ -+# Set sane defaults for various variables -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$LD" && LD=ld -+test -z "$ac_objext" && ac_objext=o -+ -+_LT_CC_BASENAME([$compiler]) -+ -+# Only perform the check for file, if the check method requires it -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ _LT_PATH_MAGIC -+ fi -+ ;; -+esac -+ -+# Use C for the default configuration in the libtool script -+LT_SUPPORTED_TAG([CC]) -+_LT_LANG_C_CONFIG -+_LT_LANG_DEFAULT_CONFIG -+_LT_CONFIG_COMMANDS -+])# _LT_SETUP -+ -+ -+# _LT_PROG_LTMAIN -+# --------------- -+# Note that this code is called both from `configure', and `config.status' -+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -+# `config.status' has no value for ac_aux_dir unless we are using Automake, -+# so we pass a copy along to make sure it has a sensible value anyway. -+m4_defun([_LT_PROG_LTMAIN], -+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -+ltmain="$ac_aux_dir/ltmain.sh" -+])# _LT_PROG_LTMAIN -+ -+ -+## ------------------------------------- ## -+## Accumulate code for creating libtool. ## -+## ------------------------------------- ## -+ -+# So that we can recreate a full libtool script including additional -+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -+# in macros and then make a single call at the end using the `libtool' -+# label. -+ -+ -+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -+# ---------------------------------------- -+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -+m4_define([_LT_CONFIG_LIBTOOL_INIT], -+[m4_ifval([$1], -+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT], -+ [$1 -+])])]) -+ -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_INIT]) -+ -+ -+# _LT_CONFIG_LIBTOOL([COMMANDS]) -+# ------------------------------ -+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -+m4_define([_LT_CONFIG_LIBTOOL], -+[m4_ifval([$1], -+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], -+ [$1 -+])])]) -+ -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) -+ -+ -+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -+# ----------------------------------------------------- -+m4_defun([_LT_CONFIG_SAVE_COMMANDS], -+[_LT_CONFIG_LIBTOOL([$1]) -+_LT_CONFIG_LIBTOOL_INIT([$2]) -+]) -+ -+ -+# _LT_FORMAT_COMMENT([COMMENT]) -+# ----------------------------- -+# Add leading comment marks to the start of each line, and a trailing -+# full-stop to the whole comment if one is not present already. -+m4_define([_LT_FORMAT_COMMENT], -+[m4_ifval([$1], [ -+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], -+ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -+)]) -+ -+ -+ -+## ------------------------ ## -+## FIXME: Eliminate VARNAME ## -+## ------------------------ ## -+ -+ -+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -+# ------------------------------------------------------------------- -+# CONFIGNAME is the name given to the value in the libtool script. -+# VARNAME is the (base) name used in the configure script. -+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -+# VARNAME. Any other value will be used directly. -+m4_define([_LT_DECL], -+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], -+ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], -+ [m4_ifval([$1], [$1], [$2])]) -+ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) -+ m4_ifval([$4], -+ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) -+ lt_dict_add_subkey([lt_decl_dict], [$2], -+ [tagged?], [m4_ifval([$5], [yes], [no])])]) -+]) -+ -+ -+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -+# -------------------------------------------------------- -+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) -+ -+ -+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -+# ------------------------------------------------ -+m4_define([lt_decl_tag_varnames], -+[_lt_decl_filter([tagged?], [yes], $@)]) -+ -+ -+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -+# --------------------------------------------------------- -+m4_define([_lt_decl_filter], -+[m4_case([$#], -+ [0], [m4_fatal([$0: too few arguments: $#])], -+ [1], [m4_fatal([$0: too few arguments: $#: $1])], -+ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], -+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], -+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl -+]) -+ -+ -+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -+# -------------------------------------------------- -+m4_define([lt_decl_quote_varnames], -+[_lt_decl_filter([value], [1], $@)]) -+ -+ -+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -+# --------------------------------------------------- -+m4_define([lt_decl_dquote_varnames], -+[_lt_decl_filter([value], [2], $@)]) -+ -+ -+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -+# --------------------------------------------------- -+m4_define([lt_decl_varnames_tagged], -+[m4_assert([$# <= 2])dnl -+_$0(m4_quote(m4_default([$1], [[, ]])), -+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), -+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -+m4_define([_lt_decl_varnames_tagged], -+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) -+ -+ -+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -+# ------------------------------------------------ -+m4_define([lt_decl_all_varnames], -+[_$0(m4_quote(m4_default([$1], [[, ]])), -+ m4_if([$2], [], -+ m4_quote(lt_decl_varnames), -+ m4_quote(m4_shift($@))))[]dnl -+]) -+m4_define([_lt_decl_all_varnames], -+[lt_join($@, lt_decl_varnames_tagged([$1], -+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -+]) -+ -+ -+# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -+# ------------------------------------ -+# Quote a variable value, and forward it to `config.status' so that its -+# declaration there will have the same value as in `configure'. VARNAME -+# must have a single quote delimited value for this to work. -+m4_define([_LT_CONFIG_STATUS_DECLARE], -+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) -+ -+ -+# _LT_CONFIG_STATUS_DECLARATIONS -+# ------------------------------ -+# We delimit libtool config variables with single quotes, so when -+# we write them to config.status, we have to be sure to quote all -+# embedded single quotes properly. In configure, this macro expands -+# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -+# -+# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' -+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), -+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) -+ -+ -+# _LT_LIBTOOL_TAGS -+# ---------------- -+# Output comment and list of tags supported by the script -+m4_defun([_LT_LIBTOOL_TAGS], -+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -+available_tags="_LT_TAGS"dnl -+]) -+ -+ -+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -+# ----------------------------------- -+# Extract the dictionary values for VARNAME (optionally with TAG) and -+# expand to a commented shell variable setting: -+# -+# # Some comment about what VAR is for. -+# visible_name=$lt_internal_name -+m4_define([_LT_LIBTOOL_DECLARE], -+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], -+ [description])))[]dnl -+m4_pushdef([_libtool_name], -+ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), -+ [0], [_libtool_name=[$]$1], -+ [1], [_libtool_name=$lt_[]$1], -+ [2], [_libtool_name=$lt_[]$1], -+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -+]) -+ -+ -+# _LT_LIBTOOL_CONFIG_VARS -+# ----------------------- -+# Produce commented declarations of non-tagged libtool config variables -+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -+# section) are produced by _LT_LIBTOOL_TAG_VARS. -+m4_defun([_LT_LIBTOOL_CONFIG_VARS], -+[m4_foreach([_lt_var], -+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), -+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) -+ -+ -+# _LT_LIBTOOL_TAG_VARS(TAG) -+# ------------------------- -+m4_define([_LT_LIBTOOL_TAG_VARS], -+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), -+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) -+ -+ -+# _LT_TAGVAR(VARNAME, [TAGNAME]) -+# ------------------------------ -+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) -+ -+ -+# _LT_CONFIG_COMMANDS -+# ------------------- -+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -+# variables for single and double quote escaping we saved from calls -+# to _LT_DECL, we can put quote escaped variables declarations -+# into `config.status', and then the shell code to quote escape them in -+# for loops in `config.status'. Finally, any additional code accumulated -+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -+m4_defun([_LT_CONFIG_COMMANDS], -+[AC_PROVIDE_IFELSE([LT_OUTPUT], -+ dnl If the libtool generation code has been placed in $CONFIG_LT, -+ dnl instead of duplicating it all over again into config.status, -+ dnl then we will have config.status run $CONFIG_LT later, so it -+ dnl needs to know what name is stored there: -+ [AC_CONFIG_COMMANDS([libtool], -+ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], -+ dnl If the libtool generation code is destined for config.status, -+ dnl expand the accumulated commands and init code now: -+ [AC_CONFIG_COMMANDS([libtool], -+ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -+])#_LT_CONFIG_COMMANDS -+ -+ -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -+[ -+ -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+sed_quote_subst='$sed_quote_subst' -+double_quote_subst='$double_quote_subst' -+delay_variable_subst='$delay_variable_subst' -+_LT_CONFIG_STATUS_DECLARATIONS -+LTCC='$LTCC' -+LTCFLAGS='$LTCFLAGS' -+compiler='$compiler_DEFAULT' -+ -+# Quote evaled strings. -+for var in lt_decl_all_varnames([[ \ -+]], lt_decl_quote_varnames); do -+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ *[[\\\\\\\`\\"\\\$]]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; -+ esac -+done -+ -+# Double-quote double-evaled strings. -+for var in lt_decl_all_varnames([[ \ -+]], lt_decl_dquote_varnames); do -+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ *[[\\\\\\\`\\"\\\$]]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; -+ esac -+done -+ -+# Fix-up fallback echo if it was mangled by the above quoting rules. -+case \$lt_ECHO in -+*'\\\[$]0 --fallback-echo"')dnl " -+ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` -+ ;; -+esac -+ -+_LT_OUTPUT_LIBTOOL_INIT -+]) -+ -+ -+# LT_OUTPUT -+# --------- -+# This macro allows early generation of the libtool script (before -+# AC_OUTPUT is called), incase it is used in configure for compilation -+# tests. -+AC_DEFUN([LT_OUTPUT], -+[: ${CONFIG_LT=./config.lt} -+AC_MSG_NOTICE([creating $CONFIG_LT]) -+cat >"$CONFIG_LT" <<_LTEOF -+#! $SHELL -+# Generated by $as_me. -+# Run this file to recreate a libtool stub with the current configuration. -+ -+lt_cl_silent=false -+SHELL=\${CONFIG_SHELL-$SHELL} -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<\_LTEOF -+AS_SHELL_SANITIZE -+_AS_PREPARE -+ -+exec AS_MESSAGE_FD>&1 -+exec AS_MESSAGE_LOG_FD>>config.log -+{ -+ echo -+ AS_BOX([Running $as_me.]) -+} >&AS_MESSAGE_LOG_FD -+ -+lt_cl_help="\ -+\`$as_me' creates a local libtool stub from the current configuration, -+for use in further configure time tests before the real libtool is -+generated. -+ -+Usage: $[0] [[OPTIONS]] -+ -+ -h, --help print this help, then exit -+ -V, --version print version number, then exit -+ -q, --quiet do not print progress messages -+ -d, --debug don't remove temporary files -+ -+Report bugs to ." -+ -+lt_cl_version="\ -+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -+configured by $[0], generated by m4_PACKAGE_STRING. -+ -+Copyright (C) 2008 Free Software Foundation, Inc. -+This config.lt script is free software; the Free Software Foundation -+gives unlimited permision to copy, distribute and modify it." -+ -+while test $[#] != 0 -+do -+ case $[1] in -+ --version | --v* | -V ) -+ echo "$lt_cl_version"; exit 0 ;; -+ --help | --h* | -h ) -+ echo "$lt_cl_help"; exit 0 ;; -+ --debug | --d* | -d ) -+ debug=: ;; -+ --quiet | --q* | --silent | --s* | -q ) -+ lt_cl_silent=: ;; -+ -+ -*) AC_MSG_ERROR([unrecognized option: $[1] -+Try \`$[0] --help' for more information.]) ;; -+ -+ *) AC_MSG_ERROR([unrecognized argument: $[1] -+Try \`$[0] --help' for more information.]) ;; -+ esac -+ shift -+done -+ -+if $lt_cl_silent; then -+ exec AS_MESSAGE_FD>/dev/null -+fi -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<_LTEOF -+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<\_LTEOF -+AC_MSG_NOTICE([creating $ofile]) -+_LT_OUTPUT_LIBTOOL_COMMANDS -+AS_EXIT(0) -+_LTEOF -+chmod +x "$CONFIG_LT" -+ -+# configure is writing to config.log, but config.lt does its own redirection, -+# appending to config.log, which fails on DOS, as config.log is still kept -+# open by configure. Here we exec the FD to /dev/null, effectively closing -+# config.log, so it can be properly (re)opened and appended to by config.lt. -+if test "$no_create" != yes; then -+ lt_cl_success=: -+ test "$silent" = yes && -+ lt_config_lt_args="$lt_config_lt_args --quiet" -+ exec AS_MESSAGE_LOG_FD>/dev/null -+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -+ exec AS_MESSAGE_LOG_FD>>config.log -+ $lt_cl_success || AS_EXIT(1) -+fi -+])# LT_OUTPUT -+ -+ -+# _LT_CONFIG(TAG) -+# --------------- -+# If TAG is the built-in tag, create an initial libtool script with a -+# default configuration from the untagged config vars. Otherwise add code -+# to config.status for appending the configuration named by TAG from the -+# matching tagged config vars. -+m4_defun([_LT_CONFIG], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+_LT_CONFIG_SAVE_COMMANDS([ -+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl -+ m4_if(_LT_TAG, [C], [ -+ # See if we are running on zsh, and set the options which allow our -+ # commands through without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ -+ cfgfile="${ofile}T" -+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 -+ $RM "$cfgfile" -+ -+ cat <<_LT_EOF >> "$cfgfile" -+#! $SHELL -+ -+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+# NOTE: Changes made to this file will be lost: look at ltmain.sh. -+# -+_LT_COPYING -+_LT_LIBTOOL_TAGS -+ -+# ### BEGIN LIBTOOL CONFIG -+_LT_LIBTOOL_CONFIG_VARS -+_LT_LIBTOOL_TAG_VARS -+# ### END LIBTOOL CONFIG -+ -+_LT_EOF -+ -+ case $host_os in -+ aix3*) -+ cat <<\_LT_EOF >> "$cfgfile" -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+_LT_EOF -+ ;; -+ esac -+ -+ _LT_PROG_LTMAIN -+ -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) -+ -+ _LT_PROG_XSI_SHELLFNS -+ -+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) -+ -+ mv -f "$cfgfile" "$ofile" || -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+], -+[cat <<_LT_EOF >> "$ofile" -+ -+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -+dnl in a comment (ie after a #). -+# ### BEGIN LIBTOOL TAG CONFIG: $1 -+_LT_LIBTOOL_TAG_VARS(_LT_TAG) -+# ### END LIBTOOL TAG CONFIG: $1 -+_LT_EOF -+])dnl /m4_if -+], -+[m4_if([$1], [], [ -+ PACKAGE='$PACKAGE' -+ VERSION='$VERSION' -+ TIMESTAMP='$TIMESTAMP' -+ RM='$RM' -+ ofile='$ofile'], []) -+])dnl /_LT_CONFIG_SAVE_COMMANDS -+])# _LT_CONFIG -+ -+ -+# LT_SUPPORTED_TAG(TAG) -+# --------------------- -+# Trace this macro to discover what tags are supported by the libtool -+# --tag option, using: -+# autoconf --trace 'LT_SUPPORTED_TAG:$1' -+AC_DEFUN([LT_SUPPORTED_TAG], []) -+ -+ -+# C support is built-in for now -+m4_define([_LT_LANG_C_enabled], []) -+m4_define([_LT_TAGS], []) -+ -+ -+# LT_LANG(LANG) -+# ------------- -+# Enable libtool support for the given language if not already enabled. -+AC_DEFUN([LT_LANG], -+[AC_BEFORE([$0], [LT_OUTPUT])dnl -+m4_case([$1], -+ [C], [_LT_LANG(C)], -+ [C++], [_LT_LANG(CXX)], -+ [Java], [_LT_LANG(GCJ)], -+ [Fortran 77], [_LT_LANG(F77)], -+ [Fortran], [_LT_LANG(FC)], -+ [Windows Resource], [_LT_LANG(RC)], -+ [m4_ifdef([_LT_LANG_]$1[_CONFIG], -+ [_LT_LANG($1)], -+ [m4_fatal([$0: unsupported language: "$1"])])])dnl -+])# LT_LANG -+ -+ -+# _LT_LANG(LANGNAME) -+# ------------------ -+m4_defun([_LT_LANG], -+[m4_ifdef([_LT_LANG_]$1[_enabled], [], -+ [LT_SUPPORTED_TAG([$1])dnl -+ m4_append([_LT_TAGS], [$1 ])dnl -+ m4_define([_LT_LANG_]$1[_enabled], [])dnl -+ _LT_LANG_$1_CONFIG($1)])dnl -+])# _LT_LANG -+ -+ -+# _LT_LANG_DEFAULT_CONFIG -+# ----------------------- -+m4_defun([_LT_LANG_DEFAULT_CONFIG], -+[AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [LT_LANG(CXX)], -+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) -+ -+AC_PROVIDE_IFELSE([AC_PROG_F77], -+ [LT_LANG(F77)], -+ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) -+ -+AC_PROVIDE_IFELSE([AC_PROG_FC], -+ [LT_LANG(FC)], -+ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) -+ -+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -+dnl pulling things in needlessly. -+AC_PROVIDE_IFELSE([AC_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [AC_PROVIDE_IFELSE([LT_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [m4_ifdef([AC_PROG_GCJ], -+ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) -+ m4_ifdef([A][M_PROG_GCJ], -+ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) -+ m4_ifdef([LT_PROG_GCJ], -+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) -+ -+AC_PROVIDE_IFELSE([LT_PROG_RC], -+ [LT_LANG(RC)], -+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -+])# _LT_LANG_DEFAULT_CONFIG -+ -+# Obsolete macros: -+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -+dnl AC_DEFUN([AC_LIBTOOL_F77], []) -+dnl AC_DEFUN([AC_LIBTOOL_FC], []) -+dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -+ -+ -+# _LT_TAG_COMPILER -+# ---------------- -+m4_defun([_LT_TAG_COMPILER], -+[AC_REQUIRE([AC_PROG_CC])dnl -+ -+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+])# _LT_TAG_COMPILER -+ -+ -+# _LT_COMPILER_BOILERPLATE -+# ------------------------ -+# Check for compiler boilerplate output or warnings with -+# the simple compiler test code. -+m4_defun([_LT_COMPILER_BOILERPLATE], -+[m4_require([_LT_DECL_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$RM conftest* -+])# _LT_COMPILER_BOILERPLATE -+ -+ -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+m4_defun([_LT_LINKER_BOILERPLATE], -+[m4_require([_LT_DECL_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$RM -r conftest* -+])# _LT_LINKER_BOILERPLATE -+ -+# _LT_REQUIRED_DARWIN_CHECKS -+# ------------------------- -+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ -+ case $host_os in -+ rhapsody* | darwin*) -+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -+ AC_CHECK_TOOL([LIPO], [lipo], [:]) -+ AC_CHECK_TOOL([OTOOL], [otool], [:]) -+ AC_CHECK_TOOL([OTOOL64], [otool64], [:]) -+ _LT_DECL([], [DSYMUTIL], [1], -+ [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) -+ _LT_DECL([], [NMEDIT], [1], -+ [Tool to change global to local symbols on Mac OS X]) -+ _LT_DECL([], [LIPO], [1], -+ [Tool to manipulate fat objects and archives on Mac OS X]) -+ _LT_DECL([], [OTOOL], [1], -+ [ldd/readelf like tool for Mach-O binaries on Mac OS X]) -+ _LT_DECL([], [OTOOL64], [1], -+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) -+ -+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], -+ [lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ rm -rf libconftest.dylib* -+ echo "int foo(void){return 1;}" > conftest.c -+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err -+ _lt_result=$? -+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then -+ lt_cv_apple_cc_single_mod=yes -+ else -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ fi -+ rm -rf libconftest.dylib* -+ rm -f conftest.* -+ fi]) -+ AC_CACHE_CHECK([for -exported_symbols_list linker flag], -+ [lt_cv_ld_exported_symbols_list], -+ [lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [lt_cv_ld_exported_symbols_list=yes], -+ [lt_cv_ld_exported_symbols_list=no]) -+ LDFLAGS="$save_LDFLAGS" -+ ]) -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) # darwin 5.x on -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[[012]]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil='~$DSYMUTIL $lib || :' -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+]) -+ -+ -+# _LT_DARWIN_LINKER_FEATURES -+# -------------------------- -+# Checks for linker and compiler features on darwin -+m4_defun([_LT_DARWIN_LINKER_FEATURES], -+[ -+ m4_require([_LT_REQUIRED_DARWIN_CHECKS]) -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ case $cc_basename in -+ ifort*) _lt_dar_can_shared=yes ;; -+ *) _lt_dar_can_shared=$GCC ;; -+ esac -+ if test "$_lt_dar_can_shared" = "yes"; then -+ output_verbose_link_cmd=echo -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ m4_if([$1], [CXX], -+[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi -+],[]) -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+]) -+ -+# _LT_SYS_MODULE_PATH_AIX -+# ----------------------- -+# Links a minimal program and checks the executable -+# for the system default hardcoded library path. In most cases, -+# this is /usr/lib:/lib, but when the MPI compilers are used -+# the location of the communication and MPI libs are included too. -+# If we don't find anything, use the default library path according -+# to the aix ld manual. -+m4_defun([_LT_SYS_MODULE_PATH_AIX], -+[m4_require([_LT_DECL_SED])dnl -+AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi],[]) -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+])# _LT_SYS_MODULE_PATH_AIX -+ -+ -+# _LT_SHELL_INIT(ARG) -+# ------------------- -+m4_define([_LT_SHELL_INIT], -+[ifdef([AC_DIVERSION_NOTICE], -+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -+ [AC_DIVERT_PUSH(NOTICE)]) -+$1 -+AC_DIVERT_POP -+])# _LT_SHELL_INIT -+ -+ -+# _LT_PROG_ECHO_BACKSLASH -+# ----------------------- -+# Add some code to the start of the generated configure script which -+# will find an echo command which doesn't interpret backslashes. -+m4_defun([_LT_PROG_ECHO_BACKSLASH], -+[_LT_SHELL_INIT([ -+# Check that we are running under the correct shell. -+SHELL=${CONFIG_SHELL-/bin/sh} -+ -+case X$lt_ECHO in -+X*--fallback-echo) -+ # Remove one level of quotation (which was required for Make). -+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+ ;; -+esac -+ -+ECHO=${lt_ECHO-echo} -+if test "X[$]1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X[$]1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then -+ # Yippee, $ECHO works! -+ : -+else -+ # Restart under the correct shell. -+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -+fi -+ -+if test "X[$]1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat <<_LT_EOF -+[$]* -+_LT_EOF -+ exit 0 -+fi -+ -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+if test -z "$lt_ECHO"; then -+ if test "X${echo_test_string+set}" != Xset; then -+ # find a string as large as possible, as long as the shell can cope with it -+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -+ if { echo_test_string=`eval $cmd`; } 2>/dev/null && -+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null -+ then -+ break -+ fi -+ done -+ fi -+ -+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ : -+ else -+ # The Solaris, AIX, and Digital Unix default echo programs unquote -+ # backslashes. This makes it impossible to quote backslashes using -+ # echo "$something" | sed 's/\\/\\\\/g' -+ # -+ # So, first we look for a working echo in the user's PATH. -+ -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" -+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ ECHO="$dir/echo" -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ -+ if test "X$ECHO" = Xecho; then -+ # We didn't find a better echo, so look for alternatives. -+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # This shell has a builtin print -r that does the trick. -+ ECHO='print -r' -+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && -+ test "X$CONFIG_SHELL" != X/bin/ksh; then -+ # If we have ksh, try running configure again with it. -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ export ORIGINAL_CONFIG_SHELL -+ CONFIG_SHELL=/bin/ksh -+ export CONFIG_SHELL -+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -+ else -+ # Try using printf. -+ ECHO='printf %s\n' -+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # Cool, printf works -+ : -+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -+ export CONFIG_SHELL -+ SHELL="$CONFIG_SHELL" -+ export SHELL -+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -+ else -+ # maybe with a smaller string... -+ prev=: -+ -+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null -+ then -+ break -+ fi -+ prev="$cmd" -+ done -+ -+ if test "$prev" != 'sed 50q "[$]0"'; then -+ echo_test_string=`eval $prev` -+ export echo_test_string -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -+ else -+ # Oops. We lost completely, so just stick with echo. -+ ECHO=echo -+ fi -+ fi -+ fi -+ fi -+ fi -+fi -+ -+# Copy echo and quote the copy suitably for passing to libtool from -+# the Makefile, instead of quoting the original, which is used later. -+lt_ECHO=$ECHO -+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -+ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -+fi -+ -+AC_SUBST(lt_ECHO) -+]) -+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -+_LT_DECL([], [ECHO], [1], -+ [An echo program that does not interpret backslashes]) -+])# _LT_PROG_ECHO_BACKSLASH -+ -+ -+# _LT_ENABLE_LOCK -+# --------------- -+m4_defun([_LT_ENABLE_LOCK], -+[AC_ARG_ENABLE([libtool-lock], -+ [AS_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* -+ ;; -+ -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|s390*-*tpf*|sparc*-*linux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *32-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *64-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*|s390*-*tpf*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -+ [AC_LANG_PUSH(C) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -+ AC_LANG_POP]) -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+esac -+ -+need_locks="$enable_libtool_lock" -+])# _LT_ENABLE_LOCK -+ -+ -+# _LT_CMD_OLD_ARCHIVE -+# ------------------- -+m4_defun([_LT_CMD_OLD_ARCHIVE], -+[AC_CHECK_TOOL(AR, ar, false) -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1]) -+ -+AC_CHECK_TOOL(STRIP, strip, :) -+test -z "$STRIP" && STRIP=: -+_LT_DECL([], [STRIP], [1], [A symbol stripping program]) -+ -+AC_CHECK_TOOL(RANLIB, ranlib, :) -+test -z "$RANLIB" && RANLIB=: -+_LT_DECL([], [RANLIB], [1], -+ [Commands used to install an old-style archive]) -+ -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= -+ -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi -+_LT_DECL([], [old_postinstall_cmds], [2]) -+_LT_DECL([], [old_postuninstall_cmds], [2]) -+_LT_TAGDECL([], [old_archive_cmds], [2], -+ [Commands used to build an old-style archive]) -+])# _LT_CMD_OLD_ARCHIVE -+ -+ -+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------------------- -+# Check whether the given compiler option works -+AC_DEFUN([_LT_COMPILER_OPTION], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_SED])dnl -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$3" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ fi -+ $RM conftest* -+]) -+ -+if test x"[$]$2" = xyes; then -+ m4_if([$5], , :, [$5]) -+else -+ m4_if([$6], , :, [$6]) -+fi -+])# _LT_COMPILER_OPTION -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) -+ -+ -+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------- -+# Check whether the given linker option works -+AC_DEFUN([_LT_LINKER_OPTION], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_SED])dnl -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $3" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&AS_MESSAGE_LOG_FD -+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ else -+ $2=yes -+ fi -+ fi -+ $RM -r conftest* -+ LDFLAGS="$save_LDFLAGS" -+]) -+ -+if test x"[$]$2" = xyes; then -+ m4_if([$4], , :, [$4]) -+else -+ m4_if([$5], , :, [$5]) -+fi -+])# _LT_LINKER_OPTION -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) -+ -+ -+# LT_CMD_MAX_LEN -+#--------------- -+AC_DEFUN([LT_CMD_MAX_LEN], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+# find the maximum length of command line arguments -+AC_MSG_CHECKING([the maximum length of command line arguments]) -+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -+ i=0 -+ teststring="ABCD" -+ -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right -+ ;; -+ -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; -+ ;; -+ -+ cygwin* | mingw* | cegcc*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; -+ -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 -+ ;; -+ -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -+ else -+ lt_cv_sys_max_cmd_len=32768 -+ fi -+ ;; -+ *) -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ else -+ # Make teststring a little bigger before we do anything with it. -+ # a 1K string should be a reasonable start. -+ for i in 1 2 3 4 5 6 7 8 ; do -+ teststring=$teststring$teststring -+ done -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ # If test is not a shell built-in, we'll probably end up computing a -+ # maximum length that is only half of the actual maximum length, but -+ # we can't tell. -+ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ -+ = "XX$teststring$teststring"; } >/dev/null 2>&1 && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ # Only check the string length outside the loop. -+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on -+ # massive amounts of additional arguments before passing them to the -+ # linker. It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ fi -+ ;; -+ esac -+]) -+if test -n $lt_cv_sys_max_cmd_len ; then -+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -+else -+ AC_MSG_RESULT(none) -+fi -+max_cmd_len=$lt_cv_sys_max_cmd_len -+_LT_DECL([], [max_cmd_len], [0], -+ [What is the maximum length of a command?]) -+])# LT_CMD_MAX_LEN -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) -+ -+ -+# _LT_HEADER_DLFCN -+# ---------------- -+m4_defun([_LT_HEADER_DLFCN], -+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -+])# _LT_HEADER_DLFCN -+ -+ -+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -+# ---------------------------------------------------------------- -+m4_defun([_LT_TRY_DLOPEN_SELF], -+[m4_require([_LT_HEADER_DLFCN])dnl -+if test "$cross_compiling" = yes; then : -+ [$4] -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext <<_LT_EOF -+[#line __oline__ "configure" -+#include "confdefs.h" -+ -+#if HAVE_DLFCN_H -+#include -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); -+ -+ return status; -+}] -+_LT_EOF -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) $1 ;; -+ x$lt_dlneed_uscore) $2 ;; -+ x$lt_dlunknown|x*) $3 ;; -+ esac -+ else : -+ # compilation failed -+ $3 -+ fi -+fi -+rm -fr conftest* -+])# _LT_TRY_DLOPEN_SELF -+ -+ -+# LT_SYS_DLOPEN_SELF -+# ------------------ -+AC_DEFUN([LT_SYS_DLOPEN_SELF], -+[m4_require([_LT_HEADER_DLFCN])dnl -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; -+ -+ mingw* | pw32* | cegcc*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ]) -+ ;; -+ -+ *) -+ AC_CHECK_FUNC([shl_load], -+ [lt_cv_dlopen="shl_load"], -+ [AC_CHECK_LIB([dld], [shl_load], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], -+ [AC_CHECK_FUNC([dlopen], -+ [lt_cv_dlopen="dlopen"], -+ [AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -+ [AC_CHECK_LIB([svld], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -+ [AC_CHECK_LIB([dld], [dld_link], -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ;; -+ esac -+ -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi -+ -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" -+ -+ AC_CACHE_CHECK([whether a program can dlopen itself], -+ lt_cv_dlopen_self, [dnl -+ _LT_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) -+ ]) -+ -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -+ lt_cv_dlopen_self_static, [dnl -+ _LT_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -+ ]) -+ fi -+ -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac -+ -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+_LT_DECL([dlopen_support], [enable_dlopen], [0], -+ [Whether dlopen is supported]) -+_LT_DECL([dlopen_self], [enable_dlopen_self], [0], -+ [Whether dlopen of programs is supported]) -+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], -+ [Whether dlopen of statically linked programs is supported]) -+])# LT_SYS_DLOPEN_SELF -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) -+ -+ -+# _LT_COMPILER_C_O([TAGNAME]) -+# --------------------------- -+# Check to see if options -c and -o are simultaneously supported by compiler. -+# This macro does not hard code the compiler like AC_PROG_CC_C_O. -+m4_defun([_LT_COMPILER_C_O], -+[m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_TAG_COMPILER])dnl -+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -+ $RM -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ fi -+ fi -+ chmod u+w . 2>&AS_MESSAGE_LOG_FD -+ $RM conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -+ $RM out/* && rmdir out -+ cd .. -+ $RM -r conftest -+ $RM conftest* -+]) -+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], -+ [Does compiler simultaneously support -c and -o options?]) -+])# _LT_COMPILER_C_O -+ -+ -+# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -+# ---------------------------------- -+# Check to see if we can do hard links to lock some files if needed -+m4_defun([_LT_COMPILER_FILE_LOCKS], -+[m4_require([_LT_ENABLE_LOCK])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+_LT_COMPILER_C_O([$1]) -+ -+hard_links="nottested" -+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ AC_MSG_CHECKING([if we can lock with hard links]) -+ hard_links=yes -+ $RM conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ AC_MSG_RESULT([$hard_links]) -+ if test "$hard_links" = no; then -+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -+])# _LT_COMPILER_FILE_LOCKS -+ -+ -+# _LT_CHECK_OBJDIR -+# ---------------- -+m4_defun([_LT_CHECK_OBJDIR], -+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -+[rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null]) -+objdir=$lt_cv_objdir -+_LT_DECL([], [objdir], [0], -+ [The name of the directory that contains temporary libtool files])dnl -+m4_pattern_allow([LT_OBJDIR])dnl -+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", -+ [Define to the sub-directory in which libtool stores uninstalled libraries.]) -+])# _LT_CHECK_OBJDIR -+ -+ -+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -+# -------------------------------------- -+# Check hardcoding attributes. -+m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -+[AC_MSG_CHECKING([how to hardcode library paths into programs]) -+_LT_TAGVAR(hardcode_action, $1)= -+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || -+ test -n "$_LT_TAGVAR(runpath_var, $1)" || -+ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then -+ -+ # We can hardcode non-existent directories. -+ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && -+ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then -+ # Linking always hardcodes the temporary library directory. -+ _LT_TAGVAR(hardcode_action, $1)=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ _LT_TAGVAR(hardcode_action, $1)=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ _LT_TAGVAR(hardcode_action, $1)=unsupported -+fi -+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -+ -+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || -+ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+_LT_TAGDECL([], [hardcode_action], [0], -+ [How to hardcode a shared library path into an executable]) -+])# _LT_LINKER_HARDCODE_LIBPATH -+ -+ -+# _LT_CMD_STRIPLIB -+# ---------------- -+m4_defun([_LT_CMD_STRIPLIB], -+[m4_require([_LT_DECL_EGREP]) -+striplib= -+old_striplib= -+AC_MSG_CHECKING([whether stripping libraries is possible]) -+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ AC_MSG_RESULT([yes]) -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ old_striplib="$STRIP -S" -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ ;; -+ *) -+ AC_MSG_RESULT([no]) -+ ;; -+ esac -+fi -+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -+_LT_DECL([], [striplib], [1]) -+])# _LT_CMD_STRIPLIB -+ -+ -+# _LT_SYS_DYNAMIC_LINKER([TAG]) -+# ----------------------------- -+# PORTME Fill in your ld.so characteristics -+m4_defun([_LT_SYS_DYNAMIC_LINKER], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_OBJDUMP])dnl -+m4_require([_LT_DECL_SED])dnl -+AC_MSG_CHECKING([dynamic linker characteristics]) -+m4_if([$1], -+ [], [ -+if test "$GCC" = yes; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi]) -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix[[4-9]]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[[01]] | aix4.[[01]].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; -+ -+amigaos*) -+ case $host_cpu in -+ powerpc) -+ # Since July 2007 AmigaOS4 officially supports .so libraries. -+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ ;; -+ m68k) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ esac -+ ;; -+ -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; -+ -+bsdi[[45]]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32* | cegcc*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname~ -+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then -+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; -+ fi' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw* | cegcc*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; -+ -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[[123]]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[[01]]* | freebsdelf3.[[01]]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ -+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+interix[[3-9]]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; -+ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-gnu | kopensolaris*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # Some binutils ld are patched to set DT_RUNPATH -+ save_LDFLAGS=$LDFLAGS -+ save_libdir=$libdir -+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ -+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], -+ [shlibpath_overrides_runpath=yes])]) -+ LDFLAGS=$save_LDFLAGS -+ libdir=$save_libdir -+ -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ fi -+ -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; -+ -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+*nto* | *qnx*) -+ version_type=qnx -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='ldqnx.so' -+ ;; -+ -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[[89]] | openbsd2.[[89]].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; -+ -+rdos*) -+ dynamic_linker=no -+ ;; -+ -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+tpf*) -+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; -+esac -+AC_MSG_RESULT([$dynamic_linker]) -+test "$dynamic_linker" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+fi -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+fi -+ -+_LT_DECL([], [variables_saved_for_relink], [1], -+ [Variables whose values should be saved in libtool wrapper scripts and -+ restored at link time]) -+_LT_DECL([], [need_lib_prefix], [0], -+ [Do we need the "lib" prefix for modules?]) -+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -+_LT_DECL([], [version_type], [0], [Library versioning type]) -+_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -+_LT_DECL([], [shlibpath_overrides_runpath], [0], -+ [Is shlibpath searched before the hard-coded library search path?]) -+_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -+_LT_DECL([], [library_names_spec], [1], -+ [[List of archive names. First name is the real one, the rest are links. -+ The last name is the one that the linker finds with -lNAME]]) -+_LT_DECL([], [soname_spec], [1], -+ [[The coded name of the library, if different from the real name]]) -+_LT_DECL([], [postinstall_cmds], [2], -+ [Command to use after installation of a shared archive]) -+_LT_DECL([], [postuninstall_cmds], [2], -+ [Command to use after uninstallation of a shared archive]) -+_LT_DECL([], [finish_cmds], [2], -+ [Commands used to finish a libtool library installation in a directory]) -+_LT_DECL([], [finish_eval], [1], -+ [[As "finish_cmds", except a single script fragment to be evaled but -+ not shown]]) -+_LT_DECL([], [hardcode_into_libs], [0], -+ [Whether we should hardcode library paths into libraries]) -+_LT_DECL([], [sys_lib_search_path_spec], [2], -+ [Compile-time system search path for libraries]) -+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], -+ [Run-time system search path for libraries]) -+])# _LT_SYS_DYNAMIC_LINKER -+ -+ -+# _LT_PATH_TOOL_PREFIX(TOOL) -+# -------------------------- -+# find a file program which can recognize shared library -+AC_DEFUN([_LT_PATH_TOOL_PREFIX], -+[m4_require([_LT_DECL_EGREP])dnl -+AC_MSG_CHECKING([for $1]) -+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -+[case $MAGIC_CMD in -+[[\\/*] | ?:[\\/]*]) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+dnl $ac_dummy forces splitting on constant user-supplied paths. -+dnl POSIX.2 word splitting is done only on the output of word expansions, -+dnl not every word. This closes a longstanding sh security hole. -+ ac_dummy="m4_if([$2], , $PATH, [$2])" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$1; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/$1" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+_LT_EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac]) -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ AC_MSG_RESULT($MAGIC_CMD) -+else -+ AC_MSG_RESULT(no) -+fi -+_LT_DECL([], [MAGIC_CMD], [0], -+ [Used to examine libraries when file_magic_cmd begins with "file"])dnl -+])# _LT_PATH_TOOL_PREFIX -+ -+# Old name: -+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) -+ -+ -+# _LT_PATH_MAGIC -+# -------------- -+# find a file program which can recognize a shared library -+m4_defun([_LT_PATH_MAGIC], -+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -+if test -z "$lt_cv_path_MAGIC_CMD"; then -+ if test -n "$ac_tool_prefix"; then -+ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) -+ else -+ MAGIC_CMD=: -+ fi -+fi -+])# _LT_PATH_MAGIC -+ -+ -+# LT_PATH_LD -+# ---------- -+# find the pathname to the GNU or non-GNU linker -+AC_DEFUN([LT_PATH_LD], -+[AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_DECL_EGREP])dnl -+ -+AC_ARG_WITH([gnu-ld], -+ [AS_HELP_STRING([--with-gnu-ld], -+ [assume the C compiler uses GNU ld @<:@default=no@:>@])], -+ [test "$withval" = no || with_gnu_ld=yes], -+ [with_gnu_ld=no])dnl -+ -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ AC_MSG_CHECKING([for ld used by $CC]) -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [[\\/]]* | ?:[[\\/]]*) -+ re_direlt='/[[^/]][[^/]]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` -+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ AC_MSG_CHECKING([for GNU ld]) -+else -+ AC_MSG_CHECKING([for non-GNU ld]) -+fi -+AC_CACHE_VAL(lt_cv_path_LD, -+[if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi -+ ;; -+ -+cegcc) -+ # use the weaker test based on 'objdump'. See mingw*. -+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ ;; -+ -+darwin* | rhapsody*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+freebsd* | dragonfly*) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then -+ case $host_cpu in -+ i*86 ) -+ # Not sure whether the presence of OpenBSD here was a mistake. -+ # Let's accept both of them until this is cleared up. -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ ;; -+ esac -+ else -+ lt_cv_deplibs_check_method=pass_all -+ fi -+ ;; -+ -+gnu*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+hpux10.20* | hpux11*) -+ lt_cv_file_magic_cmd=/usr/bin/file -+ case $host_cpu in -+ ia64*) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' -+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -+ ;; -+ hppa*64*) -+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl -+ ;; -+ *) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -+ lt_cv_file_magic_test_file=/usr/lib/libc.sl -+ ;; -+ esac -+ ;; -+ -+interix[[3-9]]*) -+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; -+ esac -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-gnu | kopensolaris*-gnu) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' -+ fi -+ ;; -+ -+newos6*) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=/usr/lib/libnls.so -+ ;; -+ -+*nto* | *qnx*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+openbsd*) -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ fi -+ ;; -+ -+osf3* | osf4* | osf5*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+rdos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+solaris*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+sysv4 | sysv4.3*) -+ case $host_vendor in -+ motorola) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -+ ;; -+ ncr) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ sequent) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -+ ;; -+ sni) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -+ lt_cv_file_magic_test_file=/lib/libc.so -+ ;; -+ siemens) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ pc) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ esac -+ ;; -+ -+tpf*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+esac -+]) -+file_magic_cmd=$lt_cv_file_magic_cmd -+deplibs_check_method=$lt_cv_deplibs_check_method -+test -z "$deplibs_check_method" && deplibs_check_method=unknown -+ -+_LT_DECL([], [deplibs_check_method], [1], -+ [Method to check whether dependent libraries are shared objects]) -+_LT_DECL([], [file_magic_cmd], [1], -+ [Command to use when deplibs_check_method == "file_magic"]) -+])# _LT_CHECK_MAGIC_METHOD -+ -+ -+# LT_PATH_NM -+# ---------- -+# find the pathname to a BSD- or MS-compatible name lister -+AC_DEFUN([LT_PATH_NM], -+[AC_REQUIRE([AC_PROG_CC])dnl -+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -+[if test -n "$NM"; then -+ # Let the user override the test. -+ lt_cv_path_NM="$NM" -+else -+ lt_nm_to_check="${ac_tool_prefix}nm" -+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -+ lt_nm_to_check="$lt_nm_to_check nm" -+ fi -+ for lt_tmp_nm in $lt_nm_to_check; do -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/$lt_tmp_nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -+ */dev/null*) -+ lt_cv_path_NM="$tmp_nm -p" -+ break -+ ;; -+ *) -+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -+ continue # so that we can try to find one that supports BSD flags -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ done -+ IFS="$lt_save_ifs" -+ done -+ : ${lt_cv_path_NM=no} -+fi]) -+if test "$lt_cv_path_NM" != "no"; then -+ NM="$lt_cv_path_NM" -+else -+ # Didn't find any BSD compatible name lister, look for dumpbin. -+ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) -+ AC_SUBST([DUMPBIN]) -+ if test "$DUMPBIN" != ":"; then -+ NM="$DUMPBIN" -+ fi -+fi -+test -z "$NM" && NM=nm -+AC_SUBST([NM]) -+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl -+ -+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], -+ [lt_cv_nm_interface="BSD nm" -+ echo "int some_variable = 0;" > conftest.$ac_ext -+ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$ac_compile" 2>conftest.err) -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) -+ cat conftest.out >&AS_MESSAGE_LOG_FD -+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then -+ lt_cv_nm_interface="MS dumpbin" -+ fi -+ rm -f conftest*]) -+])# LT_PATH_NM -+ -+# Old names: -+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AM_PROG_NM], []) -+dnl AC_DEFUN([AC_PROG_NM], []) -+ -+ -+# LT_LIB_M -+# -------- -+# check for math library -+AC_DEFUN([LT_LIB_M], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+LIBM= -+case $host in -+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+ # These system don't have libm, or don't need it -+ ;; -+*-ncr-sysv4.3*) -+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") -+ ;; -+*) -+ AC_CHECK_LIB(m, cos, LIBM="-lm") -+ ;; -+esac -+AC_SUBST([LIBM]) -+])# LT_LIB_M -+ -+# Old name: -+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_CHECK_LIBM], []) -+ -+ -+# _LT_COMPILER_NO_RTTI([TAGNAME]) -+# ------------------------------- -+m4_defun([_LT_COMPILER_NO_RTTI], -+[m4_require([_LT_TAG_COMPILER])dnl -+ -+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+ -+if test "$GCC" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ -+ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -+ lt_cv_prog_compiler_rtti_exceptions, -+ [-fno-rtti -fno-exceptions], [], -+ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -+fi -+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], -+ [Compiler flag to turn off builtin functions]) -+])# _LT_COMPILER_NO_RTTI -+ -+ -+# _LT_CMD_GLOBAL_SYMBOLS -+# ---------------------- -+m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([LT_PATH_NM])dnl -+AC_REQUIRE([LT_PATH_LD])dnl -+m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_TAG_COMPILER])dnl -+ -+# Check for command to grab the raw symbol name followed by C symbol from nm. -+AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -+[ -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+ -+# Character class describing NM global symbol codes. -+symcode='[[BCDEGRST]]' -+ -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -+ -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[[BCDT]]' -+ ;; -+cygwin* | mingw* | pw32* | cegcc*) -+ symcode='[[ABCDGISTW]]' -+ ;; -+hpux*) -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDEGRST]]' -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[[BCDEGRST]]' -+ ;; -+osf*) -+ symcode='[[BCDEGQRST]]' -+ ;; -+solaris*) -+ symcode='[[BDRT]]' -+ ;; -+sco3.2v5*) -+ symcode='[[DT]]' -+ ;; -+sysv4.2uw2*) -+ symcode='[[DT]]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[[ABDT]]' -+ ;; -+sysv4) -+ symcode='[[DFNSTU]]' -+ ;; -+esac -+ -+# If we're using GNU nm, then use its standard symbol codes. -+case `$NM -V 2>&1` in -+*GNU* | *'with BFD'*) -+ symcode='[[ABCDGIRSTW]]' ;; -+esac -+ -+# Transform an extracted symbol line into a proper C declaration. -+# Some systems (esp. on ia64) link data and code symbols differently, -+# so use this general approach. -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ -+# Transform an extracted symbol line into symbol name and symbol address -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+ -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac -+ -+# Try without a prefix underscore, then with it. -+for ac_symprfx in "" "_"; do -+ -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" -+ -+ # Write the raw and C identifiers. -+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ # Fake it for dumpbin and say T for any non-static function -+ # and D for any global variable. -+ # Also find C++ and __fastcall symbols from MSVC++, -+ # which start with @ or ?. -+ lt_cv_sys_global_symbol_pipe="$AWK ['"\ -+" {last_section=section; section=\$ 3};"\ -+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -+" \$ 0!~/External *\|/{next};"\ -+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -+" {if(hide[section]) next};"\ -+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -+" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -+" ' prfx=^$ac_symprfx]" -+ else -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -+ fi -+ -+ # Check to see that the pipe works correctly. -+ pipe_works=no -+ -+ rm -f conftest* -+ cat > conftest.$ac_ext <<_LT_EOF -+#ifdef __cplusplus -+extern "C" { -+#endif -+char nm_test_var; -+void nm_test_func(void); -+void nm_test_func(void){} -+#ifdef __cplusplus -+} -+#endif -+int main(){nm_test_var='a';nm_test_func();return(0);} -+_LT_EOF -+ -+ if AC_TRY_EVAL(ac_compile); then -+ # Now try to grab the symbols. -+ nlist=conftest.nm -+ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi -+ -+ # Make sure that we snagged all the symbols we need. -+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then -+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then -+ cat <<_LT_EOF > conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+_LT_EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' -+ -+ cat <<_LT_EOF >> conftest.$ac_ext -+ -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ void *address; -+} -+lt__PROGRAM__LTX_preloaded_symbols[[]] = -+{ -+ { "@PROGRAM@", (void *) 0 }, -+_LT_EOF -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext -+ cat <<\_LT_EOF >> conftest.$ac_ext -+ {0, (void *) 0} -+}; -+ -+/* This works around a problem in FreeBSD linker */ -+#ifdef FREEBSD_WORKAROUND -+static const void *lt_preloaded_setup() { -+ return lt__PROGRAM__LTX_preloaded_symbols; -+} -+#endif -+ -+#ifdef __cplusplus -+} -+#endif -+_LT_EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then -+ pipe_works=yes -+ fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" -+ else -+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -+ cat conftest.$ac_ext >&5 -+ fi -+ rm -rf conftest* conftst* -+ -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done -+]) -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ lt_cv_sys_global_symbol_to_cdecl= -+fi -+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -+ AC_MSG_RESULT(failed) -+else -+ AC_MSG_RESULT(ok) -+fi -+ -+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], -+ [Take the output of nm and produce a listing of raw symbols and C names]) -+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -+ [Transform the output of nm in a proper C declaration]) -+_LT_DECL([global_symbol_to_c_name_address], -+ [lt_cv_sys_global_symbol_to_c_name_address], [1], -+ [Transform the output of nm in a C name address pair]) -+_LT_DECL([global_symbol_to_c_name_address_lib_prefix], -+ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], -+ [Transform the output of nm in a C name address pair when lib prefix is needed]) -+]) # _LT_CMD_GLOBAL_SYMBOLS -+ -+ -+# _LT_COMPILER_PIC([TAGNAME]) -+# --------------------------- -+m4_defun([_LT_COMPILER_PIC], -+[m4_require([_LT_TAG_COMPILER])dnl -+_LT_TAGVAR(lt_prog_compiler_wl, $1)= -+_LT_TAGVAR(lt_prog_compiler_pic, $1)= -+_LT_TAGVAR(lt_prog_compiler_static, $1)= -+ -+AC_MSG_CHECKING([for $compiler option to produce PIC]) -+m4_if([$1], [CXX], [ -+ # C++ specific cases for pic, static, wl, etc. -+ if test "$GXX" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ -+ amigaos*) -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ m68k) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ esac -+ ;; -+ -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; -+ *djgpp*) -+ # DJGPP does not support shared libraries at all -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; -+ hpux*) -+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -+ # sets the default TLS model and affects inlining. -+ case $host_cpu in -+ hppa*64*) -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; -+ *qnx* | *nto*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ case $host_os in -+ aix[[4-9]]*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ cxch68*) -+ # Green Hills C++ Compiler -+ # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -+ ;; -+ esac -+ ;; -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD uses GNU C++ -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ if test "$host_cpu" != ia64; then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ fi -+ ;; -+ aCC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? -+ ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ # CC pic flag -KPIC is the default. -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ linux* | k*bsd*-gnu | kopensolaris*-gnu) -+ case $cc_basename in -+ KCC*) -+ # KAI C++ Compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ ecpc* ) -+ # old Intel C++ for x86_64 which still supported -KPIC. -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ icpc* ) -+ # Intel C++, used to be incompatible with GCC. -+ # ICC 10 doesn't accept -KPIC any more. -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ cxx*) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ xlc* | xlC*) -+ # IBM XL 8.0 on PPC -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ lynxos*) -+ ;; -+ m88k*) -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ netbsd* | netbsdelf*-gnu) -+ ;; -+ *qnx* | *nto*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ cxx*) -+ # Digital/Compaq C++ -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ psos*) -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ lcc*) -+ # Lucid -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ vxworks*) -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+], -+[ -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ -+ amigaos*) -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ m68k) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ esac -+ ;; -+ -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; -+ -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; -+ -+ hpux*) -+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -+ # sets the default TLS model and affects inlining. -+ case $host_cpu in -+ hppa*64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; -+ -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ enable_shared=no -+ ;; -+ -+ *nto* | *qnx*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; -+ -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; -+ -+ hpux9* | hpux10* | hpux11*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC (with -KPIC) is the default. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ -+ linux* | k*bsd*-gnu | kopensolaris*-gnu) -+ case $cc_basename in -+ # old Intel for x86_64 which still supported -KPIC. -+ ecc*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ # icc used to be incompatible with GCC. -+ # ICC 10 doesn't accept -KPIC any more. -+ icc* | ifort*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ # Lahey Fortran 8.1. -+ lf95*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ ccc*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All Alpha code is PIC. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ xl*) -+ # IBM XL C 8.0/Fortran 10.1 on PPC -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ -+ newsos6) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ *nto* | *qnx*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All OSF/1 code is PIC. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ -+ rdos*) -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ -+ solaris*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -+ esac -+ ;; -+ -+ sunos4*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ unicos*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ -+ uts4*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ *) -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+]) -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" -+ ;; -+esac -+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then -+ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], -+ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], -+ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in -+ "" | " "*) ;; -+ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; -+ esac], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -+fi -+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], -+ [Additional compiler flags for building library objects]) -+ -+# -+# Check to make sure the static flag actually works. -+# -+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -+ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), -+ $lt_tmp_static_flag, -+ [], -+ [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], -+ [Compiler flag to prevent dynamic linking]) -+])# _LT_COMPILER_PIC -+ -+ -+# _LT_LINKER_SHLIBS([TAGNAME]) -+# ---------------------------- -+# See if the linker supports building shared libraries. -+m4_defun([_LT_LINKER_SHLIBS], -+[AC_REQUIRE([LT_PATH_LD])dnl -+AC_REQUIRE([LT_PATH_NM])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+m4_require([_LT_TAG_COMPILER])dnl -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+m4_if([$1], [CXX], [ -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ case $host_os in -+ aix[[4-9]]*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ fi -+ ;; -+ pw32*) -+ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -+ ;; -+ cygwin* | mingw* | cegcc*) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ linux* | k*bsd*-gnu) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; -+ *) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ esac -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -+], [ -+ runpath_var= -+ _LT_TAGVAR(allow_undefined_flag, $1)= -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(archive_cmds, $1)= -+ _LT_TAGVAR(archive_expsym_cmds, $1)= -+ _LT_TAGVAR(compiler_needs_object, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(hardcode_automatic, $1)=no -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+ _LT_TAGVAR(hardcode_libdir_separator, $1)= -+ _LT_TAGVAR(hardcode_minus_L, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_TAGVAR(inherit_rpath, $1)=no -+ _LT_TAGVAR(link_all_deplibs, $1)=unknown -+ _LT_TAGVAR(module_cmds, $1)= -+ _LT_TAGVAR(module_expsym_cmds, $1)= -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)= -+ _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= -+ _LT_TAGVAR(thread_safe_flag_spec, $1)= -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ _LT_TAGVAR(include_expsyms, $1)= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. -+dnl Note also adjust exclude_expsyms for C++ above. -+ extract_expsyms_cmds= -+ -+ case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ linux* | k*bsd*-gnu) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; -+ esac -+ -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' -+ -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>&1` in -+ *GNU\ gold*) supports_anon_versioning=yes ;; -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix[[3-9]]*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. -+ -+_LT_EOF -+ fi -+ ;; -+ -+ amigaos*) -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='' -+ ;; -+ m68k) -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ cygwin* | mingw* | pw32* | cegcc*) -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ interix[[3-9]]*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) -+ tmp_diet=no -+ if test "$host_os" = linux-dietlibc; then -+ case $cc_basename in -+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) -+ esac -+ fi -+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ -+ && test "$tmp_diet" = no -+ then -+ tmp_addflag= -+ tmp_sharedflag='-shared' -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ lf95*) # Lahey Fortran 8.1 -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ tmp_sharedflag='--shared' ;; -+ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) -+ tmp_sharedflag='-qmkshrobj' -+ tmp_addflag= ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(compiler_needs_object, $1)=yes -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ esac -+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test "x$supports_anon_versioning" = xyes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ -+ case $cc_basename in -+ xlf*) -+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ if test "x$supports_anon_versioning" = xyes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ fi -+ ;; -+ esac -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; -+ -+ solaris*) -+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ sunos4*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *) -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ -+ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then -+ runpath_var= -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ _LT_TAGVAR(hardcode_direct, $1)=unsupported -+ fi -+ ;; -+ -+ aix[[4-9]]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_TAGVAR(archive_cmds, $1)='' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && -+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ _LT_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an -+ # empty executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an -+ # empty executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ amigaos*) -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='' -+ ;; -+ m68k) -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ ;; -+ -+ bsdi[[45]]*) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -+ ;; -+ -+ cygwin* | mingw* | pw32* | cegcc*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ -+ darwin* | rhapsody*) -+ _LT_DARWIN_LINKER_FEATURES($1) -+ ;; -+ -+ dgux*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ freebsd1*) -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ hpux9*) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ fi -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ # Try to use the -exported_symbol ld option, if it does not -+ # work, assume that -exports_file does not work either and -+ # implicitly export all symbols. -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ AC_LINK_IFELSE(int foo(void) {}, -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ ) -+ LDFLAGS="$save_LDFLAGS" -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -+ fi -+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(inherit_rpath, $1)=yes -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ newsos6) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *nto* | *qnx*) -+ ;; -+ -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ else -+ case $host_os in -+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ os2*) -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; -+ -+ osf3*) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ else -+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -+ -+ # Both c and cxx compiler support -rpath directly -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ fi -+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ -+ solaris*) -+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ else -+ case `$CC -V 2>&1` in -+ *"Compilers 5.0"*) -+ wlarc='' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' -+ ;; -+ *) -+ wlarc='${wl}' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ ;; -+ esac -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ fi -+ ;; -+ esac -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ sysv4) -+ case $host_vendor in -+ sni) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ ;; -+ motorola) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ sysv4.3*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ fi -+ ;; -+ -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ uts4*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *) -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ -+ if test x$host_vendor = xsni; then -+ case $host in -+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' -+ ;; -+ esac -+ fi -+ fi -+]) -+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+ -+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld -+ -+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -+_LT_DECL([], [extract_expsyms_cmds], [2], -+ [The commands to extract the exported symbol list from a shared archive]) -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -+x|xyes) -+ # Assume -lc should be added -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $_LT_TAGVAR(archive_cmds, $1) in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -+ $RM conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) -+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) -+ _LT_TAGVAR(allow_undefined_flag, $1)= -+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) -+ then -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ else -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ fi -+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $RM conftest* -+ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) -+ ;; -+ esac -+ fi -+ ;; -+esac -+ -+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], -+ [Whether or not to add -lc for building shared libraries]) -+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], -+ [enable_shared_with_static_runtimes], [0], -+ [Whether or not to disallow shared libs when runtime libs are static]) -+_LT_TAGDECL([], [export_dynamic_flag_spec], [1], -+ [Compiler flag to allow reflexive dlopens]) -+_LT_TAGDECL([], [whole_archive_flag_spec], [1], -+ [Compiler flag to generate shared objects directly from archives]) -+_LT_TAGDECL([], [compiler_needs_object], [1], -+ [Whether the compiler copes with passing no objects directly]) -+_LT_TAGDECL([], [old_archive_from_new_cmds], [2], -+ [Create an old-style archive from a shared archive]) -+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], -+ [Create a temporary old-style archive to link instead of a shared archive]) -+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -+_LT_TAGDECL([], [archive_expsym_cmds], [2]) -+_LT_TAGDECL([], [module_cmds], [2], -+ [Commands used to build a loadable module if different from building -+ a shared archive.]) -+_LT_TAGDECL([], [module_expsym_cmds], [2]) -+_LT_TAGDECL([], [with_gnu_ld], [1], -+ [Whether we are building with GNU ld or not]) -+_LT_TAGDECL([], [allow_undefined_flag], [1], -+ [Flag that allows shared libraries with undefined symbols to be built]) -+_LT_TAGDECL([], [no_undefined_flag], [1], -+ [Flag that enforces no undefined symbols]) -+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], -+ [Flag to hardcode $libdir into a binary during linking. -+ This must work even if $libdir does not exist]) -+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], -+ [[If ld is used when linking, flag to hardcode $libdir into a binary -+ during linking. This must work even if $libdir does not exist]]) -+_LT_TAGDECL([], [hardcode_libdir_separator], [1], -+ [Whether we need a single "-rpath" flag with a separated argument]) -+_LT_TAGDECL([], [hardcode_direct], [0], -+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes -+ DIR into the resulting binary]) -+_LT_TAGDECL([], [hardcode_direct_absolute], [0], -+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes -+ DIR into the resulting binary and the resulting library dependency is -+ "absolute", i.e impossible to change by setting ${shlibpath_var} if the -+ library is relocated]) -+_LT_TAGDECL([], [hardcode_minus_L], [0], -+ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR -+ into the resulting binary]) -+_LT_TAGDECL([], [hardcode_shlibpath_var], [0], -+ [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -+ into the resulting binary]) -+_LT_TAGDECL([], [hardcode_automatic], [0], -+ [Set to "yes" if building a shared library automatically hardcodes DIR -+ into the library and all subsequent libraries and executables linked -+ against it]) -+_LT_TAGDECL([], [inherit_rpath], [0], -+ [Set to yes if linker adds runtime paths of dependent libraries -+ to runtime path list]) -+_LT_TAGDECL([], [link_all_deplibs], [0], -+ [Whether libtool must link a program against all its dependency libraries]) -+_LT_TAGDECL([], [fix_srcfile_path], [1], -+ [Fix the shell variable $srcfile for the compiler]) -+_LT_TAGDECL([], [always_export_symbols], [0], -+ [Set to "yes" if exported symbols are required]) -+_LT_TAGDECL([], [export_symbols_cmds], [2], -+ [The commands to list exported symbols]) -+_LT_TAGDECL([], [exclude_expsyms], [1], -+ [Symbols that should not be listed in the preloaded symbols]) -+_LT_TAGDECL([], [include_expsyms], [1], -+ [Symbols that must always be exported]) -+_LT_TAGDECL([], [prelink_cmds], [2], -+ [Commands necessary for linking programs (against libraries) with templates]) -+_LT_TAGDECL([], [file_list_spec], [1], -+ [Specify filename containing input files]) -+dnl FIXME: Not yet implemented -+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -+dnl [Compiler flag to generate thread safe objects]) -+])# _LT_LINKER_SHLIBS -+ -+ -+# _LT_LANG_C_CONFIG([TAG]) -+# ------------------------ -+# Ensure that the configuration variables for a C compiler are suitably -+# defined. These variables are subsequently used by _LT_CONFIG to write -+# the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_C_CONFIG], -+[m4_require([_LT_DECL_EGREP])dnl -+lt_save_CC="$CC" -+AC_LANG_PUSH(C) -+ -+# Source file extension for C test sources. -+ac_ext=c -+ -+# Object file extension for compiled C test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}' -+ -+_LT_TAG_COMPILER -+# Save the default compiler, since it gets overwritten when the other -+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -+compiler_DEFAULT=$CC -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... -+if test -n "$compiler"; then -+ _LT_COMPILER_NO_RTTI($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ LT_SYS_DLOPEN_SELF -+ _LT_CMD_STRIPLIB -+ -+ # Report which library types will actually be built -+ AC_MSG_CHECKING([if libtool supports shared libraries]) -+ AC_MSG_RESULT([$can_build_shared]) -+ -+ AC_MSG_CHECKING([whether to build shared libraries]) -+ test "$can_build_shared" = "no" && enable_shared=no -+ -+ # On AIX, shared libraries and static libraries use the same namespace, and -+ # are all built from PIC. -+ case $host_os in -+ aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ -+ aix[[4-9]]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+ esac -+ AC_MSG_RESULT([$enable_shared]) -+ -+ AC_MSG_CHECKING([whether to build static libraries]) -+ # Make sure either enable_shared or enable_static is yes. -+ test "$enable_shared" = yes || enable_static=yes -+ AC_MSG_RESULT([$enable_static]) -+ -+ _LT_CONFIG($1) -+fi -+AC_LANG_POP -+CC="$lt_save_CC" -+])# _LT_LANG_C_CONFIG -+ -+ -+# _LT_PROG_CXX -+# ------------ -+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -+# compiler, we have our own version here. -+m4_defun([_LT_PROG_CXX], -+[ -+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -+AC_PROG_CXX -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP -+else -+ _lt_caught_CXX_error=yes -+fi -+popdef([AC_MSG_ERROR]) -+])# _LT_PROG_CXX -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([_LT_PROG_CXX], []) -+ -+ -+# _LT_LANG_CXX_CONFIG([TAG]) -+# -------------------------- -+# Ensure that the configuration variables for a C++ compiler are suitably -+# defined. These variables are subsequently used by _LT_CONFIG to write -+# the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_CXX_CONFIG], -+[AC_REQUIRE([_LT_PROG_CXX])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_EGREP])dnl -+ -+AC_LANG_PUSH(C++) -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_TAGVAR(allow_undefined_flag, $1)= -+_LT_TAGVAR(always_export_symbols, $1)=no -+_LT_TAGVAR(archive_expsym_cmds, $1)= -+_LT_TAGVAR(compiler_needs_object, $1)=no -+_LT_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_TAGVAR(hardcode_direct, $1)=no -+_LT_TAGVAR(hardcode_direct_absolute, $1)=no -+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_TAGVAR(hardcode_minus_L, $1)=no -+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+_LT_TAGVAR(hardcode_automatic, $1)=no -+_LT_TAGVAR(inherit_rpath, $1)=no -+_LT_TAGVAR(module_cmds, $1)= -+_LT_TAGVAR(module_expsym_cmds, $1)= -+_LT_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(no_undefined_flag, $1)= -+_LT_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Source file extension for C++ test sources. -+ac_ext=cpp -+ -+# Object file extension for compiled C++ test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# No sense in running all these tests if we already determined that -+# the CXX compiler isn't working. Some variables (like enable_shared) -+# are currently assumed to apply to all compilers on this platform, -+# and will be corrupted by setting them based on a non-working compiler. -+if test "$_lt_caught_CXX_error" != yes; then -+ # Code to be used in simple compile tests -+ lt_simple_compile_test_code="int some_variable = 0;" -+ -+ # Code to be used in simple link tests -+ lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' -+ -+ # ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ _LT_TAG_COMPILER -+ -+ # save warnings/boilerplate of simple test code -+ _LT_COMPILER_BOILERPLATE -+ _LT_LINKER_BOILERPLATE -+ -+ # Allow CC to be a program name with arguments. -+ lt_save_CC=$CC -+ lt_save_LD=$LD -+ lt_save_GCC=$GCC -+ GCC=$GXX -+ lt_save_with_gnu_ld=$with_gnu_ld -+ lt_save_path_LD=$lt_cv_path_LD -+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -+ else -+ $as_unset lt_cv_prog_gnu_ld -+ fi -+ if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+ else -+ $as_unset lt_cv_path_LD -+ fi -+ test -z "${LDCXX+set}" || LD=$LDCXX -+ CC=${CXX-"c++"} -+ compiler=$CC -+ _LT_TAGVAR(compiler, $1)=$CC -+ _LT_CC_BASENAME([$compiler]) -+ -+ if test -n "$compiler"; then -+ # We don't want -fno-exception when compiling C++ code, so set the -+ # no_builtin_flag separately -+ if test "$GXX" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ else -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+ fi -+ -+ if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration -+ -+ LT_PATH_LD -+ -+ # Check if GNU C++ uses GNU ld as the underlying linker, since the -+ # archiving commands below assume that GNU ld is being used. -+ if test "$with_gnu_ld" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' -+ -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | -+ $GREP 'no-whole-archive' > /dev/null; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ with_gnu_ld=no -+ wlarc= -+ -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ fi -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ -+ else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= -+ fi -+ -+ # PORTME: fill in a description of your system's C++ link characteristics -+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ case $host_os in -+ aix3*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aix[[4-9]]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_TAGVAR(archive_cmds, $1)='' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -+ -+ if test "$GXX" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && -+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ _LT_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to -+ # export. -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty -+ # executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an -+ # empty executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared -+ # libraries. -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ cygwin* | mingw* | pw32* | cegcc*) -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ _LT_DARWIN_LINKER_FEATURES($1) -+ ;; -+ -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ freebsd[[12]]*) -+ # C++ shared libraries reported to be fairly broken before -+ # switch to ELF -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ freebsd-elf*) -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ ;; -+ -+ freebsd* | dragonfly*) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ ;; -+ -+ gnu*) -+ ;; -+ -+ hpux9*) -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ ;; -+ *) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ esac -+ fi -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ interix[[3-9]]*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # SGI C++ -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' -+ fi -+ fi -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ esac -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(inherit_rpath, $1)=yes -+ ;; -+ -+ linux* | k*bsd*-gnu | kopensolaris*-gnu) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc* | ecpc* ) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ case `$CC -V` in -+ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) -+ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $RANLIB $oldlib' -+ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ ;; -+ *) # Version 6 will use weak symbols -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ ;; -+ esac -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ -+ runpath_var=LD_RUN_PATH -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ xl*) -+ # IBM XL 8.0 on PPC, with GNU ld -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ if test "x$supports_anon_versioning" = xyes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(compiler_needs_object, $1)=yes -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ -+ lynxos*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ m88k*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -+ wlarc= -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ fi -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; -+ -+ *nto* | *qnx*) -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ ;; -+ -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd=echo -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Archives containing C++ object files must be created using -+ # the KAI C++ compiler. -+ case $host in -+ osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; -+ *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; -+ esac -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ cxx*) -+ case $host in -+ osf3*) -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ ;; -+ *) -+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $RM $lib.exp' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ ;; -+ esac -+ -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ case $host in -+ osf3*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ ;; -+ esac -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ psos*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ lcc*) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes -+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ ;; -+ esac -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ -+ # The C++ compiler must be used to create the archive. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ fi -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ ;; -+ -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ -+ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -+ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+ -+ _LT_TAGVAR(GCC, $1)="$GXX" -+ _LT_TAGVAR(LD, $1)="$LD" -+ -+ ## CAVEAT EMPTOR: -+ ## There is no encapsulation within the following macros, do not change -+ ## the running order or otherwise move them around unless you know exactly -+ ## what you are doing... -+ _LT_SYS_HIDDEN_LIBDEPS($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+ fi # test -n "$compiler" -+ -+ CC=$lt_save_CC -+ LDCXX=$LD -+ LD=$lt_save_LD -+ GCC=$lt_save_GCC -+ with_gnu_ld=$lt_save_with_gnu_ld -+ lt_cv_path_LDCXX=$lt_cv_path_LD -+ lt_cv_path_LD=$lt_save_path_LD -+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+fi # test "$_lt_caught_CXX_error" != yes -+ -+AC_LANG_POP -+])# _LT_LANG_CXX_CONFIG -+ -+ -+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -+# --------------------------------- -+# Figure out "hidden" library dependencies from verbose -+# compiler output when linking a shared library. -+# Parse the compiler output and extract the necessary -+# objects, libraries and library flags. -+m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+# Dependencies to place before and after the object being linked: -+_LT_TAGVAR(predep_objects, $1)= -+_LT_TAGVAR(postdep_objects, $1)= -+_LT_TAGVAR(predeps, $1)= -+_LT_TAGVAR(postdeps, $1)= -+_LT_TAGVAR(compiler_lib_search_path, $1)= -+ -+dnl we can't use the lt_simple_compile_test_code here, -+dnl because it contains code intended for an executable, -+dnl not a library. It's possible we should let each -+dnl tag define a new lt_????_link_test_code variable, -+dnl but it's only used here... -+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -+int a; -+void foo (void) { a = 0; } -+_LT_EOF -+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -+class Foo -+{ -+public: -+ Foo (void) { a = 0; } -+private: -+ int a; -+}; -+_LT_EOF -+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF -+ subroutine foo -+ implicit none -+ integer*4 a -+ a=0 -+ return -+ end -+_LT_EOF -+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF -+ subroutine foo -+ implicit none -+ integer a -+ a=0 -+ return -+ end -+_LT_EOF -+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -+public class foo { -+ private int a; -+ public void bar (void) { -+ a = 0; -+ } -+}; -+_LT_EOF -+]) -+dnl Parse the compiler output and extract the necessary -+dnl objects, libraries and library flags. -+if AC_TRY_EVAL(ac_compile); then -+ # Parse the compiler output and extract the necessary -+ # objects, libraries and library flags. -+ -+ # Sentinel used to keep track of whether or not we are before -+ # the conftest object file. -+ pre_test_object_deps_done=no -+ -+ for p in `eval "$output_verbose_link_cmd"`; do -+ case $p in -+ -+ -L* | -R* | -l*) -+ # Some compilers place space between "-{L,R}" and the path. -+ # Remove the space. -+ if test $p = "-L" || -+ test $p = "-R"; then -+ prev=$p -+ continue -+ else -+ prev= -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ case $p in -+ -L* | -R*) -+ # Internal compiler library paths should come after those -+ # provided the user. The postdeps already come after the -+ # user supplied libs so there is no need to process them. -+ if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then -+ _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" -+ else -+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" -+ fi -+ ;; -+ # The "-l" case would never come before the object being -+ # linked, so don't bother handling this case. -+ esac -+ else -+ if test -z "$_LT_TAGVAR(postdeps, $1)"; then -+ _LT_TAGVAR(postdeps, $1)="${prev}${p}" -+ else -+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" -+ fi -+ fi -+ ;; -+ -+ *.$objext) -+ # This assumes that the test object file only shows up -+ # once in the compiler output. -+ if test "$p" = "conftest.$objext"; then -+ pre_test_object_deps_done=yes -+ continue -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then -+ _LT_TAGVAR(predep_objects, $1)="$p" -+ else -+ _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" -+ fi -+ else -+ if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then -+ _LT_TAGVAR(postdep_objects, $1)="$p" -+ else -+ _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" -+ fi -+ fi -+ ;; -+ -+ *) ;; # Ignore the rest. -+ -+ esac -+ done -+ -+ # Clean up. -+ rm -f a.out a.exe -+else -+ echo "libtool.m4: error: problem compiling $1 test program" -+fi -+ -+$RM -f confest.$objext -+ -+# PORTME: override above test on systems where it is broken -+m4_if([$1], [CXX], -+[case $host_os in -+interix[[3-9]]*) -+ # Interix 3.5 installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ _LT_TAGVAR(predep_objects,$1)= -+ _LT_TAGVAR(postdep_objects,$1)= -+ _LT_TAGVAR(postdeps,$1)= -+ ;; -+ -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ -+solaris*) -+ case $cc_basename in -+ CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ -+ # Adding this requires a known-good setup of shared libraries for -+ # Sun compiler versions before 5.6, else PIC objects from an old -+ # archive will be linked into the output, leading to subtle bugs. -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+]) -+ -+case " $_LT_TAGVAR(postdeps, $1) " in -+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -+esac -+ _LT_TAGVAR(compiler_lib_search_dirs, $1)= -+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then -+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+_LT_TAGDECL([], [compiler_lib_search_dirs], [1], -+ [The directories searched by this compiler when creating a shared library]) -+_LT_TAGDECL([], [predep_objects], [1], -+ [Dependencies to place before and after the objects being linked to -+ create a shared library]) -+_LT_TAGDECL([], [postdep_objects], [1]) -+_LT_TAGDECL([], [predeps], [1]) -+_LT_TAGDECL([], [postdeps], [1]) -+_LT_TAGDECL([], [compiler_lib_search_path], [1], -+ [The library search path used internally by the compiler when linking -+ a shared library]) -+])# _LT_SYS_HIDDEN_LIBDEPS -+ -+ -+# _LT_PROG_F77 -+# ------------ -+# Since AC_PROG_F77 is broken, in that it returns the empty string -+# if there is no fortran compiler, we have our own version here. -+m4_defun([_LT_PROG_F77], -+[ -+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -+AC_PROG_F77 -+if test -z "$F77" || test "X$F77" = "Xno"; then -+ _lt_disable_F77=yes -+fi -+popdef([AC_MSG_ERROR]) -+])# _LT_PROG_F77 -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([_LT_PROG_F77], []) -+ -+ -+# _LT_LANG_F77_CONFIG([TAG]) -+# -------------------------- -+# Ensure that the configuration variables for a Fortran 77 compiler are -+# suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_F77_CONFIG], -+[AC_REQUIRE([_LT_PROG_F77])dnl -+AC_LANG_PUSH(Fortran 77) -+ -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_TAGVAR(allow_undefined_flag, $1)= -+_LT_TAGVAR(always_export_symbols, $1)=no -+_LT_TAGVAR(archive_expsym_cmds, $1)= -+_LT_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_TAGVAR(hardcode_direct, $1)=no -+_LT_TAGVAR(hardcode_direct_absolute, $1)=no -+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_TAGVAR(hardcode_minus_L, $1)=no -+_LT_TAGVAR(hardcode_automatic, $1)=no -+_LT_TAGVAR(inherit_rpath, $1)=no -+_LT_TAGVAR(module_cmds, $1)= -+_LT_TAGVAR(module_expsym_cmds, $1)= -+_LT_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(no_undefined_flag, $1)= -+_LT_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Source file extension for f77 test sources. -+ac_ext=f -+ -+# Object file extension for compiled f77 test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# No sense in running all these tests if we already determined that -+# the F77 compiler isn't working. Some variables (like enable_shared) -+# are currently assumed to apply to all compilers on this platform, -+# and will be corrupted by setting them based on a non-working compiler. -+if test "$_lt_disable_F77" != yes; then -+ # Code to be used in simple compile tests -+ lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" -+ -+ # Code to be used in simple link tests -+ lt_simple_link_test_code="\ -+ program t -+ end -+" -+ -+ # ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ _LT_TAG_COMPILER -+ -+ # save warnings/boilerplate of simple test code -+ _LT_COMPILER_BOILERPLATE -+ _LT_LINKER_BOILERPLATE -+ -+ # Allow CC to be a program name with arguments. -+ lt_save_CC="$CC" -+ lt_save_GCC=$GCC -+ CC=${F77-"f77"} -+ compiler=$CC -+ _LT_TAGVAR(compiler, $1)=$CC -+ _LT_CC_BASENAME([$compiler]) -+ GCC=$G77 -+ if test -n "$compiler"; then -+ AC_MSG_CHECKING([if libtool supports shared libraries]) -+ AC_MSG_RESULT([$can_build_shared]) -+ -+ AC_MSG_CHECKING([whether to build shared libraries]) -+ test "$can_build_shared" = "no" && enable_shared=no -+ -+ # On AIX, shared libraries and static libraries use the same namespace, and -+ # are all built from PIC. -+ case $host_os in -+ aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ aix[[4-9]]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+ esac -+ AC_MSG_RESULT([$enable_shared]) -+ -+ AC_MSG_CHECKING([whether to build static libraries]) -+ # Make sure either enable_shared or enable_static is yes. -+ test "$enable_shared" = yes || enable_static=yes -+ AC_MSG_RESULT([$enable_static]) -+ -+ _LT_TAGVAR(GCC, $1)="$G77" -+ _LT_TAGVAR(LD, $1)="$LD" -+ -+ ## CAVEAT EMPTOR: -+ ## There is no encapsulation within the following macros, do not change -+ ## the running order or otherwise move them around unless you know exactly -+ ## what you are doing... -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+ fi # test -n "$compiler" -+ -+ GCC=$lt_save_GCC -+ CC="$lt_save_CC" -+fi # test "$_lt_disable_F77" != yes -+ -+AC_LANG_POP -+])# _LT_LANG_F77_CONFIG -+ -+ -+# _LT_PROG_FC -+# ----------- -+# Since AC_PROG_FC is broken, in that it returns the empty string -+# if there is no fortran compiler, we have our own version here. -+m4_defun([_LT_PROG_FC], -+[ -+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -+AC_PROG_FC -+if test -z "$FC" || test "X$FC" = "Xno"; then -+ _lt_disable_FC=yes -+fi -+popdef([AC_MSG_ERROR]) -+])# _LT_PROG_FC -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([_LT_PROG_FC], []) -+ -+ -+# _LT_LANG_FC_CONFIG([TAG]) -+# ------------------------- -+# Ensure that the configuration variables for a Fortran compiler are -+# suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_FC_CONFIG], -+[AC_REQUIRE([_LT_PROG_FC])dnl -+AC_LANG_PUSH(Fortran) -+ -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_TAGVAR(allow_undefined_flag, $1)= -+_LT_TAGVAR(always_export_symbols, $1)=no -+_LT_TAGVAR(archive_expsym_cmds, $1)= -+_LT_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_TAGVAR(hardcode_direct, $1)=no -+_LT_TAGVAR(hardcode_direct_absolute, $1)=no -+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_TAGVAR(hardcode_minus_L, $1)=no -+_LT_TAGVAR(hardcode_automatic, $1)=no -+_LT_TAGVAR(inherit_rpath, $1)=no -+_LT_TAGVAR(module_cmds, $1)= -+_LT_TAGVAR(module_expsym_cmds, $1)= -+_LT_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(no_undefined_flag, $1)= -+_LT_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Source file extension for fc test sources. -+ac_ext=${ac_fc_srcext-f} -+ -+# Object file extension for compiled fc test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# No sense in running all these tests if we already determined that -+# the FC compiler isn't working. Some variables (like enable_shared) -+# are currently assumed to apply to all compilers on this platform, -+# and will be corrupted by setting them based on a non-working compiler. -+if test "$_lt_disable_FC" != yes; then -+ # Code to be used in simple compile tests -+ lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" -+ -+ # Code to be used in simple link tests -+ lt_simple_link_test_code="\ -+ program t -+ end -+" -+ -+ # ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ _LT_TAG_COMPILER -+ -+ # save warnings/boilerplate of simple test code -+ _LT_COMPILER_BOILERPLATE -+ _LT_LINKER_BOILERPLATE -+ -+ # Allow CC to be a program name with arguments. -+ lt_save_CC="$CC" -+ lt_save_GCC=$GCC -+ CC=${FC-"f95"} -+ compiler=$CC -+ GCC=$ac_cv_fc_compiler_gnu -+ -+ _LT_TAGVAR(compiler, $1)=$CC -+ _LT_CC_BASENAME([$compiler]) -+ -+ if test -n "$compiler"; then -+ AC_MSG_CHECKING([if libtool supports shared libraries]) -+ AC_MSG_RESULT([$can_build_shared]) -+ -+ AC_MSG_CHECKING([whether to build shared libraries]) -+ test "$can_build_shared" = "no" && enable_shared=no -+ -+ # On AIX, shared libraries and static libraries use the same namespace, and -+ # are all built from PIC. -+ case $host_os in -+ aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ aix[[4-9]]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+ esac -+ AC_MSG_RESULT([$enable_shared]) -+ -+ AC_MSG_CHECKING([whether to build static libraries]) -+ # Make sure either enable_shared or enable_static is yes. -+ test "$enable_shared" = yes || enable_static=yes -+ AC_MSG_RESULT([$enable_static]) -+ -+ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" -+ _LT_TAGVAR(LD, $1)="$LD" -+ -+ ## CAVEAT EMPTOR: -+ ## There is no encapsulation within the following macros, do not change -+ ## the running order or otherwise move them around unless you know exactly -+ ## what you are doing... -+ _LT_SYS_HIDDEN_LIBDEPS($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+ fi # test -n "$compiler" -+ -+ GCC=$lt_save_GCC -+ CC="$lt_save_CC" -+fi # test "$_lt_disable_FC" != yes -+ -+AC_LANG_POP -+])# _LT_LANG_FC_CONFIG -+ -+ -+# _LT_LANG_GCJ_CONFIG([TAG]) -+# -------------------------- -+# Ensure that the configuration variables for the GNU Java Compiler compiler -+# are suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_GCJ_CONFIG], -+[AC_REQUIRE([LT_PROG_GCJ])dnl -+AC_LANG_SAVE -+ -+# Source file extension for Java test sources. -+ac_ext=java -+ -+# Object file extension for compiled Java test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="class foo {}" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_TAG_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+lt_save_GCC=$GCC -+GCC=yes -+CC=${GCJ-"gcj"} -+compiler=$CC -+_LT_TAGVAR(compiler, $1)=$CC -+_LT_TAGVAR(LD, $1)="$LD" -+_LT_CC_BASENAME([$compiler]) -+ -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+ -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... -+if test -n "$compiler"; then -+ _LT_COMPILER_NO_RTTI($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+fi -+ -+AC_LANG_RESTORE -+ -+GCC=$lt_save_GCC -+CC="$lt_save_CC" -+])# _LT_LANG_GCJ_CONFIG -+ -+ -+# _LT_LANG_RC_CONFIG([TAG]) -+# ------------------------- -+# Ensure that the configuration variables for the Windows resource compiler -+# are suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_RC_CONFIG], -+[AC_REQUIRE([LT_PROG_RC])dnl -+AC_LANG_SAVE -+ -+# Source file extension for RC test sources. -+ac_ext=rc -+ -+# Object file extension for compiled RC test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code="$lt_simple_compile_test_code" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_TAG_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+lt_save_GCC=$GCC -+GCC= -+CC=${RC-"windres"} -+compiler=$CC -+_LT_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ -+if test -n "$compiler"; then -+ : -+ _LT_CONFIG($1) -+fi -+ -+GCC=$lt_save_GCC -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# _LT_LANG_RC_CONFIG -+ -+ -+# LT_PROG_GCJ -+# ----------- -+AC_DEFUN([LT_PROG_GCJ], -+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], -+ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], -+ [AC_CHECK_TOOL(GCJ, gcj,) -+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -+ AC_SUBST(GCJFLAGS)])])[]dnl -+]) -+ -+# Old name: -+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([LT_AC_PROG_GCJ], []) -+ -+ -+# LT_PROG_RC -+# ---------- -+AC_DEFUN([LT_PROG_RC], -+[AC_CHECK_TOOL(RC, windres,) -+]) -+ -+# Old name: -+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([LT_AC_PROG_RC], []) -+ -+ -+# _LT_DECL_EGREP -+# -------------- -+# If we don't have a new enough Autoconf to choose the best grep -+# available, choose the one first in the user's PATH. -+m4_defun([_LT_DECL_EGREP], -+[AC_REQUIRE([AC_PROG_EGREP])dnl -+AC_REQUIRE([AC_PROG_FGREP])dnl -+test -z "$GREP" && GREP=grep -+_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -+_LT_DECL([], [EGREP], [1], [An ERE matcher]) -+_LT_DECL([], [FGREP], [1], [A literal string matcher]) -+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -+AC_SUBST([GREP]) -+]) -+ -+ -+# _LT_DECL_OBJDUMP -+# -------------- -+# If we don't have a new enough Autoconf to choose the best objdump -+# available, choose the one first in the user's PATH. -+m4_defun([_LT_DECL_OBJDUMP], -+[AC_CHECK_TOOL(OBJDUMP, objdump, false) -+test -z "$OBJDUMP" && OBJDUMP=objdump -+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -+AC_SUBST([OBJDUMP]) -+]) -+ -+ -+# _LT_DECL_SED -+# ------------ -+# Check for a fully-functional sed program, that truncates -+# as few characters as possible. Prefer GNU sed if found. -+m4_defun([_LT_DECL_SED], -+[AC_PROG_SED -+test -z "$SED" && SED=sed -+Xsed="$SED -e 1s/^X//" -+_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], -+ [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -+])# _LT_DECL_SED -+ -+m4_ifndef([AC_PROG_SED], [ -+############################################################ -+# NOTE: This macro has been submitted for inclusion into # -+# GNU Autoconf as AC_PROG_SED. When it is available in # -+# a released version of Autoconf we should remove this # -+# macro and use it instead. # -+############################################################ -+ -+m4_defun([AC_PROG_SED], -+[AC_MSG_CHECKING([for a sed that does not truncate output]) -+AC_CACHE_VAL(lt_cv_path_SED, -+[# Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for lt_ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -+ fi -+ done -+ done -+done -+IFS=$as_save_IFS -+lt_ac_max=0 -+lt_ac_count=0 -+# Add /usr/xpg4/bin/sed as it is typically found on Solaris -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && continue -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break -+ fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done -+]) -+SED=$lt_cv_path_SED -+AC_SUBST([SED]) -+AC_MSG_RESULT([$SED]) -+])#AC_PROG_SED -+])#m4_ifndef -+ -+# Old name: -+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([LT_AC_PROG_SED], []) -+ -+ -+# _LT_CHECK_SHELL_FEATURES -+# ------------------------ -+# Find out whether the shell is Bourne or XSI compatible, -+# or has some other useful features. -+m4_defun([_LT_CHECK_SHELL_FEATURES], -+[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -+# Try some XSI features -+xsi_shell=no -+( _lt_dummy="a/b/c" -+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,, \ -+ && eval 'test $(( 1 + 1 )) -eq 2 \ -+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ -+ && xsi_shell=yes -+AC_MSG_RESULT([$xsi_shell]) -+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) -+ -+AC_MSG_CHECKING([whether the shell understands "+="]) -+lt_shell_append=no -+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ -+ >/dev/null 2>&1 \ -+ && lt_shell_append=yes -+AC_MSG_RESULT([$lt_shell_append]) -+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) -+ -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ lt_unset=unset -+else -+ lt_unset=false -+fi -+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl -+ -+# test EBCDIC or ASCII -+case `echo X|tr X '\101'` in -+ A) # ASCII based system -+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr -+ lt_SP2NL='tr \040 \012' -+ lt_NL2SP='tr \015\012 \040\040' -+ ;; -+ *) # EBCDIC based system -+ lt_SP2NL='tr \100 \n' -+ lt_NL2SP='tr \r\n \100\100' -+ ;; -+esac -+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -+])# _LT_CHECK_SHELL_FEATURES -+ -+ -+# _LT_PROG_XSI_SHELLFNS -+# --------------------- -+# Bourne and XSI compatible variants of some useful shell functions. -+m4_defun([_LT_PROG_XSI_SHELLFNS], -+[case $xsi_shell in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+} -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result="${1##*/}" -+} -+ -+# func_dirname_and_basename file append nondir_replacement -+# perform func_basename and func_dirname in a single function -+# call: -+# dirname: Compute the dirname of FILE. If nonempty, -+# add APPEND to the result, otherwise set result -+# to NONDIR_REPLACEMENT. -+# value returned in "$func_dirname_result" -+# basename: Compute filename of FILE. -+# value retuned in "$func_basename_result" -+# Implementation must be kept synchronized with func_dirname -+# and func_basename. For efficiency, we do not delegate to -+# those functions but instead duplicate the functionality here. -+func_dirname_and_basename () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}" -+} -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+func_stripname () -+{ -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"} -+} -+ -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=${1%%=*} -+ func_opt_split_arg=${1#*=} -+} -+ -+# func_lo2o object -+func_lo2o () -+{ -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac -+} -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=${1%.*}.lo -+} -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=$(( $[*] )) -+} -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=${#1} -+} -+ -+_LT_EOF -+ ;; -+ *) # Bourne compatible functions. -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -+} -+ -+dnl func_dirname_and_basename -+dnl A portable version of this function is already defined in general.m4sh -+dnl so there is no need for it here. -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "X${3}" \ -+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "X${3}" \ -+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -+ esac -+} -+ -+# sed scripts: -+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -+my_sed_long_arg='1s/^-[[^=]]*=//' -+ -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -+} -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -+} -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` -+} -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "$[@]"` -+} -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -+} -+ -+_LT_EOF -+esac -+ -+case $lt_shell_append in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$[1]+=\$[2]" -+} -+_LT_EOF -+ ;; -+ *) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$[1]=\$$[1]\$[2]" -+} -+ -+_LT_EOF -+ ;; -+ esac -+]) ---- /dev/null -+++ freeciv-2.3.0/m4/ltversion.m4 -@@ -0,0 +1,23 @@ -+# ltversion.m4 -- version numbers -*- Autoconf -*- -+# -+# Copyright (C) 2004 Free Software Foundation, Inc. -+# Written by Scott James Remnant, 2004 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+# Generated from ltversion.in. -+ -+# serial 3017 ltversion.m4 -+# This file is part of GNU Libtool -+ -+m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -+m4_define([LT_PACKAGE_REVISION], [1.3017]) -+ -+AC_DEFUN([LTVERSION_VERSION], -+[macro_version='2.2.6b' -+macro_revision='1.3017' -+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -+_LT_DECL(, macro_revision, 0) -+]) diff -Nru freeciv-2.3.0/debian/patches/include-libtoolize-added-m4-files.diff freeciv-2.3.1/debian/patches/include-libtoolize-added-m4-files.diff --- freeciv-2.3.0/debian/patches/include-libtoolize-added-m4-files.diff 1970-01-01 00:00:00.000000000 +0000 +++ freeciv-2.3.1/debian/patches/include-libtoolize-added-m4-files.diff 2012-01-10 01:55:47.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Add in the m4 files libtoolize will include + These files are installed by libtoolize, so don't exist before + dh-autoreconf runs. +Author: Karl Goetz +Forwarded: not-needed +Last-Update: <2012-01-01> + +--- freeciv-2.3.1.orig/aclocal.m4 ++++ freeciv-2.3.1/aclocal.m4 +@@ -8960,7 +8960,12 @@ m4_include([m4/iconv.m4]) + m4_include([m4/lib-ld.m4]) + m4_include([m4/lib-link.m4]) + m4_include([m4/lib-prefix.m4]) ++m4_include([m4/libtool.m4]) + m4_include([m4/locale.m4]) ++m4_include([m4/ltoptions.m4]) ++m4_include([m4/ltsugar.m4]) ++m4_include([m4/ltversion.m4]) ++m4_include([m4/lt~obsolete.m4]) + m4_include([m4/ngettext.m4]) + m4_include([m4/no-client.m4]) + m4_include([m4/pkg.m4]) diff -Nru freeciv-2.3.0/debian/patches/libtool-mismatch.diff freeciv-2.3.1/debian/patches/libtool-mismatch.diff --- freeciv-2.3.0/debian/patches/libtool-mismatch.diff 2011-08-29 02:41:05.000000000 +0000 +++ freeciv-2.3.1/debian/patches/libtool-mismatch.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -7862,12 +7862,12 @@ - # serial 3012 ltversion.m4 - # This file is part of GNU Libtool - --m4_define([LT_PACKAGE_VERSION], [2.2.6]) --m4_define([LT_PACKAGE_REVISION], [1.3012]) -+m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -+m4_define([LT_PACKAGE_REVISION], [1.3017]) - - AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.2.6' --macro_revision='1.3012' -+[macro_version='2.2.6b' -+macro_revision='1.3017' - _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) - _LT_DECL(, macro_revision, 0) - ]) ---- a/bootstrap/ltmain.sh -+++ b/bootstrap/ltmain.sh -@@ -73,9 +73,9 @@ - - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION=2.2.6 -+VERSION=2.2.6b - TIMESTAMP="" --package_revision=1.3012 -+package_revision=1.3017 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ---- a/configure -+++ b/configure -@@ -6932,8 +6932,8 @@ - - - --macro_version='2.2.6' --macro_revision='1.3012' -+macro_version='2.2.6b' -+macro_revision='1.3017' - - - diff -Nru freeciv-2.3.0/debian/patches/series freeciv-2.3.1/debian/patches/series --- freeciv-2.3.0/debian/patches/series 2011-08-29 02:41:34.000000000 +0000 +++ freeciv-2.3.1/debian/patches/series 2012-01-10 01:55:47.000000000 +0000 @@ -2,6 +2,4 @@ themes_sdl_use_system_fonts.diff use_system_lua5.1.diff use_system_m4.diff -work_around_unity_induced_breakage.diff -libtool-mismatch.diff -debian-changes-2.3.0-1 +include-libtoolize-added-m4-files.diff diff -Nru freeciv-2.3.0/debian/patches/work_around_unity_induced_breakage.diff freeciv-2.3.1/debian/patches/work_around_unity_induced_breakage.diff --- freeciv-2.3.0/debian/patches/work_around_unity_induced_breakage.diff 2011-08-29 02:41:05.000000000 +0000 +++ freeciv-2.3.1/debian/patches/work_around_unity_induced_breakage.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ -commit 7e88e48ef1d7ab8decabb7d3b5e572adcc3df9fa -Author: Jacob Nevins <0jacobnk.gna@chiark.greenend.org.uk> -Date: Tue Jul 19 23:44:45 2011 +0100 - - In the Gtk client, decorate menu bars other than the main one with the - "ubuntu-local" property. This provides a hint to Ubuntu's Unity desktop - environment (which likes to move menubars around) that it shouldn't mess - with these, which was making vital menus like the Diplomacy menu - disappear. - - Reported in Ubuntu by John Lenton, and many times on the forums. - - See gna bug #18260 (and Ubuntu launchpad #743265). - -diff --git client/gui-gtk-2.0/cityrep.c client/gui-gtk-2.0/cityrep.c -index a25aea8..dd3f22e 100644 ---- a/client/gui-gtk-2.0/cityrep.c -+++ b/client/gui-gtk-2.0/cityrep.c -@@ -958,7 +958,7 @@ static GtkWidget *create_city_report_menubar(void) - sep = gtk_hseparator_new(); - gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0); - -- menubar = gtk_menu_bar_new(); -+ menubar = gtk_aux_menu_bar_new(); - gtk_box_pack_start(GTK_BOX(vbox), menubar, TRUE, TRUE, 0); - - item = gtk_menu_item_new_with_mnemonic(_("_Production")); -diff --git client/gui-gtk-2.0/diplodlg.c client/gui-gtk-2.0/diplodlg.c -index 3fa532e..b8d2edb 100644 ---- a/client/gui-gtk-2.0/diplodlg.c -+++ b/client/gui-gtk-2.0/diplodlg.c -@@ -619,7 +619,7 @@ "xalign", 0.0, "yalign", 0.5, NULL); - gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); - } - -- menubar = gtk_menu_bar_new(); -+ menubar = gtk_aux_menu_bar_new(); - gtk_table_attach_defaults(GTK_TABLE(table), menubar, 1, 2, 1, 2); - - menu = gtk_menu_new(); -@@ -693,7 +693,7 @@ "xalign", 0.0, "yalign", 0.5, NULL); - gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); - } - -- menubar = gtk_menu_bar_new(); -+ menubar = gtk_aux_menu_bar_new(); - gtk_table_attach_defaults(GTK_TABLE(table), menubar, 1, 2, 1, 2); - - menu = gtk_menu_new(); -diff --git client/gui-gtk-2.0/gui_stuff.c client/gui-gtk-2.0/gui_stuff.c -index 9306d05..a74df59 100644 ---- a/client/gui-gtk-2.0/gui_stuff.c -+++ b/client/gui-gtk-2.0/gui_stuff.c -@@ -263,6 +263,28 @@ void gtk_tree_view_focus(GtkTreeView *view) - } - - /************************************************************************** -+ Create an auxiliary menubar (i.e., not the main menubar at the top of -+ the window). -+**************************************************************************/ -+GtkWidget *gtk_aux_menu_bar_new(void) { -+ GtkWidget *menubar = gtk_menu_bar_new(); -+ -+ /* -+ * Ubuntu Linux's Ayatana/Unity desktop environment likes to steal the -+ * application's main menu bar from its window and put it at the top of -+ * the screen. It needs a hint in order not to steal menu bars other -+ * than the main one. Gory details at -+ * https://bugs.launchpad.net/ubuntu/+source/freeciv/+bug/743265 -+ */ -+ if (g_object_class_find_property( -+ G_OBJECT_CLASS(GTK_MENU_BAR_GET_CLASS(menubar)), "ubuntu-local")) { -+ g_object_set(G_OBJECT(menubar), "ubuntu-local", TRUE, NULL); -+ } -+ -+ return menubar; -+} -+ -+/************************************************************************** - ... - **************************************************************************/ - static void close_callback(GtkDialog *dialog, gpointer data) -diff --git client/gui-gtk-2.0/gui_stuff.h client/gui-gtk-2.0/gui_stuff.h -index 69e089b..f3976fc 100644 ---- a/client/gui-gtk-2.0/gui_stuff.h -+++ b/client/gui-gtk-2.0/gui_stuff.h -@@ -53,6 +53,7 @@ void setup_dialog(GtkWidget *shell, GtkWidget *parent); - GtkTreeViewColumn *add_treeview_column(GtkWidget *view, const char *title, - GType gtype, int model_index); - -+GtkWidget *gtk_aux_menu_bar_new(void); - - enum gui_dialog_type { - GUI_DIALOG_WINDOW, -diff --git client/gui-gtk-2.0/plrdlg.c client/gui-gtk-2.0/plrdlg.c -index 34e887e..ccbd18c 100644 ---- a/client/gui-gtk-2.0/plrdlg.c -+++ b/client/gui-gtk-2.0/plrdlg.c -@@ -503,9 +503,10 @@ void create_players_dialog(void) - sep = gtk_hseparator_new(); - gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0); - -- menubar = gtk_menu_bar_new(); -+ menubar = gtk_aux_menu_bar_new(); - gtk_box_pack_start(GTK_BOX(vbox), menubar, TRUE, TRUE, 0); - -+ - gui_dialog_add_widget(players_dialog_shell, vbox); - gtk_box_set_child_packing(GTK_BOX(players_dialog_shell->action_area), - vbox, FALSE, FALSE, 0, GTK_PACK_START); -diff --git client/gui-gtk-2.0/wldlg.c client/gui-gtk-2.0/wldlg.c -index d5bbcee..d93605c 100644 ---- a/client/gui-gtk-2.0/wldlg.c -+++ b/client/gui-gtk-2.0/wldlg.c -@@ -1215,7 +1215,7 @@ GtkWidget *create_worklist(void) - gtk_box_set_spacing(GTK_BOX(bbox), 10); - gtk_box_pack_start(GTK_BOX(editor), bbox, FALSE, FALSE, 0); - -- menubar = gtk_menu_bar_new(); -+ menubar = gtk_aux_menu_bar_new(); - gtk_container_add(GTK_CONTAINER(bbox), menubar); - gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(bbox), menubar, TRUE); - diff -Nru freeciv-2.3.0/debian/rules freeciv-2.3.1/debian/rules --- freeciv-2.3.0/debian/rules 2011-08-29 02:41:05.000000000 +0000 +++ freeciv-2.3.1/debian/rules 2012-01-10 01:55:47.000000000 +0000 @@ -1,193 +1,88 @@ #!/usr/bin/make -f -# Made with the aid of dh_make, by Craig Small -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -# Also some stuff taken from debmake scripts, by Cristopt Lameter. - -####################################################################### -# -# Do not update DH style or version without first asking Clint or Karl. -# Thanks. -# -####################################################################### # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 -PACKAGE=freeciv +# This has to be exported to make some magic below work. +export DH_OPTIONS -INSTALL = install -INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 +%: + dh $@ --with autotools_dev,autoreconf -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -COMMON_CONFIG := --cache-file=$(CURDIR)/config.cache \ - --sysconfdir=/etc --prefix=/usr \ - --datadir=\$${prefix}/share/games \ - --bindir=\$${prefix}/games --mandir=\$${prefix}/share/man \ - --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE) \ - --enable-debug=no - -build: build-xaw3d build-gtk build-sdl build-server - -build-server: - dh_testdir - - -rm -f config.sub config.guess - ln -sf /usr/share/misc/config.sub bootstrap/config.sub - ln -sf /usr/share/misc/config.guess bootstrap/config.guess - - mkdir build-server - (cd build-server && ../configure $(COMMON_CONFIG) --disable-client \ - --without-ggz-client && \ - $(MAKE) CFLAGS="$(CFLAGS)") - - touch build-server-stamp - -build-xaw3d: - dh_testdir - - -rm -f config.sub config.guess - ln -sf /usr/share/misc/config.sub bootstrap/config.sub - ln -sf /usr/share/misc/config.guess bootstrap/config.guess - - mkdir build-xaw3d - (cd build-xaw3d && \ - ../configure $(COMMON_CONFIG) --disable-server --enable-client=xaw \ - --with-xaw3d --without-ggz-client --without-ggz-server && \ - $(MAKE) CFLAGS="$(CFLAGS)") - - touch build-xaw3d-stamp - -build-gtk: - dh_testdir - - -rm -f config.sub config.guess - ln -sf /usr/share/misc/config.sub bootstrap/config.sub - ln -sf /usr/share/misc/config.guess bootstrap/config.guess - - mkdir build-gtk - (cd build-gtk && \ - ../configure $(COMMON_CONFIG) --disable-server --enable-client=gtk-2.0 \ - --without-ggz-server --enable-noregistry && \ - $(MAKE) CFLAGS="$(CFLAGS)") - - touch build-gtk-stamp - -build-sdl: - dh_testdir - - -rm -f config.sub config.guess - ln -sf /usr/share/misc/config.sub bootstrap/config.sub - ln -sf /usr/share/misc/config.guess bootstrap/config.guess - - mkdir build-sdl - (cd build-sdl && \ - ../configure $(COMMON_CONFIG) --disable-server --enable-client=sdl \ - --without-ggz-client --without-ggz-server && \ - $(MAKE) CFLAGS="$(CFLAGS)") - - touch build-sdl-stamp - -clean: - dh_testdir - dh_testroot - - -rm -f install-stamp build-server-stamp build-xaw3d-stamp build-gtk-stamp build-sdl-stamp - -rm -f config.cache config.sub config.guess - -rm -f bootstrap/config.sub bootstrap/config.guess - -rm -rf build-stamp build-xaw3d build-gtk build-sdl build-server +override_dh_autoreconf: + dh_autoreconf --exclude=bootstrap/mkinstalldirs + +override_dh_auto_configure: + ./configure --cache-file=$(CURDIR)/config.cache \ + --sysconfdir=/etc --prefix=/usr \ + --datadir=\$${prefix}/share/games \ + --bindir=\$${prefix}/games \ + --enable-debug=no --enable-client=all \ + --enable-ipv6=yes + + # More options? + # Turn on debug packages? +# --with-ggz-server --with-ggz-client \ + # $ ./configure --localstatedir=/var --libexecdir=${prefix}/lib/freeciv --disable-maintainer-mode --disable-dependency-tracking + # $ ./configure --no-create --no-recursion - dh_clean - - -rm -f debian/*~ Makefile Makefile.bak core */Makefile - -install: install-stamp -install-stamp: build-server-stamp build-gtk-stamp build-xaw3d-stamp build-sdl-stamp - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - (cd build-server; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \ - localedir=$(DESTDIR)/usr/share/locale install) - - (cd build-gtk; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \ - localedir=$(DESTDIR)/usr/share/locale install) - $(INSTALL_DIR) $(CURDIR)/debian/tmp/usr/share/ggz/modules/freeciv - cp build-gtk/data/civclient.dsc debian/tmp/usr/share/ggz/modules/freeciv +override_dh_install: + # Create .desktop files cp debian/tmp/usr/share/applications/freeciv.desktop \ debian/tmp/usr/share/applications/freeciv-gtk.desktop - - (cd build-sdl; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \ - localedir=$(DESTDIR)/usr/share/locale install) sed 's/Exec=freeciv-gtk2/Exec=freeciv-sdl/' \ debian/tmp/usr/share/applications/freeciv.desktop \ >debian/tmp/usr/share/applications/freeciv-sdl.desktop - - (cd build-xaw3d; $(MAKE) DESTDIR=$(CURDIR)/debian/tmp \ - localedir=$(DESTDIR)/usr/share/locale install) sed 's/Exec=freeciv-gtk2/Exec=freeciv-xaw/' \ debian/tmp/usr/share/applications/freeciv.desktop \ >debian/tmp/usr/share/applications/freeciv-xaw3d.desktop rm debian/tmp/usr/share/applications/freeciv.desktop - + # Create directory for ggz + install -p -d -o root -g root -m 755 debian/tmp/usr/share/ggz/modules/freeciv/ + # Copy in ggz dsc file + cp data/civclient.dsc debian/tmp/usr/share/ggz/modules/freeciv/ # Move stuff that gets lost thanks to ${datadir} mv debian/tmp/usr/share/games/icons debian/tmp/usr/share - - dh_install - + # Delete stuff that is broken or unneeded. + # Broken man pages. + rm -f debian/tmp/usr/share/man/man6/freeciv-gtk2.6 + rm -f debian/tmp/usr/share/man/man6/freeciv-win32.6 + rm -f debian/tmp/usr/share/man/man6/freeciv-xaw.6 + rm -f debian/tmp/usr/share/man/man6/freeciv-sdl.6 + rm -f debian/tmp/usr/share/man/man6/freeciv-ftwl.6 + # Copy our man page into the source tree. + cp debian/freeciv-manual.6 debian/tmp/usr/share/man/man6/freeciv-manual.6 + # Debian doesn't want .la files. + rm -f debian/tmp/usr/lib/*.la + # Should these have been installed here at all? + rm -f debian/tmp/usr/lib/*.a + # Continue install + dh_install --fail-missing # Remove sounds from -data rm -rf debian/freeciv-data/usr/share/games/freeciv/stdsounds* - # Remove ttf fonts from -data, now provided by dependencies. rm -rf debian/freeciv-data/usr/share/games/freeciv/themes/gui-sdl/human/*.ttf rm -rf debian/freeciv-data/usr/share/games/freeciv/themes/gui-sdl/human/COPYING.* - touch install-stamp +override_dh_installdocs: + # Don't install Makefiles; these seem to be localisations in the data file. + dh_installdocs --exclude="Makefile" -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installdocs -i - dh_installchangelogs -i - dh_installmenu -i - dh_installman -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -binary-arch: build install - dh_testdir -a - dh_testroot -a -# dh_installdocs -a -# dh_installexamples -a -# dh_installchangelogs -a ChangeLog +override_dh_link: # Remove doc dirs for arch-dependent packages and symlink - # to freeciv-data's. - for i in freeciv-server freeciv-client-gtk freeciv-client-xaw3d freeciv-client-sdl; do \ - rm -rf $(CURDIR)/debian/$i/usr/share/doc/$i; \ - done - dh_link -a - dh_installmenu -a - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a + # to freeciv-data's in dh_link + -rm -rf debian/freeciv-server/usr/share/doc/freeciv-server + -rm -rf debian/freeciv-client-gtk/usr/share/doc/freeciv-client-gtk + -rm -rf debian/freeciv-client-sdl/usr/share/doc/freeciv-client-sdl + -rm -rf debian/freeciv-client-xaw3d/usr/share/doc/freeciv-client-xaw3d + -rm -rf debian/freeciv-client-extras/usr/share/doc/freeciv-client-extras + # After deleting we can link correctly + dh_link + +override_dh_clean: + dh_clean + rm -rf .pc + find . -name '*.o' -exec rm -f {} \; + find . -name '.libs' -exec rm -rf {} \; + find . -name '.dists' -exec rm -rf {} \; -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary diff -Nru freeciv-2.3.0/debian/source/options freeciv-2.3.1/debian/source/options --- freeciv-2.3.0/debian/source/options 2011-08-29 02:41:05.000000000 +0000 +++ freeciv-2.3.1/debian/source/options 2012-01-10 01:55:47.000000000 +0000 @@ -1,3 +1,3 @@ # see man dpkg-source for details on this file. +# This is needed to deal with generic stuff like .git diff-ignore -extend-diff-ignore="^configure$|(Makefile.in|.m4)$" diff -Nru freeciv-2.3.0/dependencies/lua-5.1/Makefile.in freeciv-2.3.1/dependencies/lua-5.1/Makefile.in --- freeciv-2.3.0/dependencies/lua-5.1/Makefile.in 2011-08-08 04:25:59.000000000 +0000 +++ freeciv-2.3.1/dependencies/lua-5.1/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -132,10 +132,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -308,7 +304,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -422,7 +417,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -447,7 +442,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -Nru freeciv-2.3.0/dependencies/lua-5.1/src/Makefile.in freeciv-2.3.1/dependencies/lua-5.1/src/Makefile.in --- freeciv-2.3.0/dependencies/lua-5.1/src/Makefile.in 2011-08-08 04:26:00.000000000 +0000 +++ freeciv-2.3.1/dependencies/lua-5.1/src/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -136,10 +136,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -312,7 +308,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/dependencies/Makefile.in freeciv-2.3.1/dependencies/Makefile.in --- freeciv-2.3.0/dependencies/Makefile.in 2011-08-08 04:25:59.000000000 +0000 +++ freeciv-2.3.1/dependencies/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -132,10 +132,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -308,7 +304,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -424,7 +419,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -449,7 +444,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -Nru freeciv-2.3.0/dependencies/tolua-5.1/Makefile.in freeciv-2.3.1/dependencies/tolua-5.1/Makefile.in --- freeciv-2.3.0/dependencies/tolua-5.1/Makefile.in 2011-08-08 04:26:00.000000000 +0000 +++ freeciv-2.3.1/dependencies/tolua-5.1/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -132,10 +132,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -308,7 +304,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -422,7 +417,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -447,7 +442,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -Nru freeciv-2.3.0/dependencies/tolua-5.1/src/bin/Makefile.in freeciv-2.3.1/dependencies/tolua-5.1/src/bin/Makefile.in --- freeciv-2.3.0/dependencies/tolua-5.1/src/bin/Makefile.in 2011-08-08 04:26:00.000000000 +0000 +++ freeciv-2.3.1/dependencies/tolua-5.1/src/bin/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -128,10 +128,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -304,7 +300,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/dependencies/tolua-5.1/src/lib/Makefile.in freeciv-2.3.1/dependencies/tolua-5.1/src/lib/Makefile.in --- freeciv-2.3.0/dependencies/tolua-5.1/src/lib/Makefile.in 2011-08-08 04:26:00.000000000 +0000 +++ freeciv-2.3.1/dependencies/tolua-5.1/src/lib/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -128,10 +128,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -304,7 +300,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/dependencies/tolua-5.1/src/Makefile.in freeciv-2.3.1/dependencies/tolua-5.1/src/Makefile.in --- freeciv-2.3.0/dependencies/tolua-5.1/src/Makefile.in 2011-08-08 04:26:00.000000000 +0000 +++ freeciv-2.3.1/dependencies/tolua-5.1/src/Makefile.in 2011-11-19 20:24:06.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -132,10 +132,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -308,7 +304,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -421,7 +416,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -446,7 +441,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -Nru freeciv-2.3.0/doc/ca/Makefile.in freeciv-2.3.1/doc/ca/Makefile.in --- freeciv-2.3.0/doc/ca/Makefile.in 2011-08-08 04:26:00.000000000 +0000 +++ freeciv-2.3.1/doc/ca/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,10 +92,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -268,7 +264,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/doc/de/Makefile.in freeciv-2.3.1/doc/de/Makefile.in --- freeciv-2.3.0/doc/de/Makefile.in 2011-08-08 04:26:00.000000000 +0000 +++ freeciv-2.3.1/doc/de/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,10 +92,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -268,7 +264,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/doc/fr/Makefile.in freeciv-2.3.1/doc/fr/Makefile.in --- freeciv-2.3.0/doc/fr/Makefile.in 2011-08-08 04:26:00.000000000 +0000 +++ freeciv-2.3.1/doc/fr/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,10 +92,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -268,7 +264,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/doc/it/Makefile.in freeciv-2.3.1/doc/it/Makefile.in --- freeciv-2.3.0/doc/it/Makefile.in 2011-08-08 04:26:01.000000000 +0000 +++ freeciv-2.3.1/doc/it/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,10 +92,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -268,7 +264,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/doc/ja/Makefile.in freeciv-2.3.1/doc/ja/Makefile.in --- freeciv-2.3.0/doc/ja/Makefile.in 2011-08-08 04:26:01.000000000 +0000 +++ freeciv-2.3.1/doc/ja/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,10 +92,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -268,7 +264,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/doc/Makefile.in freeciv-2.3.1/doc/Makefile.in --- freeciv-2.3.0/doc/Makefile.in 2011-08-08 04:26:00.000000000 +0000 +++ freeciv-2.3.1/doc/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -132,10 +132,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -308,7 +304,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -446,7 +441,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -471,7 +466,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -Nru freeciv-2.3.0/doc/man/freeciv-client.6.in freeciv-2.3.1/doc/man/freeciv-client.6.in --- freeciv-2.3.0/doc/man/freeciv-client.6.in 2011-08-08 04:17:01.000000000 +0000 +++ freeciv-2.3.1/doc/man/freeciv-client.6.in 2011-11-19 20:18:47.000000000 +0000 @@ -222,7 +222,7 @@ by default. Currently the following tilespecs can be used: \(bu -.I amplio.tilespec +.I amplio2.tilespec \(bu .I hex2t.tilespec diff -Nru freeciv-2.3.0/doc/man/freeciv-modpack.6.in freeciv-2.3.1/doc/man/freeciv-modpack.6.in --- freeciv-2.3.0/doc/man/freeciv-modpack.6.in 1970-01-01 00:00:00.000000000 +0000 +++ freeciv-2.3.1/doc/man/freeciv-modpack.6.in 2011-11-19 20:18:47.000000000 +0000 @@ -0,0 +1,95 @@ +.\" Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold +.\" This program 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, or (at your option) +.\" any later version. +.\" +.\" This program is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.TH FREECIV 6 "August 10th 2011" +.SH NAME +freeciv-modpack \ +\- Custom content installer for the Freeciv game +.SH SYNOPSIS +.B freeciv-modpack \ +[ \-h|\-\-help ] \ +[ \-v|\-\-version ] \ + +.SH DESCRIPTION +Freeciv is a free turn-based multiplayer strategy game, in which each player +becomes the leader of a civilization, fighting to obtain the ultimate goal: +To become the greatest civilization. + +Players of Civilization II\*R by Microprose\*R should feel at home, since one +aim of Freeciv is to have compatible rules. + +Freeciv is maintained by an international team of coders and enthusiasts, and is +easily one of the most fun and addictive network games out there! + +This is the custom content installer program. - See also +.IR freeciv-server (6) +.IR freeciv-client (6) + +This manual page only lists the command line arguments. For details +regarding the options when using +.B freeciv-modpack +see the documentation in +.UR +http://www.freeciv.org/ +.UE +as well as the documentation which is part of the Freeciv distribution. +.SH OPTIONS +All options have a short +form (single hyphen and single letter) and a long form (double hyphen +and a complete word); their effects are identical. +.TP + +.BI "\-h, \-\-help" +Prints a short summary of the command line options. +.TP +.BI "\-v, \-\-version" +Prints the version number and exits. +.TP + +.SH ENVIRONMENT +The Freeciv client accepts these environment variables: +.TP +.BI HOME +Specifies the user's home directory. +.TP +.BI http_proxy +Set this variable accordingly when using a proxy. +.TP +\fBLANG\fP or \fBLANGUAGE\fP +Sets the language and locale on some platforms. +.TP +\fBLC_ALL\fP or \fBLC_CTYPE\fP +Similar to LANG (see documentation for your system). +.TP +.BI USER +Specifies the username of the current user. +.SH BUGS +Please report bugs to +.UR +@BUG_URL@ +.UE +\. + +.SH "MORE INFO" +The Freeciv homepage is located at +.UR +@WIKI_URL@ +.UE +\. + +Updates and new info is first posted there. +.SH AUTHORS +The Freeciv Team <@MAIL_ADDRESS@>. + +.SH "SEE ALSO" +.IR freeciv-server (6) +.IR freeciv-client (6) +and the Client Manual at the Freeciv homepage. diff -Nru freeciv-2.3.0/doc/man/Makefile.am freeciv-2.3.1/doc/man/Makefile.am --- freeciv-2.3.0/doc/man/Makefile.am 2011-08-08 04:17:01.000000000 +0000 +++ freeciv-2.3.1/doc/man/Makefile.am 2011-11-19 20:18:47.000000000 +0000 @@ -2,7 +2,8 @@ MAN_PAGES = \ freeciv-server.6 \ - freeciv-client.6 + freeciv-client.6 \ + freeciv-modpack.6 MAN_LINKS = \ freeciv-gtk2.6 \ diff -Nru freeciv-2.3.0/doc/man/Makefile.in freeciv-2.3.1/doc/man/Makefile.in --- freeciv-2.3.0/doc/man/Makefile.in 2011-08-08 04:26:01.000000000 +0000 +++ freeciv-2.3.1/doc/man/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -35,7 +35,8 @@ host_triplet = @host@ subdir = doc/man DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/freeciv-client.6.in $(srcdir)/freeciv-server.6.in + $(srcdir)/freeciv-client.6.in $(srcdir)/freeciv-modpack.6.in \ + $(srcdir)/freeciv-server.6.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/dependencies/m4/mkstemp.m4 \ $(top_srcdir)/dependencies/m4/stdlib_h.m4 \ @@ -58,7 +59,8 @@ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = freeciv-client.6 freeciv-server.6 +CONFIG_CLEAN_FILES = freeciv-client.6 freeciv-server.6 \ + freeciv-modpack.6 CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -118,10 +120,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -294,7 +292,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -361,7 +358,8 @@ top_srcdir = @top_srcdir@ MAN_PAGES = \ freeciv-server.6 \ - freeciv-client.6 + freeciv-client.6 \ + freeciv-modpack.6 MAN_LINKS = \ freeciv-gtk2.6 \ @@ -409,6 +407,8 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ freeciv-server.6: $(top_builddir)/config.status $(srcdir)/freeciv-server.6.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +freeciv-modpack.6: $(top_builddir)/config.status $(srcdir)/freeciv-modpack.6.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo diff -Nru freeciv-2.3.0/doc/nl/Makefile.in freeciv-2.3.1/doc/nl/Makefile.in --- freeciv-2.3.0/doc/nl/Makefile.in 2011-08-08 04:26:01.000000000 +0000 +++ freeciv-2.3.1/doc/nl/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,10 +92,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -268,7 +264,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/doc/README freeciv-2.3.1/doc/README --- freeciv-2.3.0/doc/README 2011-08-08 04:17:01.000000000 +0000 +++ freeciv-2.3.1/doc/README 2011-11-19 20:18:48.000000000 +0000 @@ -182,13 +182,13 @@ option, which can be used to select different "tilesets" (that is, different graphics for the map terrain, units, and so on). The distribution comes with 5 main tilesets: - - amplio: An isometric tileset with larger and more detailed tiles. + - amplio2: An isometric tileset with larger and more detailed tiles. - isotrident: An isometric tileset similar in shape to the one in Civ 2. - trident: a Civ 1-style tileset with 30x30 tiles. - isophex: an isometric hexagonal tileset - hex2t: an overhead hexagonal tileset - In this release the amplio tileset is the default tileset. + In this release the amplio2 tileset is the default tileset. To try another one, for instance the trident tileset, start the client with: diff -Nru freeciv-2.3.0/doc/README.packaging freeciv-2.3.1/doc/README.packaging --- freeciv-2.3.0/doc/README.packaging 2011-08-08 04:17:01.000000000 +0000 +++ freeciv-2.3.1/doc/README.packaging 2011-11-19 20:18:48.000000000 +0000 @@ -38,6 +38,12 @@ it's suitable for end users. ---------------------------------------------------------------------- +Updating from 2.3.0 to 2.3.1 +---------------------------- +* man page for freeciv-modpack is available +* Linux desktop icons for freeciv-modpack are available + +---------------------------------------------------------------------- Compatibility of modified versions ---------------------------------- If you create patched version of Freeciv, take necessary precautions diff -Nru freeciv-2.3.0/doc/README.ruleset_experimental freeciv-2.3.1/doc/README.ruleset_experimental --- freeciv-2.3.0/doc/README.ruleset_experimental 2011-08-08 04:17:01.000000000 +0000 +++ freeciv-2.3.1/doc/README.ruleset_experimental 2011-11-19 20:18:48.000000000 +0000 @@ -1,12 +1,11 @@ ---------------------------------------------------------------------- - Experimental Freeciv Rulesets + Experimental Freeciv Ruleset ---------------------------------------------------------------------- -This ruleset tries to use the new features available in freeciv 2.2 and -the development version 2.2.99 (this will be 2.3 in the future). It is -based on the default ruleset. The changes can be extracted by +This ruleset tries to use the new features available since freeciv 2.2. It +is based on the default ruleset. The changes can be extracted by -#> diff -ur data/default data/experimental/ +#> diff -ur data/default/ data/experimental/ If the changes in this ruleset result in a working game (especially with regard to the AI) they could be included in the default ruleset for next @@ -20,11 +19,11 @@ 1. Changes compared to the default ruleset --------------------------------------- -- Plagues are activated. Aqueducts and Sewer Systems reduce the chance - of plague in a city, as do the new Hospital and Genetic Laboratory - buildings. Building the wonder 'Cure for Cancer' further reduces the - possibility of plague for your entire empire (in combination with the - other buildings, plague can be eradicated in a city). +- Plagues are activated. Temples, Aqueducts, Sewer Systems reduce the + chance of plague in a city, as do the new Hospital and Genetic Laboratory + buildings. The effect of Aqueducts is reduced after Industrialization + is discovered. Building the wonder 'Cure for Cancer' further reduces + the possibility of plague for your entire empire. - The Genetic Laboratory increases the food output by 25% if the city size exceeds 20. @@ -39,7 +38,7 @@ Gold upkeep for units is tallied empire-wide (unlike buildings), and if funds run out, random units are disbanded. -- An new unit class Big Land is introduced, comprising all "siege" units +- A new unit class Big Land is introduced, comprising all "siege" units (Catapult, Cannon etc) and Freight. Units of this type are restricted to flat terrain and cannot move into difficult terrain such as hills and forest, unless roads are built. diff -Nru freeciv-2.3.0/doc/sv/Makefile.in freeciv-2.3.1/doc/sv/Makefile.in --- freeciv-2.3.0/doc/sv/Makefile.in 2011-08-08 04:26:01.000000000 +0000 +++ freeciv-2.3.1/doc/sv/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -92,10 +92,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -268,7 +264,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/fc_version freeciv-2.3.1/fc_version --- freeciv-2.3.0/fc_version 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/fc_version 2011-11-19 20:22:50.000000000 +0000 @@ -6,7 +6,7 @@ MAJOR_VERSION="2" MINOR_VERSION="3" -PATCH_VERSION="0" +PATCH_VERSION="1" VERSION_LABEL="" IS_DEVEL_VERSION=0 @@ -28,7 +28,7 @@ # as long as possible. We want to maintain network compatibility with # the stable branch for as long as possible. NETWORK_CAPSTRING_MANDATORY="+Freeciv-2.3-network" -NETWORK_CAPSTRING_OPTIONAL="" +NETWORK_CAPSTRING_OPTIONAL="timeout_extended_range" if test x$VERSION_SCRIPT_SILENT != xyes ; then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL} diff -Nru freeciv-2.3.0/INSTALL freeciv-2.3.1/INSTALL --- freeciv-2.3.0/INSTALL 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/INSTALL 2011-11-19 20:22:07.000000000 +0000 @@ -4,7 +4,7 @@ This file describes how to compile and install Freeciv. Last time we made sure this file is up to date was 16-Jul-06. -Last minor update was 22-Feb-11. +Last minor update was 07-Aug-11. There may be a localized version of this file in the ./doc directory, named INSTALL. (e.g., INSTALL.de). @@ -87,7 +87,7 @@ Especial the xgettext program is required to create the *.gmo files which aren't included in the svn tree. - - GNU autoconf version 2.58 or better + - GNU autoconf version 2.59 or better Autoconf is required to create configure from configure.ac. diff -Nru freeciv-2.3.0/m4/auth.m4 freeciv-2.3.1/m4/auth.m4 --- freeciv-2.3.0/m4/auth.m4 2011-08-08 04:16:58.000000000 +0000 +++ freeciv-2.3.1/m4/auth.m4 2011-11-19 20:18:41.000000000 +0000 @@ -18,6 +18,13 @@ AC_ARG_WITH(mysql-prefix,[ --with-mysql-prefix=PFX Prefix where MySQL is installed (optional)], mysql_prefix="$withval", mysql_prefix="") + if test "x$mysql_prefix" != "x" ; then + mysql_libdir="$mysql_prefix/lib/mysql" + fi + + AC_ARG_WITH([mysql-libdir], [ --with-mysql-libdir=Where MySQL library is installed (optional)], +[mysql_libdir="$withval"]) + if test x$auth = xyes ; then if test x$mysql_prefix = x ; then @@ -25,42 +32,49 @@ [AC_MSG_WARN([couldn't find mysql header: disabling auth]); auth=no]) - dnl we need to set -L correctly, we will check once in standard locations - dnl then we will check with other LDFLAGS. if none of these work, we fail. - - AC_CHECK_LIB(mysqlclient, mysql_query, - [AUTH_LIBS="-lmysqlclient $AUTH_LIBS"], - [AC_MSG_WARN([couldn't find mysql libs in normal locations]); - auth=no]) + if test "x$mysql_libdir" = "x" ; then + dnl we need to set -L correctly, we will check once in standard locations + dnl then we will check with other LDFLAGS. if none of these work, we fail. + AC_CHECK_LIB(mysqlclient, mysql_query, + [AUTH_LIBS="-lmysqlclient $AUTH_LIBS"], + [AC_MSG_WARN([couldn't find mysql libs in normal locations]); + auth=no]) + if test x$auth = xno ; then + fc_preauth_LDFLAGS="$LDFLAGS" + fc_mysql_lib_loc="-L/usr/lib/mysql -L/usr/local/lib/mysql" - if test x$auth = xno ; then - fc_preauth_LDFLAGS="$LDFLAGS" - fc_mysql_lib_loc="-L/usr/lib/mysql -L/usr/local/lib/mysql" + for __ldpath in $fc_mysql_lib_loc; do + unset ac_cv_lib_mysqlclient_mysql_query + LDFLAGS="$LDFLAGS $__ldpath" + + AC_CHECK_LIB(mysqlclient, mysql_query, + [AUTH_LIBS="-lmysqlclient $AUTH_LIBS"; + AC_MSG_WARN([had to add $__ldpath to LDFLAGS]) + auth=yes], + [AC_MSG_WARN([couldn't find mysql libs in $__ldpath])]) + + if test x$auth = xyes; then + break + else + LDFLAGS="$fc_preauth_LDFLAGS" + fi + done + fi - for __ldpath in $fc_mysql_lib_loc; do - unset ac_cv_lib_mysqlclient_mysql_query - LDFLAGS="$LDFLAGS $__ldpath" - - AC_CHECK_LIB(mysqlclient, mysql_query, - [AUTH_LIBS="-lmysqlclient $AUTH_LIBS"; - AC_MSG_WARN([had to add $__ldpath to LDFLAGS]) - auth=yes], - [AC_MSG_WARN([couldn't find mysql libs in $__ldpath])]) - - if test x$auth = xyes; then - break - else - LDFLAGS="$fc_preauth_LDFLAGS" - fi - done + else + LDFLAGS="$LDFLAGS -L$mysql_libdir" + AC_CHECK_LIB([mysqlclient], [mysql_query], + [AUTH_LIBS="-lmysqlclient $AUTH_LIBS"], + [AC_MSG_WARN([couldn't find mysql libs in $mysql_libdir]); + auth=no]) + fi - if test x$auth = xno ; then - AC_MSG_ERROR([couldn't find mysql libs at all]) - fi + if test x$auth = xno ; then + AC_MSG_ERROR([couldn't find mysql libs at all]) fi else AUTH_CFLAGS="-I$mysql_prefix/include $AUTH_CFLAGS" - AUTH_LIBS="-L$mysql_prefix/lib/mysql -lmysqlclient $AUTH_LIBS" + AUTH_LIBS="-L$mysql_libdir -lmysqlclient $AUTH_LIBS" auth_saved_cflags="$CFLAGS" auth_saved_cppflags="$CPPFLAGS" auth_saved_libs="$LIBS" @@ -72,7 +86,7 @@ auth=no]) if test x$auth = xyes; then AC_CHECK_LIB(mysqlclient, mysql_query, , - [AC_MSG_WARN([couldn't find mysql libs in $mysql_prefix/lib/mysql]); + [AC_MSG_WARN([couldn't find mysql libs in $mysql_libdir]); auth=no]) fi CFLAGS="$auth_saved_cflags" diff -Nru freeciv-2.3.0/m4/debug.m4 freeciv-2.3.1/m4/debug.m4 --- freeciv-2.3.0/m4/debug.m4 2011-08-08 04:16:58.000000000 +0000 +++ freeciv-2.3.1/m4/debug.m4 2011-11-19 20:18:41.000000000 +0000 @@ -13,7 +13,6 @@ if test "x$enable_debug" = "xyes" -o "x$enable_debug" = "xchecks"; then AC_DEFINE([DEBUG], [1], [Extra debugging support]) FC_C_FLAGS([-Werror], [], [EXTRA_DEBUG_CFLAGS]) - FC_CXX_FLAGS([-Werror], [], [EXTRA_DEBUG_CXXFLAGS]) if test "x$enable_debug" = "xchecks"; then dnl Add additional flags as stated in ./doc/CodingStyle. Compiling the @@ -28,16 +27,11 @@ [EXTRA_DEBUG_CFLAGS]) FC_C_FLAGS([-Wstrict-prototypes -Wnested-externs -Wl,--no-add-needed], [], [EXTRA_DEBUG_CFLAGS]) - FC_CXX_FLAGS([-Werror -Wall -Wpointer-arith -Wcast-align ], [], - [EXTRA_DEBUG_CXXFLAGS]) - FC_CXX_FLAGS([--Wmissing-declarations], [], - [EXTRA_DEBUG_CXXFLAGS]) fi else if test "x$enable_debug" = "xno"; then AC_DEFINE([NDEBUG], [1], [No debugging support at all]) FC_C_FLAGS([-O3 -fomit-frame-pointer], [], [EXTRA_DEBUG_CFLAGS]) - FC_CXX_FLAGS([-O3 -fomit-frame-pointer], [], [EXTRA_DEBUG_CXXFLAGS]) fi fi ]) diff -Nru freeciv-2.3.0/m4/gprof.m4 freeciv-2.3.1/m4/gprof.m4 --- freeciv-2.3.0/m4/gprof.m4 2011-08-08 04:16:58.000000000 +0000 +++ freeciv-2.3.1/m4/gprof.m4 2011-11-19 20:18:41.000000000 +0000 @@ -10,6 +10,5 @@ dnl -g is added by AC_PROG_CC if the compiler understands it if test "x$enable_gprof" = "xyes"; then FC_C_FLAGS([-pg], [], [EXTRA_DEBUG_CFLAGS]) - FC_CXX_FLAGS([-pg], [], [EXTRA_DEBUG_CXXFLAGS]) fi ]) diff -Nru freeciv-2.3.0/Makefile.am freeciv-2.3.1/Makefile.am --- freeciv-2.3.0/Makefile.am 2011-08-08 04:20:48.000000000 +0000 +++ freeciv-2.3.1/Makefile.am 2011-11-19 20:22:07.000000000 +0000 @@ -52,6 +52,7 @@ bootstrap/generate_svnrev.sh \ bootstrap/freeciv.desktop.in \ bootstrap/freeciv-server.desktop.in \ + bootstrap/freeciv-modpack.desktop.in \ bootstrap/freeciv.spec.in \ bootstrap/undep.sh.in \ bootstrap/config.rpath \ diff -Nru freeciv-2.3.0/Makefile.in freeciv-2.3.1/Makefile.in --- freeciv-2.3.0/Makefile.in 2011-08-08 04:26:03.000000000 +0000 +++ freeciv-2.3.1/Makefile.in 2011-11-19 20:24:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -156,10 +156,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -332,7 +328,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -420,6 +415,7 @@ bootstrap/generate_svnrev.sh \ bootstrap/freeciv.desktop.in \ bootstrap/freeciv-server.desktop.in \ + bootstrap/freeciv-modpack.desktop.in \ bootstrap/freeciv.spec.in \ bootstrap/undep.sh.in \ bootstrap/config.rpath \ @@ -547,7 +543,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -572,7 +568,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -736,7 +732,8 @@ fi; \ done -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -780,17 +777,17 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff -Nru freeciv-2.3.0/manual/civmanual.c freeciv-2.3.1/manual/civmanual.c --- freeciv-2.3.0/manual/civmanual.c 2011-08-08 04:20:41.000000000 +0000 +++ freeciv-2.3.1/manual/civmanual.c 2011-11-19 20:21:57.000000000 +0000 @@ -94,6 +94,9 @@ #define TAIL " " #endif +/* Needed for "About Freeciv" help */ +const char *client_string = "freeciv-manual"; + /************************************************************************** Replace html special characters ('&', '<' and '>'). **************************************************************************/ diff -Nru freeciv-2.3.0/manual/Makefile.in freeciv-2.3.1/manual/Makefile.in --- freeciv-2.3.0/manual/Makefile.in 2011-08-08 04:26:01.000000000 +0000 +++ freeciv-2.3.1/manual/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -128,10 +128,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -304,7 +300,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ diff -Nru freeciv-2.3.0/modinst/Makefile.am freeciv-2.3.1/modinst/Makefile.am --- freeciv-2.3.0/modinst/Makefile.am 2011-08-08 04:20:02.000000000 +0000 +++ freeciv-2.3.1/modinst/Makefile.am 2011-11-19 20:21:19.000000000 +0000 @@ -2,16 +2,22 @@ bin_PROGRAMS = freeciv-modpack -AM_CPPFLAGS = -I$(top_srcdir)/utility $(MP_gtk2_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(top_srcdir)/common $(MP_gtk2_CFLAGS) if MINGW32 MPICON = $(top_builddir)/win32/mpicon.o +else +desktopfiledir = $(prefix)/share/applications +desktopfile_DATA = \ + freeciv-modpack.desktop endif freeciv_modpack_SOURCES = \ download.c \ download.h \ - modinst.c + modinst.c \ + mpcmdline.c \ + mpcmdline.h freeciv_modpack_LDFLAGS = $(MP_gtk2_LDFLAGS) diff -Nru freeciv-2.3.0/modinst/Makefile.in freeciv-2.3.1/modinst/Makefile.in --- freeciv-2.3.0/modinst/Makefile.in 2011-08-08 04:26:01.000000000 +0000 +++ freeciv-2.3.1/modinst/Makefile.in 2011-11-19 20:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -36,7 +37,8 @@ host_triplet = @host@ bin_PROGRAMS = freeciv-modpack$(EXEEXT) subdir = modinst -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/bootstrap/freeciv-modpack.desktop.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/dependencies/m4/mkstemp.m4 \ $(top_srcdir)/dependencies/m4/stdlib_h.m4 \ @@ -59,11 +61,12 @@ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = freeciv-modpack.desktop CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopfiledir)" PROGRAMS = $(bin_PROGRAMS) -am_freeciv_modpack_OBJECTS = download.$(OBJEXT) modinst.$(OBJEXT) +am_freeciv_modpack_OBJECTS = download.$(OBJEXT) modinst.$(OBJEXT) \ + mpcmdline.$(OBJEXT) freeciv_modpack_OBJECTS = $(am_freeciv_modpack_OBJECTS) am__DEPENDENCIES_1 = freeciv_modpack_DEPENDENCIES = $(top_builddir)/common/libfreeciv.la \ @@ -103,6 +106,28 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(freeciv_modpack_SOURCES) DIST_SOURCES = $(freeciv_modpack_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +DATA = $(desktopfile_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -130,10 +155,6 @@ CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DATASUBDIR = @DATASUBDIR@ @@ -306,7 +327,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -371,12 +391,18 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CPPFLAGS = -I$(top_srcdir)/utility $(MP_gtk2_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(top_srcdir)/common $(MP_gtk2_CFLAGS) @MINGW32_TRUE@MPICON = $(top_builddir)/win32/mpicon.o +@MINGW32_FALSE@desktopfiledir = $(prefix)/share/applications +@MINGW32_FALSE@desktopfile_DATA = \ +@MINGW32_FALSE@ freeciv-modpack.desktop + freeciv_modpack_SOURCES = \ download.c \ download.h \ - modinst.c + modinst.c \ + mpcmdline.c \ + mpcmdline.h freeciv_modpack_LDFLAGS = $(MP_gtk2_LDFLAGS) freeciv_modpack_LDADD = \ @@ -418,6 +444,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +freeciv-modpack.desktop: $(top_builddir)/config.status $(top_srcdir)/bootstrap/freeciv-modpack.desktop.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @@ -473,6 +501,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/download.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modinst.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpcmdline.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -503,6 +532,26 @@ clean-libtool: -rm -rf .libs _libs +install-desktopfileDATA: $(desktopfile_DATA) + @$(NORMAL_INSTALL) + test -z "$(desktopfiledir)" || $(MKDIR_P) "$(DESTDIR)$(desktopfiledir)" + @list='$(desktopfile_DATA)'; test -n "$(desktopfiledir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopfiledir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopfiledir)" || exit $$?; \ + done + +uninstall-desktopfileDATA: + @$(NORMAL_UNINSTALL) + @list='$(desktopfile_DATA)'; test -n "$(desktopfiledir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(desktopfiledir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(desktopfiledir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -588,9 +637,9 @@ done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) +all-am: Makefile $(PROGRAMS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopfiledir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -640,7 +689,7 @@ info-am: -install-data-am: +install-data-am: install-desktopfileDATA install-dvi: install-dvi-am @@ -686,7 +735,7 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS +uninstall-am: uninstall-binPROGRAMS uninstall-desktopfileDATA .MAKE: install-am install-strip @@ -694,15 +743,16 @@ clean-generic clean-libtool ctags distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS + install-binPROGRAMS install-data install-data-am \ + install-desktopfileDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-desktopfileDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru freeciv-2.3.0/modinst/modinst.c freeciv-2.3.1/modinst/modinst.c --- freeciv-2.3.0/modinst/modinst.c 2011-08-08 04:20:02.000000000 +0000 +++ freeciv-2.3.1/modinst/modinst.c 2011-11-19 20:21:19.000000000 +0000 @@ -29,6 +29,7 @@ /* modinst */ #include "download.h" +#include "mpcmdline.h" #define MODPACK_LIST_URL "http://download.gna.org/freeciv/modinst/" DATASUBDIR "/modpack.list" @@ -248,22 +249,22 @@ renderer = gtk_cell_renderer_text_new(); gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(main_list), ML_COL_NAME, - "Name", renderer, "text", 0, + _("Name"), renderer, "text", 0, NULL); renderer = gtk_cell_renderer_text_new(); gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(main_list), ML_COL_VER, - "Version", renderer, "text", 1, + _("Version"), renderer, "text", 1, NULL); renderer = gtk_cell_renderer_text_new(); gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(main_list), ML_COL_TYPE, - "Type", renderer, "text", 2, + _("Type"), renderer, "text", 2, NULL); renderer = gtk_cell_renderer_text_new(); gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(main_list), ML_COL_URL, - "URL", renderer, "text", 3, + _("URL"), renderer, "text", 3, NULL); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(main_list)); g_signal_connect(selection, "changed", G_CALLBACK(select_from_list), NULL); @@ -322,6 +323,7 @@ { GtkWidget *toplevel; int loglevel = LOG_NORMAL; + int ui_options; init_nls(); init_character_encodings(FC_DEFAULT_DATA_ENCODING, FALSE); @@ -329,25 +331,43 @@ fc_init_network(); g_thread_init(NULL); - - /* Process GTK arguments */ - gtk_init(&argc, &argv); log_init(NULL, loglevel, NULL, NULL, -1); - toplevel = gtk_window_new(GTK_WINDOW_TOPLEVEL); + /* This modifies argv! */ + ui_options = fcmp_parse_cmdline(argc, argv); + + if (ui_options != -1) { + + /* Process GTK arguments */ + gtk_init(&ui_options, &argv); - gtk_widget_realize(toplevel); - gtk_widget_set_name(toplevel, "Freeciv-modpack"); + toplevel = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_signal_connect(toplevel, "delete_event", - G_CALLBACK(quit_dialog_callback), NULL); + gtk_widget_realize(toplevel); + gtk_widget_set_name(toplevel, "Freeciv-modpack"); + gtk_window_set_title(GTK_WINDOW(toplevel), _("Freeciv modpack installer")); - modinst_setup_widgets(toplevel); + /* Keep the icon of the executable on Windows */ +#ifndef WIN32_NATIVE + { + /* Unlike main client, this only works if installed. Ignore any + * errors loading the icon. */ + GError *err; + (void) gtk_window_set_icon_from_file(GTK_WINDOW(toplevel), MPICON_PATH, + &err); + } +#endif /* WIN32_NATIVE */ - gtk_widget_show_all(toplevel); + g_signal_connect(toplevel, "delete_event", + G_CALLBACK(quit_dialog_callback), NULL); - gtk_main(); + modinst_setup_widgets(toplevel); + + gtk_widget_show_all(toplevel); + + gtk_main(); + } return EXIT_SUCCESS; } diff -Nru freeciv-2.3.0/modinst/mpcmdline.c freeciv-2.3.1/modinst/mpcmdline.c --- freeciv-2.3.0/modinst/mpcmdline.c 1970-01-01 00:00:00.000000000 +0000 +++ freeciv-2.3.1/modinst/mpcmdline.c 2011-11-19 20:21:19.000000000 +0000 @@ -0,0 +1,72 @@ +/********************************************************************** + Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold + This program 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, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +***********************************************************************/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +/* utility */ +#include "fciconv.h" +#include "shared.h" +#include "support.h" + +/* common */ +#include "version.h" + +/* modinst */ +#include "mpcmdline.h" + +/************************************************************************** + Parse commandline parameters. Modified argv[] so it contains only + ui-specific options afterwards. Number of those ui-specific options is + returned. + Currently this is implemented in a way that it never fails. Either it + returns with success or exit()s. Implementation can be changhed so that + this returns with value -1 in case program should be shut down instead + of exiting itself. Callers are prepared for such implementation. +**************************************************************************/ +int fcmp_parse_cmdline(int argc, char *argv[]) +{ + int i = 1; + bool ui_separator = FALSE; + int ui_options = 0; + + while (i < argc) { + if (ui_separator) { + argv[1 + ui_options] = argv[i]; + ui_options++; + } else if (is_option("--help", argv[i])) { + fc_fprintf(stderr, _("Usage: %s [option ...]\n" + "Valid option are:\n"), argv[0]); + fc_fprintf(stderr, _(" -h, --help\t\tPrint a summary of the options\n")); + fc_fprintf(stderr, _(" -v, --version\t\tPrint the version number\n")); + fc_fprintf(stderr, _(" --\t\t" + "Pass any following options to the UI.\n")); + + /* TRANS: No full stop after the URL, could cause confusion. */ + fc_fprintf(stderr, _("Report bugs at %s\n"), BUG_URL); + + exit(EXIT_SUCCESS); + } else if (is_option("--version", argv[i])) { + fc_fprintf(stderr, "%s \n", freeciv_name_version()); + + exit(EXIT_SUCCESS); + } else if (is_option("--", argv[i])) { + ui_separator = TRUE; + } + + i++; + } + + return ui_options; +} diff -Nru freeciv-2.3.0/modinst/mpcmdline.h freeciv-2.3.1/modinst/mpcmdline.h --- freeciv-2.3.0/modinst/mpcmdline.h 1970-01-01 00:00:00.000000000 +0000 +++ freeciv-2.3.1/modinst/mpcmdline.h 2011-11-19 20:21:19.000000000 +0000 @@ -0,0 +1,18 @@ +/********************************************************************** + Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold + This program 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, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +***********************************************************************/ +#ifndef FC__MPCMDLINE_H +#define FC__MPCMDLINE_H + +int fcmp_parse_cmdline(int argc, char *argv[]); + +#endif /* FC__MPCMDLINE_H */ Binary files /tmp/KuHlWxdIDv/freeciv-2.3.0/po/ar.gmo and /tmp/e72AxD8Kxk/freeciv-2.3.1/po/ar.gmo differ diff -Nru freeciv-2.3.0/po/ar.po freeciv-2.3.1/po/ar.po --- freeciv-2.3.0/po/ar.po 2011-08-08 04:34:02.000000000 +0000 +++ freeciv-2.3.1/po/ar.po 2011-11-19 20:31:23.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-07 21:34-0700\n" +"POT-Creation-Date: 2011-11-19 20:26+0000\n" "PO-Revision-Date: 2007-08-10 18:00+0300\n" "Last-Translator: Ahmad M. Zawawi \n" "Language-Team: Arabic \n" @@ -26,13 +26,13 @@ msgid "Shield" msgstr "丕賱丿乇毓" -#: common/city.c:83 data/Freeciv.in:3070 data/civ1/techs.ruleset:566 +#: common/city.c:83 data/Freeciv.in:3088 data/civ1/techs.ruleset:566 #: data/civ2/techs.ruleset:733 data/default/techs.ruleset:737 #: data/experimental/techs.ruleset:739 data/multiplayer/techs.ruleset:745 msgid "Trade" msgstr "丕賱鬲噩丕乇丞" -#: common/city.c:84 client/gui-gtk-2.0/editprop.c:4119 +#: common/city.c:84 client/gui-gtk-2.0/editprop.c:4156 #: client/gui-gtk-2.0/repodlgs.c:1250 data/civ1/terrain.ruleset:572 #: data/civ2/terrain.ruleset:586 data/default/terrain.ruleset:694 #: data/experimental/terrain.ruleset:696 data/multiplayer/terrain.ruleset:694 @@ -362,7 +362,7 @@ msgid "Poison" msgstr "鬲爻賲賷賲 賲丿賷賳丞" -#: common/events.c:122 common/events.c:129 data/Freeciv.in:2416 +#: common/events.c:122 common/events.c:129 data/Freeciv.in:2434 msgid "Sabotage" msgstr "鬲禺乇賷亘" @@ -719,78 +719,78 @@ msgid "Experimental" msgstr "鬲噩乇賷亘賷" -#: common/player.c:1082 +#: common/player.c:1097 msgid "?attitude:Genocidal" msgstr "?attitude:丕亘丕丿丞 噩賲丕毓賷丞" -#: common/player.c:1084 +#: common/player.c:1099 msgid "?attitude:Belligerent" msgstr "?attitude:賲賵賱毓 亘丕賱賯鬲丕賱" -#: common/player.c:1086 +#: common/player.c:1101 msgid "?attitude:Hostile" msgstr "?attitude:賲毓丕丿賷" -#: common/player.c:1088 +#: common/player.c:1103 msgid "?attitude:Uncooperative" msgstr "?attitude:睾賷乇 賲鬲毓丕賵賳" -#: common/player.c:1090 +#: common/player.c:1105 msgid "?attitude:Uneasy" msgstr "?attitude:氐毓亘" -#: common/player.c:1092 +#: common/player.c:1107 msgid "?attitude:Neutral" msgstr "?attitude:賲丨丕賷丿" -#: common/player.c:1094 +#: common/player.c:1109 msgid "?attitude:Respectful" msgstr "?attitude:賲丨鬲乇賲" -#: common/player.c:1096 +#: common/player.c:1111 msgid "?attitude:Helpful" msgstr "?attitude:賲鬲毓丕賵賳" -#: common/player.c:1098 +#: common/player.c:1113 msgid "?attitude:Enthusiastic" msgstr "?attitude:賲鬲丨賲爻" -#: common/player.c:1100 +#: common/player.c:1115 msgid "?attitude:Admiring" msgstr "?attitude:賲毓噩亘" -#: common/player.c:1103 +#: common/player.c:1118 msgid "?attitude:Worshipful" msgstr "?attitude:賲亘噩賱" -#: common/player.c:1114 +#: common/player.c:1129 msgid "?diplomatic_state:Armistice" msgstr "?diplomatic_state:賴丿賳丞" -#: common/player.c:1115 +#: common/player.c:1130 msgid "?diplomatic_state:War" msgstr "?diplomatic_state:丨乇亘" -#: common/player.c:1116 client/gui-gtk-2.0/diplodlg.c:402 +#: common/player.c:1131 client/gui-gtk-2.0/diplodlg.c:402 #: client/gui-sdl/diplodlg.c:463 client/gui-xaw/diplodlg.c:546 msgid "?diplomatic_state:Cease-fire" msgstr "?diplomatic_state:賵賯賮 丕胤賱丕賯 丕賱賳丕乇" -#: common/player.c:1117 client/gui-gtk-2.0/diplodlg.c:408 +#: common/player.c:1132 client/gui-gtk-2.0/diplodlg.c:408 #: client/gui-sdl/diplodlg.c:477 client/gui-xaw/diplodlg.c:550 msgid "?diplomatic_state:Peace" msgstr "?diplomatic_state:爻賱丕賲" -#: common/player.c:1118 client/gui-gtk-2.0/diplodlg.c:414 +#: common/player.c:1133 client/gui-gtk-2.0/diplodlg.c:414 #: client/gui-sdl/diplodlg.c:492 client/gui-xaw/diplodlg.c:554 msgid "?diplomatic_state:Alliance" msgstr "?diplomatic_state:賲鬲丨丕賱賮" -#: common/player.c:1119 +#: common/player.c:1134 msgid "?diplomatic_state:Never met" msgstr "?diplomatic_state:賱賲 賷賯丕亘賱 兀亘丿丕" -#: common/player.c:1120 +#: common/player.c:1135 msgid "?diplomatic_state:Team" msgstr "?diplomatic_state:賮乇賷賯" @@ -821,9 +821,9 @@ #. TRANS: "Resources: (none)". #. TRANS: "Conflicts with: (none)" (bases) #: common/requirements.c:1229 common/requirements.c:1283 -#: client/gui-gtk-2.0/helpdlg.c:1099 client/gui-gtk-2.0/helpdlg.c:1193 -#: client/gui-gtk-2.0/inteldlg.c:407 client/gui-xaw/helpdlg.c:1007 -#: client/gui-xaw/helpdlg.c:1092 +#: client/gui-gtk-2.0/helpdlg.c:1098 client/gui-gtk-2.0/helpdlg.c:1192 +#: client/gui-gtk-2.0/inteldlg.c:407 client/gui-xaw/helpdlg.c:1005 +#: client/gui-xaw/helpdlg.c:1090 #, c-format msgid "(none)" msgstr "(賱丕 賷賵噩丿)" @@ -903,9 +903,9 @@ #: client/gui-sdl/gui_tilespec.c:486 client/gui-sdl/helpdlg.c:376 #: client/gui-sdl/helpdlg.c:802 client/gui-sdl/helpdlg.c:828 #: client/gui-sdl/mapview.c:318 client/gui-sdl/mapview.c:335 -#: client/gui-sdl/mapview.c:778 client/gui-xaw/helpdlg.c:818 -#: client/gui-xaw/helpdlg.c:863 client/gui-xaw/helpdlg.c:882 -#: manual/civmanual.c:383 manual/civmanual.c:389 +#: client/gui-sdl/mapview.c:778 client/gui-xaw/helpdlg.c:816 +#: client/gui-xaw/helpdlg.c:861 client/gui-xaw/helpdlg.c:880 +#: manual/civmanual.c:386 manual/civmanual.c:392 msgid "None" msgstr "賱丕 賷賵噩丿" @@ -919,12 +919,12 @@ msgstr "(賲噩賴賵賱)" #: common/terrain.c:483 common/terrain.c:721 common/unit.c:681 -#: manual/civmanual.c:275 +#: manual/civmanual.c:278 msgid "Road" msgstr "胤乇賷賯" #: common/terrain.c:484 common/terrain.c:728 common/unit.c:685 -#: client/gui-xaw/menu.c:156 manual/civmanual.c:275 +#: client/gui-xaw/menu.c:156 manual/civmanual.c:278 msgid "Irrigation" msgstr "丕賱乇賷" @@ -943,9 +943,9 @@ msgid "Hut" msgstr "賰賵禺" -#: common/terrain.c:489 common/unit.c:691 data/civ1/terrain.ruleset:691 -#: data/civ2/terrain.ruleset:803 data/default/terrain.ruleset:911 -#: data/experimental/terrain.ruleset:913 data/multiplayer/terrain.ruleset:911 +#: common/terrain.c:489 common/unit.c:691 data/civ1/terrain.ruleset:693 +#: data/civ2/terrain.ruleset:805 data/default/terrain.ruleset:913 +#: data/experimental/terrain.ruleset:915 data/multiplayer/terrain.ruleset:913 msgid "Fortress" msgstr "丨氐賳" @@ -957,9 +957,9 @@ msgid "Farmland" msgstr "兀乇囟 夭乇丕毓賷丞" -#: common/terrain.c:492 common/unit.c:705 data/civ2/terrain.ruleset:825 -#: data/default/terrain.ruleset:935 data/experimental/terrain.ruleset:937 -#: data/multiplayer/terrain.ruleset:935 +#: common/terrain.c:492 common/unit.c:705 data/civ2/terrain.ruleset:827 +#: data/default/terrain.ruleset:937 data/experimental/terrain.ruleset:939 +#: data/multiplayer/terrain.ruleset:937 msgid "Airbase" msgstr "賯丕毓丿丞 噩賵賷丞" @@ -1000,7 +1000,7 @@ msgid "Pillage" msgstr "丕爻乇賯" -#: common/unit.c:699 data/Freeciv.in:1123 +#: common/unit.c:699 data/Freeciv.in:1141 msgid "Goto" msgstr "丕匕賴亘" @@ -1008,7 +1008,7 @@ msgid "Explore" msgstr "丕爻鬲賰卮賮" -#: common/unit.c:703 manual/civmanual.c:275 +#: common/unit.c:703 manual/civmanual.c:278 msgid "Transform" msgstr "鬲丨賵賱" @@ -1017,7 +1017,7 @@ msgid "Base" msgstr "丕賱賳賮丕賷丞" -#: common/unit.c:717 client/text.c:161 client/gui-gtk-2.0/editprop.c:6092 +#: common/unit.c:717 client/text.c:161 client/gui-gtk-2.0/editprop.c:6129 #: client/gui-gtk-2.0/pages.c:331 client/gui-sdl/citydlg.c:1989 #: client/gui-xaw/citydlg.c:1496 msgid "Unknown" @@ -1034,7 +1034,7 @@ #: common/unit.c:1837 client/text.c:1199 #: client/gui-gtk-2.0/diplomat_dialog.c:89 -#: client/gui-gtk-2.0/diplomat_dialog.c:552 client/gui-gtk-2.0/citydlg.c:2603 +#: client/gui-gtk-2.0/diplomat_dialog.c:552 client/gui-gtk-2.0/citydlg.c:2604 #: client/gui-gtk-2.0/repodlgs.c:1501 client/gui-sdl/citydlg.c:1155 #: client/gui-sdl/diplomat_dialog.c:1140 client/gui-sdl/diplomat_dialog.c:1391 #: client/gui-sdl/repodlgs.c:180 client/gui-xaw/citydlg.c:1961 @@ -1360,7 +1360,7 @@ msgstr[2] " (丕賱賲噩賲賵毓 %d 賲賰乇乇 賲乇丕鬲)" #. TRANS: No full stop after the URL, could cause confusion. -#: utility/log.c:472 utility/netintf.c:83 utility/registry.c:893 +#: utility/log.c:472 utility/netintf.c:91 utility/registry.c:893 #: server/console.c:68 server/generator/startpos.c:397 #: client/agents/cma_core.c:431 client/gui-sdl/mapview.c:159 #, c-format @@ -1495,11 +1495,11 @@ msgstr[1] "丕賱爻噩賱" msgstr[2] "丕賱爻噩賱" -#: utility/shared.c:2171 client/gui-gtk-2.0/editprop.c:848 +#: utility/shared.c:2171 client/gui-gtk-2.0/editprop.c:856 msgid "TRUE" msgstr "" -#: utility/shared.c:2171 client/gui-gtk-2.0/editprop.c:848 +#: utility/shared.c:2171 client/gui-gtk-2.0/editprop.c:856 msgid "FALSE" msgstr "" @@ -1513,12 +1513,12 @@ msgid "error %d (compiled without strerror)" msgstr "禺胤兀 %d (鬲乇噩賲 亘丿賵賳 strerror)" -#: ai/aicity.c:265 server/citytools.c:2370 +#: ai/aicity.c:265 server/citytools.c:2380 #, c-format msgid "The %s have stopped building The %s in %s." msgstr "丕賱 %s 賯丿 鬲賵賯賮 毓賳 亘賳丕亍 丕賱 %s 賮賷 %s." -#: ai/aicity.c:276 server/citytools.c:2408 +#: ai/aicity.c:276 server/citytools.c:2418 #, c-format msgid "The %s have started building The %s in %s." msgstr "丕賱 %s 賯丿 亘丿亍 亘賳丕亍 丕賱 %s 賮賷 %s." @@ -2150,33 +2150,33 @@ "賷鬲賮丕噩卅 丕賱賳丕爻 賮賷 %s 亘丕賲賰丕賳賷丕鬲賰 丕賱鬲賰賳賵賱賵噩賷丞!\n" " 賷賯賵賲 丕賱毓賲丕賱 賱賵丨丿賴賲 亘噩賲毓 賵鬲胤賵賷乇 丕賱賲丿賷賳丞 亘丕賱爻賰賰 丕賱丨丿賷丿賷丞." -#: server/citytools.c:1329 +#: server/citytools.c:1334 #, c-format msgid "You have founded %s." msgstr "賱賯丿 丕賳卮兀鬲 %s." -#: server/citytools.c:1407 +#: server/citytools.c:1412 #, fuzzy, c-format msgid "Moved %s out of disbanded city %s since it cannot stay on %s." msgstr "鬲賲 鬲丨乇賷賰 %s 禺丕乇噩 丕賱賲丿賷賳丞 丕賱賲爻乇丨丞 %s 賱鬲噩賳亘 賯賱丞 丕賱兀乇丕囟賷." -#: server/citytools.c:1420 +#: server/citytools.c:1425 #, c-format msgid "" "When %s was disbanded your %s could not get out, and it was therefore lost." msgstr "毓賳丿賲丕 鬲賲 鬲爻乇賷丨 %s 丕賱 %s 賱賲 鬲爻鬲胤毓 丕賱禺乇賵噩貙 賵賱賴匕丕 賮賯丿鬲." -#: server/citytools.c:1576 +#: server/citytools.c:1586 #, c-format msgid "You destroy %s completely." msgstr "賱賯丿 丿賲乇鬲 %s 賰賱賷丕." -#: server/citytools.c:1579 +#: server/citytools.c:1589 #, c-format msgid "%s has been destroyed by %s." msgstr "丿賲乇鬲 %s 賲賳 賯亘賱 %s." -#: server/citytools.c:1605 +#: server/citytools.c:1615 #, c-format msgid "You conquer %s; your lootings accumulate to %d gold!" msgid_plural "You conquer %s; your lootings accumulate to %d gold!" @@ -2184,7 +2184,7 @@ msgstr[1] "賱賯丿 丕丨鬲賱賱鬲 %s; 鬲乇丕賰賲鬲 睾賳丕卅賲 賳賴亘賰 廿賱賶 %d 匕賴亘!" msgstr[2] "賱賯丿 丕丨鬲賱賱鬲 %s; 鬲乇丕賰賲鬲 睾賳丕卅賲 賳賴亘賰 廿賱賶 %d 匕賴亘!" -#: server/citytools.c:1612 +#: server/citytools.c:1622 #, c-format msgid "%s conquered %s and looted %d gold from the city." msgid_plural "%s conquered %s and looted %d gold from the city." @@ -2192,17 +2192,17 @@ msgstr[1] "丕丨鬲賱 %s 賲丿賷賳丞 %s 賵賳賴亘 %d 賲賳 丕賱匕賴亘 賲賳賴丕." msgstr[2] "丕丨鬲賱 %s 賲丿賷賳丞 %s 賵賳賴亘 %d 賲賳 丕賱匕賴亘 賲賳賴丕." -#: server/citytools.c:1621 +#: server/citytools.c:1631 #, fuzzy, c-format msgid "You conquer %s." msgstr "賱賯丿 丕丨鬲賱賱鬲 %s" -#: server/citytools.c:1624 +#: server/citytools.c:1634 #, c-format msgid "%s conquered %s." msgstr "%s 丕丨鬲賱 %s." -#: server/citytools.c:1631 +#: server/citytools.c:1641 #, c-format msgid "You have liberated %s! Lootings accumulate to %d gold." msgid_plural "You have liberated %s! Lootings accumulate to %d gold." @@ -2210,7 +2210,7 @@ msgstr[1] "賱賯丿 丨乇乇鬲 %s! 鬲乇丕賰賲鬲 睾賳丕卅賲 丕賱賳賴亘 廿賱賶 %d 匕賴亘." msgstr[2] "賱賯丿 丨乇乇鬲 %s! 鬲乇丕賰賲鬲 睾賳丕卅賲 丕賱賳賴亘 廿賱賶 %d 匕賴亘." -#: server/citytools.c:1638 +#: server/citytools.c:1648 #, c-format msgid "%s liberated %s and looted %d gold from the city." msgid_plural "%s liberated %s and looted %d gold from the city." @@ -2218,27 +2218,27 @@ msgstr[1] "丨乇乇 %s 賲丿賷賳丞 %s 賵賳賴亘 %d 賲賳 丕賱匕賴亘 賲賳賴丕." msgstr[2] "丨乇乇 %s 賲丿賷賳丞 %s 賵賳賴亘 %d 賲賳 丕賱匕賴亘 賲賳賴丕." -#: server/citytools.c:1647 +#: server/citytools.c:1657 #, c-format msgid "You have liberated %s!" msgstr "賱賯丿 丨乇乇鬲 %s!" -#: server/citytools.c:1650 +#: server/citytools.c:1660 #, c-format msgid "%s liberated %s." msgstr "%s 丨乇乇 %s." -#: server/citytools.c:2387 +#: server/citytools.c:2397 msgid " from the worklist" msgstr " 賲賳 賯丕卅賲丞 丕賱毓賲賱" #. TRANS: " is building ." -#: server/citytools.c:2399 +#: server/citytools.c:2409 #, c-format msgid "%s is building %s%s." msgstr "%s 賷亘賳賷 %s%s." -#: server/citytools.c:2565 +#: server/citytools.c:2575 #, fuzzy, c-format msgid "You sell %s in %s (now landlocked) for %d gold." msgid_plural "You sell %s in %s (now landlocked) for %d gold." @@ -2246,17 +2246,17 @@ msgstr[1] "賱賯丿 亘毓鬲 %s 賮賷 %s (丕锘蒂 賲丨丕胤 亘丕賱賷丕亘爻丞) 亘 %d 匕賴亘." msgstr[2] "賱賯丿 亘毓鬲 %s 賮賷 %s (丕锘蒂 賲丨丕胤 亘丕賱賷丕亘爻丞) 亘 %d 匕賴亘." -#: server/citytools.c:2698 +#: server/citytools.c:2708 #, fuzzy, c-format msgid "The size of the city map of %s is %s." msgstr "丕賱 %s 賲賳 %s (%s)" -#: server/citytools.c:2700 +#: server/citytools.c:2710 #, fuzzy msgid "increased" msgstr "賯丕毓丿丞 噩賵賷丞" -#: server/citytools.c:2701 +#: server/citytools.c:2711 msgid "reduced" msgstr "" @@ -2657,7 +2657,7 @@ msgid "Failed to ignore SIGPIPE: %s\n" msgstr "" -#: server/civserver.c:215 client/client_main.c:356 manual/civmanual.c:439 +#: server/civserver.c:215 client/client_main.c:356 manual/civmanual.c:442 #, fuzzy, c-format msgid "Invalid signal number \"%s\".\n" msgstr "丕爻賲 丕賱賲爻鬲禺丿賲 睾賷乇 氐丨賷丨 '%s'" @@ -2688,7 +2688,7 @@ msgid "You can learn a lot about Freeciv at %s" msgstr "賷賲賰賳賰 鬲毓賱賲 丕賱賰孬賷乇 毓賳 亘乇賳丕賲噩 Freeciv 毓賱賶 %s" -#: server/civserver.c:314 client/client_main.c:300 manual/civmanual.c:473 +#: server/civserver.c:314 client/client_main.c:300 manual/civmanual.c:476 #, c-format msgid "" "Usage: %s [option ...]\n" @@ -2722,7 +2722,7 @@ msgid " -b --bind ADDR\tListen for clients on ADDR\n" msgstr " -b --bind ADDR\t丕賳鬲馗丕乇 丕賱毓賲賱丕亍 毓賱賶 丕賱毓賳賵丕賳 ADDR\n" -#: server/civserver.c:326 client/client_main.c:305 manual/civmanual.c:475 +#: server/civserver.c:326 client/client_main.c:305 manual/civmanual.c:478 #, fuzzy, c-format msgid "" " -d, --debug NUM\tSet debug log level (%d to %d, or %d:file1,min,max:...)\n" @@ -2730,12 +2730,12 @@ " -d, --debug NUM\t鬲丨丿賷丿 賲爻鬲賵賶 爻噩賱 丕賱鬲賳賯賷丨 (0 廿賱賶 4, 兀賵 4:file1,min," "max:...)\n" -#: server/civserver.c:330 client/client_main.c:309 manual/civmanual.c:479 +#: server/civserver.c:330 client/client_main.c:309 manual/civmanual.c:482 #, fuzzy, c-format msgid " -d, --debug NUM\tSet debug log level (%d to %d)\n" msgstr " -d, --debug NUM\t鬲丨丿賷丿 賲爻鬲賵賶 爻噩賱 丕賱鬲賳賯賷丨 (0 廿賱賶 3)\n" -#: server/civserver.c:334 client/client_main.c:313 manual/civmanual.c:483 +#: server/civserver.c:334 client/client_main.c:313 manual/civmanual.c:486 msgid " -F, --Fatal [SIGNAL]\tRaise a signal on failed assertion\n" msgstr "" @@ -2743,7 +2743,8 @@ msgid " -f, --file FILE\tLoad saved game FILE\n" msgstr " -f, --file FILE\t鬲丨賲賷賱 丕賱賱毓亘丞 丕賱賲丨賮賵馗丞 賮賷 FILE\n" -#: server/civserver.c:339 client/client_main.c:317 manual/civmanual.c:486 +#: server/civserver.c:339 client/client_main.c:317 manual/civmanual.c:489 +#: modinst/mpcmdline.c:51 msgid " -h, --help\t\tPrint a summary of the options\n" msgstr " -h, --help\t\t胤亘丕毓丞 賲賱禺氐 毓賳 丕賱禺賷丕乇丕鬲\n" @@ -2752,7 +2753,7 @@ msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n" msgstr " -M, --Metaserver ADDR\t鬲丨丿賷丿 ADDR 賰毓賳賵丕賳 metaserver\n" -#: server/civserver.c:341 manual/civmanual.c:487 +#: server/civserver.c:341 manual/civmanual.c:490 msgid " -l, --log FILE\tUse FILE as logfile\n" msgstr " -l, --log FILE\t丕爻鬲毓賲丕賱 賲賱賮 FILE 賰賲賱賮 丕賱爻噩賱\n" @@ -2797,14 +2798,15 @@ msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n" msgstr " -R, --Ranklog FILE\t丕爻鬲毓賲丕賱 FILE 賰賲賱賮 爻噩賱 鬲氐賳賷賮 丕賱乇鬲亘\n" -#: server/civserver.c:362 client/client_main.c:336 manual/civmanual.c:490 +#: server/civserver.c:362 client/client_main.c:336 manual/civmanual.c:493 +#: modinst/mpcmdline.c:52 msgid " -v, --version\t\tPrint the version number\n" msgstr " -v, --version\t\t胤亘丕毓丞 乇賯賲 丕氐丿丕乇丞 丕賱亘乇賳丕賲噩\n" #. TRANS: No full stop after the URL, could cause confusion. #: server/civserver.c:364 client/client_main.c:342 #: client/gui-gtk-2.0/gui_main.c:277 client/gui-sdl/gui_main.c:179 -#: client/gui-xaw/gui_main.c:251 manual/civmanual.c:492 +#: client/gui-xaw/gui_main.c:251 manual/civmanual.c:495 modinst/mpcmdline.c:57 #, fuzzy, c-format msgid "Report bugs at %s\n" msgstr "丕乇爻賱 鬲賯丕乇賷乇 丕賱賲卮丕賰賱 廿賱賶 <%s>.\n" @@ -3134,46 +3136,50 @@ msgid "Take over a player's place in the game." msgstr "丕賱丕爻鬲賷賱丕亍 毓賱賶 賲賰丕賳 賱丕毓亘 賮賷 丕賱賱毓亘丞." -#: server/commands.c:265 +#. TRANS: Don't translate text between '' +#: server/commands.c:266 #, fuzzy msgid "" "Only the console and connections with cmdlevel 'hack' can force other " "connections to take over a player. If you're not one of these, only the " " argument is allowed. If '-' is given for the player name and " "the connection does not already control a player, one is created and " -"assigned to the connection." +"assigned to the connection. The 'allowtake' option controls which players " +"may be taken and in what circumstances." msgstr "賮賯胤 賲毓 廿匕丕 廿匕丕." #. TRANS: translate text between [] only -#: server/commands.c:274 +#: server/commands.c:276 msgid "observe [connection-name] [player-name]" msgstr "observe [丕爻賲 丕賱丕鬲氐丕賱] [丕爻賲 丕賱賱丕毓亘]" -#: server/commands.c:275 +#: server/commands.c:277 msgid "Observe a player or the whole game." msgstr "賲乇丕賯亘丞 賱丕毓亘 兀賵 賰賱 丕賱賱毓賷丞." -#: server/commands.c:276 +#. TRANS: Don't translate text between '' +#: server/commands.c:279 #, fuzzy msgid "" "Only the console and connections with cmdlevel 'hack' can force other " "connections to observe a player. If you're not one of these, only the " "[player-name] argument is allowed. If the console gives no player-name or " "the connection uses no arguments, then the connection is attached to a " -"global observer." +"global observer. The 'allowtake' option controls which players may be " +"observed and in what circumstances." msgstr "賮賯胤 賲毓 廿匕丕 廿匕丕." #. TRANS: translate text between <> only -#: server/commands.c:285 +#: server/commands.c:289 msgid "detach " msgstr "detach <丕爻賲 丕賱丕鬲氐丕賱>" -#: server/commands.c:286 +#: server/commands.c:290 #, fuzzy msgid "Detach from a player." msgstr "丕賱丕賳賮氐丕賱 毓賳 賱丕毓亘." -#: server/commands.c:287 +#: server/commands.c:291 #, fuzzy msgid "" "Only the console and connections with cmdlevel 'hack' can force other " @@ -3181,15 +3187,15 @@ msgstr "賮賯胤 賲毓." #. TRANS: translate text between <> only -#: server/commands.c:293 +#: server/commands.c:297 msgid "create " msgstr "create <丕爻賲 丕賱賱丕毓亘>" -#: server/commands.c:294 +#: server/commands.c:298 msgid "Create an AI player with a given name." msgstr "丕賳卮丕亍 賱丕毓亘 匕.丕 亘丕爻賲 賲毓胤賶." -#: server/commands.c:295 +#: server/commands.c:299 msgid "" "With the 'create' command a new player with the given name is created.\n" "If the game was started, the command checks for free player slots and, if no " @@ -3197,16 +3203,16 @@ "new player has no units or cities." msgstr "" -#: server/commands.c:305 +#: server/commands.c:309 msgid "Set yourself in away mode. The AI will watch your back." msgstr "賵囟毓 賳賮爻賰 賮賷 賳賲胤 away. 爻賷丨賲賷 丕賱匕賰丕亍 丕賱丕氐胤賳丕毓賷 馗賴乇賰." -#: server/commands.c:306 +#: server/commands.c:310 msgid "The AI will govern your nation but do minimal changes." msgstr "爻賷丨賰賲 丕賱 匕.丕 兀賲鬲賰 賵賱賰賳賴 爻賷賮毓賱 鬲睾賷賷乇丕鬲 亘爻賷胤丞." #. TRANS: translate text between <> only -#: server/commands.c:311 +#: server/commands.c:315 msgid "" "novice\n" "novice " @@ -3214,11 +3220,11 @@ "novice\n" "novice <丕爻賲 丕賱賱丕毓亘>" -#: server/commands.c:313 +#: server/commands.c:317 msgid "Set one or all AI players to 'novice'." msgstr "賵囟毓 賱丕毓亘 兀賵 賰賱 賱丕毓亘賷 匕.丕 廿賱賶 賲爻鬲賵賶 '賲亘鬲丿卅'." -#: server/commands.c:314 +#: server/commands.c:318 #, fuzzy msgid "" "With no arguments, sets all AI players to skill level 'novice', and sets the " @@ -3227,7 +3233,7 @@ msgstr "賲毓 匕賰丕亍 丕氐胤賳丕毓賷 賲亘鬲丿卅 噩丿賷丿 匕賰丕亍 丕氐胤賳丕毓賷 賲亘鬲丿卅 賲毓." #. TRANS: translate text between <> only -#: server/commands.c:321 +#: server/commands.c:325 msgid "" "easy\n" "easy " @@ -3235,11 +3241,11 @@ "easy\n" "easy <丕爻賲 丕賱賱丕毓亘>" -#: server/commands.c:323 +#: server/commands.c:327 msgid "Set one or all AI players to 'easy'." msgstr "賵囟毓 賱丕毓亘 兀賵 賰賱 賱丕毓亘賷 匕.丕 廿賱賶 賲爻鬲賵賶 '爻賴賱'." -#: server/commands.c:324 +#: server/commands.c:328 #, fuzzy msgid "" "With no arguments, sets all AI players to skill level 'easy', and sets the " @@ -3248,7 +3254,7 @@ msgstr "賲毓 匕賰丕亍 丕氐胤賳丕毓賷 爻賴賱 噩丿賷丿 匕賰丕亍 丕氐胤賳丕毓賷 爻賴賱 賲毓." #. TRANS: translate text between <> only -#: server/commands.c:331 +#: server/commands.c:335 msgid "" "normal\n" "normal " @@ -3256,11 +3262,11 @@ "normal\n" "normal <丕爻賲 丕賱賱丕毓亘>" -#: server/commands.c:333 +#: server/commands.c:337 msgid "Set one or all AI players to 'normal'." msgstr "賵囟毓 賱丕毓亘 兀賵 賰賱 賱丕毓亘賷 匕.丕 廿賱賶 賲爻鬲賵賶 '毓丕丿賷'." -#: server/commands.c:334 +#: server/commands.c:338 #, fuzzy msgid "" "With no arguments, sets all AI players to skill level 'normal', and sets the " @@ -3269,7 +3275,7 @@ msgstr "賲毓 匕賰丕亍 丕氐胤賳丕毓賷 毓丕丿賷 噩丿賷丿 匕賰丕亍 丕氐胤賳丕毓賷 毓丕丿賷 賲毓." #. TRANS: translate text between <> only -#: server/commands.c:341 +#: server/commands.c:345 msgid "" "hard\n" "hard " @@ -3277,11 +3283,11 @@ "hard\n" "hard <丕爻賲 丕賱賱丕毓亘>" -#: server/commands.c:343 +#: server/commands.c:347 msgid "Set one or all AI players to 'hard'." msgstr "賵囟毓 賱丕毓亘 兀賵 賰賱 賱丕毓亘賷 匕.丕 廿賱賶 賲爻鬲賵賶 '氐毓亘'." -#: server/commands.c:344 +#: server/commands.c:348 #, fuzzy msgid "" "With no arguments, sets all AI players to skill level 'hard', and sets the " @@ -3290,19 +3296,19 @@ msgstr "賲毓 匕賰丕亍 丕氐胤賳丕毓賷 氐毓亘 噩丿賷丿 匕賰丕亍 丕氐胤賳丕毓賷 氐毓亘 賲毓." #. TRANS: translate text between <> only -#: server/commands.c:351 +#: server/commands.c:355 #, fuzzy msgid "" "cheating\n" "cheating " msgstr "create <丕爻賲 丕賱賱丕毓亘>" -#: server/commands.c:353 +#: server/commands.c:357 #, fuzzy msgid "Set one or all AI players to 'cheating'." msgstr "賵囟毓 賱丕毓亘 兀賵 賰賱 賱丕毓亘賷 匕.丕 廿賱賶 賲爻鬲賵賶 '爻賴賱'." -#: server/commands.c:354 +#: server/commands.c:358 #, fuzzy msgid "" "With no arguments, sets all AI players to skill level 'cheating', and sets " @@ -3313,7 +3319,7 @@ "賲賳馗賾賲丞 丕賱毓賮賵 丕賱丿賾賵賱賷賾丞 爻賴賱 賲毓." #. TRANS: translate text between <> only -#: server/commands.c:361 +#: server/commands.c:365 msgid "" "experimental\n" "experimental " @@ -3321,11 +3327,11 @@ "experimental\n" "experimental <丕爻賲 丕賱賱丕毓亘>" -#: server/commands.c:363 +#: server/commands.c:367 msgid "Set one or all AI players to 'experimental'." msgstr "賵囟毓 賱丕毓亘 兀賵 賰賱 賱丕毓亘賷 匕.丕 廿賱賶 賲爻鬲賵賶 '鬲噩乇賷亘賷'." -#: server/commands.c:364 +#: server/commands.c:368 #, fuzzy msgid "" "With no arguments, sets all AI players to skill 'experimental', and sets the " @@ -3335,7 +3341,7 @@ msgstr "賲毓 匕賰丕亍 丕氐胤賳丕毓賷 鬲噩乇賷亘賷 噩丿賷丿 匕賰丕亍 丕氐胤賳丕毓賷 賲毓 匕賰丕亍 丕氐胤賳丕毓賷 賱賭." #. TRANS: translate text between <> only -#: server/commands.c:373 +#: server/commands.c:377 msgid "" "cmdlevel\n" "cmdlevel \n" @@ -3349,11 +3355,11 @@ "cmdlevel <丕賱賲爻鬲賵賶> first\n" "cmdlevel <丕賱賲爻鬲賵賶> <丕爻賲 丕賱丕鬲氐丕賱>" -#: server/commands.c:378 +#: server/commands.c:382 msgid "Query or set command access level access." msgstr "丕賱廿爻鬲賮爻丕乇 兀賵 鬲丨丿賷丿 賲爻鬲賵賶 氐賱丕丨賷丞 丕賱兀賵丕賲乇." -#: server/commands.c:379 +#: server/commands.c:383 #, fuzzy msgid "" "The command access level controls which server commands are available to " @@ -3382,20 +3388,20 @@ "\n" " 噩丿賷丿 賲毓 丕賱賲賱丕丨馗丞." -#: server/commands.c:405 +#: server/commands.c:409 msgid "If there is none, become the game organizer with increased permissions." msgstr "廿匕丕 賱賲 賷賰賳 賴賳丕賰 兀丨丿 貙 爻鬲氐亘丨 賲賳馗賲 丕賱賱毓亘丞 賲毓 氐賱丕丨賷丕鬲 兀賰孬乇." #. TRANS: translate text between <> only -#: server/commands.c:411 +#: server/commands.c:415 msgid "timeoutincrease " msgstr "timeoutincrease <丕賱丿賵乇> <夭賷丕丿丞 丕賱丿賵乇> <丕賱賯賷賲丞> <賲囟丕毓賮 丕賱賯賷賲丞>" -#: server/commands.c:412 +#: server/commands.c:416 msgid "See \"help timeoutincrease\"." msgstr "丕賳馗乇 \"help timeoutincrease\"." -#: server/commands.c:413 +#: server/commands.c:417 #, fuzzy msgid "" "Every turns, add to timeout timer, then add to " @@ -3405,7 +3411,7 @@ "賰賱賾 兀丿賵丕乇 丕賱廿爻鬲毓賲丕賱 賲毓 丕賱鬲賯氐賷乇丕鬲" #. TRANS: translate text between <> only; "vote" is as a process -#: server/commands.c:420 +#: server/commands.c:424 msgid "" "cancelvote\n" "cancelvote \n" @@ -3413,12 +3419,12 @@ msgstr "" #. TRANS: "vote" as a process -#: server/commands.c:424 +#: server/commands.c:428 msgid "Cancel a running vote.\n" msgstr "" #. TRANS: "vote" as a process -#: server/commands.c:426 +#: server/commands.c:430 msgid "" "With no arguments this command removes your own vote. If you have an admin " "access level, you can cancel any vote by vote number, or all votes with the " @@ -3426,54 +3432,54 @@ msgstr "" #. TRANS: translate text between <> and [] only -#: server/commands.c:433 +#: server/commands.c:437 msgid "ignore [type=]" msgstr "" -#: server/commands.c:434 +#: server/commands.c:438 msgid "Block all messages from users matching the pattern." msgstr "" -#: server/commands.c:435 +#: server/commands.c:439 msgid "" "The given pattern will be added to your ignore list; you will not receive " -"any messages from this users matching this pattern. The type may be either " -"\"user\", \"host\", or \"ip\". The default type (if ommited) is to match " -"against the username. The pattern supports unix glob style wildcards, i.e. * " +"any messages from users matching this pattern. The type may be either \"user" +"\", \"host\", or \"ip\". The default type (if omitted) is to match against " +"the username. The pattern supports unix glob style wildcards, i.e., * " "matches zero or more character, ? exactly one character, [abc] exactly one " "of 'a' 'b' or 'c', etc. To access your current ignore list, issue \"/list " "ignore\"." msgstr "" #. TRANS: translate text between <> -#: server/commands.c:446 +#: server/commands.c:450 msgid "unignore " msgstr "" -#: server/commands.c:447 +#: server/commands.c:451 #, fuzzy msgid "Remove ignore list entries." msgstr "丨匕賮 鬲噩賴賷夭 賲爻亘賯" -#: server/commands.c:448 +#: server/commands.c:452 msgid "" "The ignore list entries in the given range will be removed; you will be able " "to receive messages from the respective users. The range argument may be a " "single number or a pair of numbers separated by a dash '-'. If the first " -"number is ommitted, it is assumed to be 1, if the last is ommitted, it is " +"number is omitted, it is assumed to be 1; if the last is omitted, it is " "assumed to be the last valid ignore list index. To access your current " "ignore list, issue \"/list ignore\"." msgstr "" -#: server/commands.c:460 +#: server/commands.c:464 msgid "End the game immediately in a draw." msgstr "丕賱禺乇賵噩 賲賳 丕賱賱毓亘丞 賮賵乇丕 亘鬲毓丕丿賱." -#: server/commands.c:466 +#: server/commands.c:470 msgid "Concede the game." msgstr "禺爻丕乇丞 丕賱賱毓亘丞." -#: server/commands.c:467 +#: server/commands.c:471 #, fuzzy msgid "" "This tells everyone else that you concede the game, and if all but one " @@ -3481,15 +3487,15 @@ msgstr "賴匕丕." #. TRANS: translate text between <> only -#: server/commands.c:474 +#: server/commands.c:478 msgid "remove " msgstr "remove <丕爻賲 丕賱賱丕毓亘>" -#: server/commands.c:475 +#: server/commands.c:479 msgid "Fully remove player from game." msgstr "廿夭丕賱丞 丕賱賱丕毓亘 賲賳 丕賱賱毓亘丞 亘卮賰賱 賰丕賲賱." -#: server/commands.c:476 +#: server/commands.c:480 #, fuzzy msgid "" "This *completely* removes a player from the game, including all cities and " @@ -3497,7 +3503,7 @@ msgstr "賴匕丕 丕賱廿爻鬲毓賲丕賱 賲毓!" #. TRANS: translate text between <> only -#: server/commands.c:482 +#: server/commands.c:486 msgid "" "save\n" "save " @@ -3505,11 +3511,11 @@ "save\n" "save <丕爻賲 丕賱賲賱賮>" -#: server/commands.c:484 +#: server/commands.c:488 msgid "Save game to file." msgstr "丨賮馗 丕賱賱毓賷丞 毓賱賶 賲賱賮." -#: server/commands.c:485 +#: server/commands.c:489 #, fuzzy msgid "" "Save the current game to file . If no file-name argument is given " @@ -3522,7 +3528,7 @@ "." #. TRANS: translate text between <> only -#: server/commands.c:495 +#: server/commands.c:499 msgid "" "load\n" "load " @@ -3530,11 +3536,11 @@ "load\n" "load <丕爻賲 丕賱賲賱賮>" -#: server/commands.c:497 +#: server/commands.c:501 msgid "Load game from file." msgstr "鬲丨賲賷賱 丕賱賱毓亘丞 賲賳 賲賱賮." -#: server/commands.c:498 +#: server/commands.c:502 #, fuzzy msgid "" "Load a game from . Any current data including players, rulesets " @@ -3544,29 +3550,29 @@ "賲噩賲賵毓丕鬲 丕賱賯賵丕毓丿 賵禺賷丕乇丕鬲 丕賱禺丕丿賲.\n" #. TRANS: translate text between <> only -#: server/commands.c:504 +#: server/commands.c:508 msgid "read " msgstr "read <丕爻賲 丕賱賲賱賮>" -#: server/commands.c:505 +#: server/commands.c:509 msgid "Process server commands from file." msgstr "賯乇丕亍丞 賵 鬲賳賮賷丿 兀賵丕賲乇 丕賱禺丕丿賲 賲賳 賲賱賮." #. TRANS: translate text between <> only -#: server/commands.c:510 +#: server/commands.c:514 msgid "write " msgstr "write <丕爻賲 丕賱賲賱賮>" -#: server/commands.c:511 +#: server/commands.c:515 msgid "Write current settings as server commands to file." msgstr "賰鬲丕亘丞 丕賱丕毓丿丕丿丕鬲 丕賱丨丕賱賷丞 賰兀賵丕賲乇 賱賱禺丕丿賲 毓賱賶 賲賱賮." -#: server/commands.c:517 +#: server/commands.c:521 #, fuzzy msgid "Reset all server settings." msgstr "鬲丨丿賷丿 禺賷丕乇 丕賱禺丕丿賲." -#: server/commands.c:518 +#: server/commands.c:522 msgid "" "Reset all settings if it is possible. The following levels are supported:\n" " game - using the values defined at the game start\n" @@ -3576,36 +3582,36 @@ msgstr "" #. TRANS: translate text between <> only -#: server/commands.c:528 +#: server/commands.c:532 msgid "lua