diff -Nru gmchess-0.29.4/aclocal.m4 gmchess-0.29.6/aclocal.m4 --- gmchess-0.29.4/aclocal.m4 2011-02-27 05:10:16.000000000 +0000 +++ gmchess-0.29.6/aclocal.m4 2011-11-28 12:23:35.000000000 +0000 @@ -260,6 +260,10 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -649,8 +653,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -659,8 +663,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -794,6 +798,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -1279,7 +1285,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -1443,6 +1449,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -1464,6 +1471,29 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -1494,6 +1524,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -1596,7 +1630,13 @@ $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 + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1604,6 +1644,7 @@ 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 @@ -1615,6 +1656,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -1632,7 +1674,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1677,8 +1721,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1689,6 +1733,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1972,14 +2018,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*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" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -2056,13 +2115,13 @@ 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 -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -2242,6 +2301,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + 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 @@ -2281,7 +2345,7 @@ # 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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2827,7 +2891,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2836,7 +2900,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2901,7 +2965,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -3040,7 +3104,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -3048,10 +3112,6 @@ 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. @@ -3059,7 +3119,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -3077,7 +3137,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -3097,17 +3157,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -3168,7 +3229,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -3184,7 +3245,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -3221,9 +3282,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3286,7 +3347,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3355,7 +3416,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3380,7 +3441,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3404,7 +3465,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3435,7 +3496,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -3445,7 +3506,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3867,7 +3928,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -4287,6 +4348,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4871,7 +4933,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4963,18 +5027,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # 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)='' ;; + *Sun\ F* | *Sun*Fortran*) + _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 ' + ;; *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,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -5134,7 +5213,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -5159,7 +5240,6 @@ _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 @@ -5410,8 +5490,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_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~ @@ -5706,6 +5785,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _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' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5752,10 +5832,6 @@ _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 @@ -5768,7 +5844,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + 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 @@ -5807,7 +5883,6 @@ 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 @@ -6249,9 +6324,6 @@ _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], @@ -6405,7 +6477,6 @@ _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 @@ -6775,7 +6846,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -7536,12 +7607,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7738,7 +7815,6 @@ _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 @@ -7871,7 +7947,6 @@ _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 @@ -8054,6 +8129,73 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# 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_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go 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 +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +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 +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -8123,6 +8265,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -8787,9 +8936,24 @@ # 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], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) @@ -8961,15 +9125,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -9134,7 +9298,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -9180,7 +9345,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -9228,9 +9394,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -9254,7 +9420,7 @@ _PKG_TEXT -To get pkg-config, see .])dnl +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff -Nru gmchess-0.29.4/configure gmchess-0.29.6/configure --- gmchess-0.29.4/configure 2011-02-27 05:10:20.000000000 +0000 +++ gmchess-0.29.6/configure 2011-11-28 12:23:37.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gmchess 0.29.4. +# Generated by GNU Autoconf 2.68 for gmchess 0.29.6. # # Report bugs to . # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='gmchess' PACKAGE_TARNAME='gmchess' -PACKAGE_VERSION='0.29.4' -PACKAGE_STRING='gmchess 0.29.4' +PACKAGE_VERSION='0.29.6' +PACKAGE_STRING='gmchess 0.29.6' PACKAGE_BUGREPORT='lerosua@gmail.com' PACKAGE_URL='' @@ -1350,7 +1350,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 gmchess 0.29.4 to adapt to many kinds of systems. +\`configure' configures gmchess 0.29.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1420,7 +1420,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gmchess 0.29.4:";; + short | recursive ) echo "Configuration of gmchess 0.29.6:";; esac cat <<\_ACEOF @@ -1440,7 +1440,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1534,7 +1534,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gmchess configure 0.29.4 +gmchess configure 0.29.6 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2205,7 +2205,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gmchess $as_me 0.29.4, which was +It was created by gmchess $as_me 0.29.6, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3023,7 +3023,7 @@ # Define the identity of the package. PACKAGE=gmchess - VERSION=0.29.4 + VERSION=0.29.6 cat >>confdefs.h <<_ACEOF @@ -4611,8 +4611,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -5457,6 +5457,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + 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 @@ -5496,7 +5501,7 @@ # 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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -5925,7 +5930,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -6565,13 +6570,13 @@ 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 -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -6718,6 +6723,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -7106,7 +7112,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -7117,7 +7123,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7757,7 +7776,13 @@ $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 + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7768,6 +7793,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -7800,6 +7826,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -7821,7 +7848,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8226,7 +8255,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8304,6 +8348,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -8759,7 +8807,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -8850,18 +8900,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -9223,7 +9288,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9473,8 +9537,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -9853,6 +9916,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -9898,6 +9962,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -9926,10 +9991,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=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 @@ -9942,7 +10003,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -9981,7 +10042,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10605,11 +10665,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10699,7 +10754,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10708,7 +10763,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10773,7 +10828,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -10912,7 +10967,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10920,10 +10975,6 @@ 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. @@ -10931,7 +10982,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10949,7 +11000,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10969,17 +11020,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -11040,7 +11092,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -11056,7 +11108,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -11093,9 +11145,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11177,7 +11229,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -11246,7 +11298,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11271,7 +11323,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -11295,7 +11347,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -11326,7 +11378,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11336,7 +11388,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -12118,6 +12170,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -12678,7 +12732,6 @@ 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 @@ -13262,6 +13315,7 @@ hardcode_shlibpath_var_CXX=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec_CXX='' fi @@ -13306,7 +13360,7 @@ esac ;; - freebsd[12]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -13982,6 +14036,7 @@ case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -14771,7 +14826,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' @@ -14924,8 +14981,6 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -14951,7 +15006,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -14960,7 +15015,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -15025,7 +15080,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -15162,7 +15217,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -15170,10 +15225,6 @@ 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. @@ -15181,7 +15232,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -15199,7 +15250,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -15219,17 +15270,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -15290,7 +15342,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -15306,7 +15358,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -15343,9 +15395,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15427,7 +15479,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -15496,7 +15548,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15521,7 +15573,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -15545,7 +15597,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -15576,7 +15628,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -15586,7 +15638,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -16527,6 +16579,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -16655,6 +16708,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16671,6 +16725,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16690,9 +16745,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$pkg_modules" 2>&1` + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$pkg_modules" 2>&1` else - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$pkg_modules" 2>&1` + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$pkg_modules" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PACKAGE_PKG_ERRORS" >&5 @@ -17829,6 +17884,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -18499,7 +18558,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gmchess $as_me 0.29.4, which was +This file was extended by gmchess $as_me 0.29.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18565,7 +18624,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gmchess config.status 0.29.4 +gmchess config.status 0.29.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -18702,6 +18761,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -18784,7 +18844,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -18856,7 +18915,6 @@ allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' @@ -18895,6 +18953,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -18945,7 +19004,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -18979,7 +19037,6 @@ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ @@ -19803,8 +19860,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -19858,6 +19915,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -20159,10 +20219,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# 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 - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -20505,10 +20561,6 @@ # 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 diff -Nru gmchess-0.29.4/configure.in gmchess-0.29.6/configure.in --- gmchess-0.29.4/configure.in 2011-01-02 03:57:29.000000000 +0000 +++ gmchess-0.29.6/configure.in 2011-11-28 12:22:56.000000000 +0000 @@ -2,10 +2,10 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT(gmchess, 0.29.4, lerosua@gmail.com) +AC_INIT(gmchess, 0.29.6, lerosua@gmail.com) AC_CONFIG_SRCDIR([src/Pgnfile.cc]) AM_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE(gmchess,0.29.4) +AM_INIT_AUTOMAKE(gmchess,0.29.6) IT_PROG_INTLTOOL([0.35.0]) diff -Nru gmchess-0.29.4/data/confwin.glade gmchess-0.29.6/data/confwin.glade --- gmchess-0.29.4/data/confwin.glade 2011-10-15 03:26:57.000000000 +0000 +++ gmchess-0.29.6/data/confwin.glade 2011-10-25 14:25:34.000000000 +0000 @@ -120,6 +120,68 @@ 3 + + + True + False + True + + + True + False + trace line color + + + True + True + 0 + + + + + True + False + + + False + True + True + True + False + #191989896464 + + + True + True + 0 + + + + + True + True + 1 + + + + + True + False + + + + True + True + 2 + + + + + True + True + 4 + + diff -Nru gmchess-0.29.4/data/gmchess.glade gmchess-0.29.6/data/gmchess.glade --- gmchess-0.29.4/data/gmchess.glade 2011-01-02 03:57:29.000000000 +0000 +++ gmchess-0.29.6/data/gmchess.glade 2011-10-25 15:38:46.000000000 +0000 @@ -1,47 +1,51 @@ - + - True + False chess 500 400 True - vertical + False True - vertical + False False + True 0 True + False True - vertical + False True True + False True - vertical + False True + False @@ -53,14 +57,18 @@ True + False + True + True 1 True + False @@ -71,28 +79,35 @@ + True + True 0 True - vertical + False True + False p1.png + True + True 0 True + False True + False nickname: @@ -104,6 +119,7 @@ True + False Computer @@ -122,9 +138,11 @@ True + False True + False step time: @@ -136,6 +154,7 @@ True + False @@ -154,9 +173,11 @@ True + False True + False play time: @@ -168,6 +189,7 @@ True + False @@ -186,17 +208,23 @@ True + False True + False play.png + True + True 0 + True + True 4 @@ -209,28 +237,35 @@ + True + True 0 True + False + True + True 1 True + False True - vertical + False True + False @@ -242,14 +277,18 @@ True + False + True + True 1 True + False @@ -260,28 +299,35 @@ + True + True 0 True - vertical + False True + False p2.png + True + True 0 True + False True + False nickname: @@ -293,6 +339,7 @@ True + False Human @@ -311,9 +358,11 @@ True + False True + False step time: @@ -325,9 +374,12 @@ True + False center + True + True 1 @@ -341,9 +393,11 @@ True + False True + False play time: @@ -355,10 +409,13 @@ True + False center + True + True 1 @@ -372,17 +429,23 @@ True + False True + False play.png + True + True 0 + True + True 4 @@ -410,14 +473,16 @@ True - vertical + False True + False True True + False 1 @@ -429,6 +494,7 @@ True + False 2 @@ -440,6 +506,7 @@ True + False 3 @@ -451,6 +518,7 @@ True + False 4 @@ -462,6 +530,7 @@ True + False 5 @@ -473,6 +542,7 @@ True + False 6 @@ -484,6 +554,7 @@ True + False 7 @@ -495,6 +566,7 @@ True + False 8 @@ -506,6 +578,7 @@ True + False 9 @@ -517,20 +590,24 @@ False + True 0 - - - - + True - True + False - + + Start + False True - nine + True + False + begin a new game + False + True False @@ -539,9 +616,14 @@ - + + Lost + False True - eight + True + False + False + True False @@ -550,9 +632,14 @@ - + + Draw + False True - seven + True + False + False + True False @@ -561,9 +648,14 @@ - + + Rue + False True - six + True + False + False + True False @@ -571,137 +663,142 @@ 3 + + + False + False + end + 1 + + + + + + + + True + False + True - + True - five + False + nine False False - 4 + 0 - + True - four + False + eight False False - 5 + 1 - + True - three + False + seven False False - 6 + 2 - + True - two + False + six False False - 7 + 3 - + True - one + False + five False False - 8 + 4 - - - False - end - 3 - - - - - True - - Start + True - True - False - True + False + four False False - 0 + 5 - - Lost + True - True - False - True + False + three False False - 1 + 6 - - Draw + True - True - False - True + False + two False False - 2 + 7 - - Rue + True - True - False - True + False + one False False - 3 + 8 False - False + True end - 1 + 3 + True + True 1 @@ -710,71 +807,102 @@ True True False - 0 True - vertical + False True + False Information True + True + True 0 True - vertical + False True True - automatic - automatic + True + True 0 True + False False + True 1 True + False + + + False + True + True + True + start game with state + False + + + True + False + go-jump + + + + + False + False + 0 + + True + False False False - 0 + 1 + False True True False first station + False True + False gtk-media-rewind @@ -782,18 +910,21 @@ False False - 1 + 2 + False True True False preview move + False True + False gtk-go-back @@ -801,18 +932,21 @@ False False - 2 + 3 + False True True False next move + False True + False gtk-go-forward @@ -820,18 +954,21 @@ False False - 3 + 4 + False True True False last move + False True + False gtk-media-forward @@ -839,12 +976,9 @@ False False - 4 + 5 - - - False @@ -854,23 +988,25 @@ + True + True 1 True + False 0 True + False 12 True True - automatic - automatic True @@ -884,12 +1020,15 @@ True + False <b>Comment</b> True + True + True 2 @@ -898,6 +1037,7 @@ True + False Board Information @@ -907,18 +1047,18 @@ True - vertical + False True True - automatic - automatic + True + True 0 @@ -936,6 +1076,7 @@ True + False Book @@ -946,10 +1087,11 @@ True - vertical + False True + False @@ -961,6 +1103,7 @@ True + False @@ -972,18 +1115,18 @@ True + False 0 none True + False 12 True True - automatic - automatic in @@ -998,12 +1141,15 @@ True + False <b>Engine status</b> True + True + True 2 @@ -1015,6 +1161,7 @@ True + False Engine @@ -1037,15 +1184,19 @@ + True + True 1 True + False False + True end 2 Binary files /tmp/AnNvNJiMXz/gmchess-0.29.4/data/themes/wood/null.png and /tmp/ed4em5UENI/gmchess-0.29.6/data/themes/wood/null.png differ Binary files /tmp/AnNvNJiMXz/gmchess-0.29.4/data/themes/wood-small/null.png and /tmp/ed4em5UENI/gmchess-0.29.6/data/themes/wood-small/null.png differ diff -Nru gmchess-0.29.4/debian/changelog gmchess-0.29.6/debian/changelog --- gmchess-0.29.4/debian/changelog 2011-10-21 15:34:57.000000000 +0000 +++ gmchess-0.29.6/debian/changelog 2012-01-01 15:49:57.000000000 +0000 @@ -1,3 +1,15 @@ +gmchess (0.29.6-2) unstable; urgency=low + + * Fix build on kfreebsd-* + + -- Aron Xu Sun, 01 Jan 2012 23:49:28 +0800 + +gmchess (0.29.6-1) unstable; urgency=low + + * New upstream release. + + -- Aron Xu Sun, 25 Dec 2011 21:10:37 +0800 + gmchess (0.29.4-1) unstable; urgency=low * New upstream release. diff -Nru gmchess-0.29.4/debian/patches/0003-fix-kfreebsd.patch gmchess-0.29.6/debian/patches/0003-fix-kfreebsd.patch --- gmchess-0.29.4/debian/patches/0003-fix-kfreebsd.patch 1970-01-01 00:00:00.000000000 +0000 +++ gmchess-0.29.6/debian/patches/0003-fix-kfreebsd.patch 2012-01-01 15:56:24.000000000 +0000 @@ -0,0 +1,38 @@ +--- a/src/Sound.cc ++++ b/src/Sound.cc +@@ -77,10 +77,12 @@ + void CSound::play_file(const char* filename) + { + gchar* argv[3]; +-#ifdef __linux__ +- argv[0] = "aplay"; +-#elif __APPLE__ ++//#ifdef __linux__ ++// argv[0] = "aplay"; ++#ifdef __APPLE__ + argv[0] = "afplay"; ++#else ++ argv[0] = "aplay"; + #endif + argv[1] = (gchar*)filename; + argv[2] = NULL; +--- a/src/engine/eleeye.cpp ++++ b/src/engine/eleeye.cpp +@@ -32,13 +32,13 @@ + #ifdef _WIN32 + #include + const char *const cszLibEvalFile = "EVALUATE.DLL"; +-#elif __linux__ +- #include +- #define WINAPI +- const char *const cszLibEvalFile = "../lib/libeval.so.0"; + #elif __APPLE__ + #include + const char *const cszLibEvalFile = "/usr/local/lib/libeval.0.dylib"; ++#else //for __linux__ and freebsd ++ #include ++ #define WINAPI ++ const char *const cszLibEvalFile = "../lib/libeval.so.0"; + #endif + + const int INTERRUPT_COUNT = 4096; // 搜索若干结点后调用中断 diff -Nru gmchess-0.29.4/debian/patches/series gmchess-0.29.6/debian/patches/series --- gmchess-0.29.4/debian/patches/series 2011-10-21 15:34:57.000000000 +0000 +++ gmchess-0.29.6/debian/patches/series 2012-01-01 15:55:41.000000000 +0000 @@ -1 +1,2 @@ 0002-fix-potfiles-skip.patch +0003-fix-kfreebsd.patch diff -Nru gmchess-0.29.4/ltmain.sh gmchess-0.29.6/ltmain.sh --- gmchess-0.29.4/ltmain.sh 2011-01-02 02:37:40.000000000 +0000 +++ gmchess-0.29.6/ltmain.sh 2011-11-28 12:21:01.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6147,7 +6160,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6831,7 +6845,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7330,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7432,7 +7447,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8035,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8070,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8078,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9168,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9279,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru gmchess-0.29.4/src/Board.cc gmchess-0.29.6/src/Board.cc --- gmchess-0.29.4/src/Board.cc 2011-10-15 03:57:27.000000000 +0000 +++ gmchess-0.29.6/src/Board.cc 2011-10-25 16:15:30.000000000 +0000 @@ -127,6 +127,7 @@ ,m_usebook(true) ,m_human_black(false) ,theme("wood") + ,color("#198964") { std::list listTargets; @@ -161,6 +162,10 @@ m_robot.stop(); } +void Board::set_trace_color(const std::string& color_) +{ + color = color_; +} void Board::set_themes(const std::string& themes_) { theme = themes_; @@ -205,7 +210,7 @@ chessman_images[RED_PAWN] = get_spic("red_pawn.png"); chessman_images[RED_ROOK] = get_spic("red_rook.png"); chessman_images[SELECTED_CHESSMAN] = get_spic("select.png"); - chessman_images[NULL_CHESSMAN] = get_spic("null.png"); + chessman_images[PROPMT] = get_spic("null.png"); } else{ @@ -226,7 +231,7 @@ chessman_images[RED_PAWN] = get_pic("red_pawn.png"); chessman_images[RED_ROOK] = get_pic("red_rook.png"); chessman_images[SELECTED_CHESSMAN] = get_pic("select.png"); - chessman_images[NULL_CHESSMAN] = get_pic("null.png"); + chessman_images[PROPMT] = get_pic("null.png"); } } @@ -349,7 +354,6 @@ if(ev->type == GDK_BUTTON_PRESS&& ev->button == 1) { redraw(); - //draw_select_frame(false); Gdk::Point p = get_position(ev->x, ev->y); selected_x = p.get_x(); selected_y = p.get_y(); @@ -372,12 +376,12 @@ if((m_human_black && (selected_chessman <32))||((!m_human_black)&&(selected_chessman>31))){ printf("choose black %d\n",selected_chessman); selected_chessman =-1; - //draw_select_frame(false); return true; } } draw_select_frame(true); + draw_show_can_move(); } } else{ @@ -389,6 +393,7 @@ /** change the select */ selected_chessman = dst_chessman; draw_select_frame(true); + draw_show_can_move(); CSound::play(SND_CHOOSE); } @@ -579,6 +584,47 @@ Gdk::RGB_DITHER_NONE, 0, 0); } +void Board::draw_show_can_move() +{ + if(!is_fight_to_robot()&& !is_network_game()) + return; + + if (selected_chessman < 0 ) + return; + std::vector points; + m_engine.gen_which_can_move(points, selected_chessman, is_rev_board); + + std::vector::iterator iter = points.begin(); + + for(;iter != points.end(); ++iter){ + Gdk::Point p = get_coordinate(iter->get_x(), iter->get_y()); + draw_phonily_point(p); + } + +} + +void Board::draw_phonily_point(Gdk::Point& p) +{ + int px = p.get_x() - 11 / 2; + int py = p.get_y() - 11 / 2; + //int px = p.get_x() - chessman_width / 2; + //int py = p.get_y() - chessman_width / 2; + //ui_pixmap->copy_to_image(selected_chessman_image, px, py, 0, 0, chessman_width, chessman_width); + //ui_pixmap->draw_pixbuf(get_style()->get_black_gc(),chessman_images[SELECTED_CHESSMAN], + // 0, 0, px, py, chessman_images[SELECTED_CHESSMAN]->get_width(), chessman_images[SELECTED_CHESSMAN]->get_height(), + // Gdk::RGB_DITHER_NONE, 0, 0); + ui_pixmap->copy_to_image(selected_chessman_image, px, py, 0, 0, 11, 11); + ui_pixmap->draw_pixbuf(get_style()->get_black_gc(),chessman_images[PROPMT], + 0, 0, px, py, chessman_images[PROPMT]->get_width(), chessman_images[PROPMT]->get_height(), + Gdk::RGB_DITHER_NONE, 0, 0); + int x,y; + ui_pixmap->get_size(x,y); + this->get_window()->draw_drawable(this->get_style()->get_black_gc(),ui_pixmap, + 0,0, + 0,0, + x,y); +} + void Board::draw_select_frame(bool selected) { if (selected_chessman < 0 || selected_x == -1 || selected_y == -1) @@ -630,7 +676,7 @@ int dst = m_engine.get_move_dst(mv); Glib::RefPtr gc = this->get_style()->get_white_gc(); - gc->set_rgb_fg_color(Gdk::Color("green")); + gc->set_rgb_fg_color(Gdk::Color(color)); Gdk::Point s1 =get_coordinate(m_engine.RANK_X(src)-3,m_engine.RANK_Y(src)-3); Gdk::Point s2 =get_coordinate(m_engine.RANK_X(dst)-3,m_engine.RANK_Y(dst)-3); @@ -943,14 +989,17 @@ redraw(); } -void Board::start_robot() +void Board::start_robot(bool new_) { m_status = FIGHT_STATUS; m_robot.set_engine(engine_name); m_robot.start(); m_robot.send_ctrl_command("ucci\n"); - new_game(m_status); + if(new_) + new_game(m_status); + else + chanju_game(m_status); } void Board::set_level_config(int _depth,int _idle,int _style,int _knowledge,int _pruning,int _randomness,bool _usebook) @@ -996,6 +1045,50 @@ } +void Board::chanju_game(BOARD_STATUS _status) +{ + m_status = _status; + std::string cur_fen = m_engine.get_current_snapshot(); + m_engine.init_snapshot(cur_fen.c_str()); + + if(m_status == FIGHT_STATUS){ + set_war_time(step_time,play_time); + m_robot.send_ctrl_command("setoption newgame\n"); + set_level(); + } + DLOG("current fen = %s\n", cur_fen.c_str()); + + + moves_lines.clear(); + moves_lines = postion_str + cur_fen; + redraw(); + + parent.textview_engine_log_clear(); + parent.change_play(is_human_player()); + + timer=Glib::signal_timeout().connect(sigc::mem_fun(*this,&Board::go_time),1000); + /**如果是用户选择黑方,则电脑先走棋 -- if user choose black,the robot go moves first*/ + if(m_human_black){ + if(m_status == FIGHT_STATUS){ + moves_lines =moves_lines +std::string(" -- 0 1 "); + m_robot.send_ctrl_command(moves_lines.c_str()); + m_robot.send_ctrl_command("\n"); + char str_cmd[256]; + sprintf(str_cmd,"go depth %d \n",m_search_depth); + m_robot.send_ctrl_command(str_cmd); + }else if(m_status == NETWORK_STATUS){ + + } + + } + + parent.set_red_war_time(to_time_ustring(red_time),to_time_ustring(0)); + parent.set_black_war_time(to_time_ustring(black_time),to_time_ustring(0)); + + +} + + void Board::new_game(BOARD_STATUS _status) { m_status = _status; @@ -1294,72 +1387,6 @@ } - - - -#if 0 - if(pos_ != std::string::npos){ - //start network game with red player - parent.on_network_game("lerosua","enemy",true); - } - pos_=str_buf.find("network-game-black"); - if(pos_ != std::string::npos){ - //start network game with black player - parent.on_network_game("lerosua","enemy",false); - } - pos_ = str_buf.find("network-game-win"); - if(pos_ !=std::string::npos){ - // i win the game. - if(timer.connected()) - timer.disconnect(); - parent.on_end_game(ROBOT_LOSE); - return true; - } - pos_ = str_buf.find("resign"); - if(pos_ != std::string::npos){ - - if(timer.connected()) - timer.disconnect(); - parent.on_end_game(ROBOT_LOSE); - return true; - } - size_t pos=str_buf.find("moves:"); - if(pos != std::string::npos){ - std::string t_mv=str_buf.substr(pos+6,4); - std::cout<<"get robot mv = "<action=="ask"){ - //对方请求的包 - if(net_pac->status == "start"){ - //对方请求游戏 - - } - - - }else if(net_pac->action == "reply"){ - //对方回复的包 - - - }else if(net_pac->action == "working"){ - //对方走棋的包 - - int mv = m_engine.iccs_str_to_move(net_pac->moves); - try_move(mv); - - } - - - - } -#endif } close(fd_cli); return true; @@ -1369,7 +1396,6 @@ int Board::init_send_socket() { int sockfd; - //char buf[1024]; struct sockaddr_in srvaddr; EC_THROW(-1 == (sockfd=socket(AF_INET,SOCK_STREAM,0))); @@ -1387,7 +1413,6 @@ { int sockfd; - //char buf[1024]; struct sockaddr_in srvaddr; EC_THROW(-1 == (sockfd=socket(AF_INET,SOCK_STREAM,0))); @@ -1412,11 +1437,11 @@ } } -void Board::save_board_to_file() +void Board::save_board_to_file(const std::string& filename) { int w,h; ui_pixmap->get_size(w, h); Glib::RefPtr png = Gdk::Pixbuf::create((Glib::RefPtr) ui_pixmap, 0, 0, w, h); - png->save("/tmp/1.png", "png"); + png->save(filename, "png"); } diff -Nru gmchess-0.29.4/src/Board.h gmchess-0.29.6/src/Board.h --- gmchess-0.29.4/src/Board.h 2011-10-15 03:57:27.000000000 +0000 +++ gmchess-0.29.6/src/Board.h 2011-10-25 16:10:11.000000000 +0000 @@ -40,6 +40,7 @@ void close_send_socket(); void send_to_socket(const std::string& cmd_); void set_themes(const std::string& themes_); + void set_trace_color(const std::string& color_); protected: @@ -83,6 +84,10 @@ /** 画选择棋子边框 */ /** draw the frame of chess */ void draw_select_frame(bool selected = true); + /** show which can move in by select chess */ + void draw_show_can_move(); + /** draw prompt move point */ + void draw_phonily_point(Gdk::Point& p); void draw_localize(Glib::RefPtr& gc, int x, int y, int place); void draw_palace(Glib::RefPtr& gc, int x, int y); /** 处理拖文件事件*/ @@ -95,10 +100,11 @@ void set_engine(const std::string& name){engine_name = name; } /** 启动AI对战,将会启动引擎进程*/ /** start the AI engine*/ - void start_robot(); + void start_robot(bool new_ = true); /** 开启新游戏,即在引擎已启动的情况下重新游戏*/ /** start a new game,with the presence engine*/ void new_game(BOARD_STATUS _status = FIGHT_STATUS); + void chanju_game(BOARD_STATUS _status = FIGHT_STATUS); /** 自由模式,即摆棋*/ /** free game mode*/ /** @param redraw 为真则重画棋盘,假则保留棋盘现状*/ @@ -190,7 +196,7 @@ /** 倒计时的声音*/ void reckon_time_sound(int time_); /** 测试保存棋盘局面为图像文件*/ - void save_board_to_file(); + void save_board_to_file(const std::string& filename); void draw_trace(int mv); private: @@ -212,6 +218,7 @@ std::string engine_name; /** 所使用的主题*/ std::string theme; + std::string color; /** 背景图像 */ Glib::RefPtr bg_image; diff -Nru gmchess-0.29.4/src/BookView.cc gmchess-0.29.6/src/BookView.cc --- gmchess-0.29.4/src/BookView.cc 2009-11-29 13:36:04.000000000 +0000 +++ gmchess-0.29.6/src/BookView.cc 2011-10-16 15:04:47.000000000 +0000 @@ -21,6 +21,7 @@ #include "BookView.h" #include #include +#include #include #include @@ -197,12 +198,12 @@ //printf(" dir = %s \n",cPath); /** 是目录,继续打开读*/ /** it is a directory,continue read */ - add_group(basename(Path),basename(cPath)); + add_group(basename((char*)Path),basename(cPath)); load_book_dir(cPath); }else{ //printf(" add file = %s\n",basename(node->d_name)); - add_line(basename(Path),node->d_name,cPath); + add_line(basename((char*)Path),node->d_name,cPath); } } closedir(dirp); diff -Nru gmchess-0.29.4/src/ConfWindow.cc gmchess-0.29.6/src/ConfWindow.cc --- gmchess-0.29.4/src/ConfWindow.cc 2011-10-15 04:25:55.000000000 +0000 +++ gmchess-0.29.6/src/ConfWindow.cc 2011-10-25 14:37:30.000000000 +0000 @@ -45,6 +45,11 @@ bt = 0; vbox_xml->get_widget("button_cancel", bt); bt->signal_clicked().connect(sigc::mem_fun(*this,&ConfWindow::on_button_cancel)); + vbox_xml->get_widget("colorbutton",colorBt); + colorBt->signal_color_set().connect(sigc::mem_fun(*this, &ConfWindow::on_button_color_set)); + + m_line_color = GMConf["line_color"]; + colorBt->set_color(Gdk::Color(m_line_color)); std::string& size_big = GMConf["desktop_size"]; @@ -101,10 +106,14 @@ void ConfWindow::on_button_cancel() { - //delete this; parent->on_conf_window_close(); } +void ConfWindow::on_button_color_set() +{ + Gdk::Color _color = colorBt->get_color(); + m_line_color = _color.to_string(); +} bool ConfWindow::on_delete_event(GdkEventAny*) { on_button_cancel(); @@ -119,6 +128,7 @@ GMConf["step_time"] = m_step_time; GMConf["play_time"] = m_play_time; GMConf["engine_name"] = m_engine_name; + GMConf["line_color"] = m_line_color; if(cbtheme->get_active_text() == "wood") GMConf["themes"] = "wood"; diff -Nru gmchess-0.29.4/src/ConfWindow.h gmchess-0.29.6/src/ConfWindow.h --- gmchess-0.29.4/src/ConfWindow.h 2011-10-15 04:00:27.000000000 +0000 +++ gmchess-0.29.6/src/ConfWindow.h 2011-10-25 14:40:31.000000000 +0000 @@ -32,6 +32,7 @@ ~ConfWindow(); void on_button_save(); void on_button_cancel(); + void on_button_color_set(); bool on_delete_event(GdkEventAny*); typedef sigc::signal type_signal_quit; type_signal_quit signal_quit() @@ -44,11 +45,13 @@ type_signal_quit signal_quit_; VariablesMap* m_pVariablesMap; Gtk::ComboBoxText* cbtheme; + Gtk::ColorButton* colorBt; Glib::ustring m_depth; Glib::ustring m_step_time; Glib::ustring m_play_time; Glib::ustring m_theme; Glib::ustring m_engine_name; + Glib::ustring m_line_color; bool m_size_big; bool m_usebook; diff -Nru gmchess-0.29.4/src/engine/eleeye.cpp gmchess-0.29.6/src/engine/eleeye.cpp --- gmchess-0.29.4/src/engine/eleeye.cpp 2010-10-24 04:44:56.000000000 +0000 +++ gmchess-0.29.6/src/engine/eleeye.cpp 2011-10-26 12:01:39.000000000 +0000 @@ -32,10 +32,13 @@ #ifdef _WIN32 #include const char *const cszLibEvalFile = "EVALUATE.DLL"; -#else +#elif __linux__ #include #define WINAPI const char *const cszLibEvalFile = "../lib/libeval.so.0"; +#elif __APPLE__ + #include + const char *const cszLibEvalFile = "/usr/local/lib/libeval.0.dylib"; #endif const int INTERRUPT_COUNT = 4096; // 搜索若干结点后调用中断 diff -Nru gmchess-0.29.4/src/Engine.cc gmchess-0.29.6/src/Engine.cc --- gmchess-0.29.4/src/Engine.cc 2011-10-13 15:38:33.000000000 +0000 +++ gmchess-0.29.6/src/Engine.cc 2011-10-25 16:22:09.000000000 +0000 @@ -214,15 +214,6 @@ move_snapshots.push_back(0); sync_board(); - /* - int i,j; - for(i=0;i<16;i++) - { - for(j=0;j<16;j++) - printf(" %2d ",chessboard[i*16+j]); - printf("\n"); - } - */ } void Engine::get_snapshot(int num) @@ -231,6 +222,7 @@ //DLOG("get_snapshot = %s\n",fens.c_str()); clean_board(); from_fens(fens.c_str()); + current_fen_snapshots = fens; sync_board(); @@ -646,10 +638,12 @@ if(!in_board(dst)) return false; /** 检测是否同为红方的笨办法 */ - if((chessboard[src]&16) && (chessboard[eated]&16)) + //if((chessboard[src]&16) && (chessboard[eated]&16)) + if((chessboard[src]&16) && (chessboard[dst]&16)) return false; /** 检测是否同为黑方的笨办法 */ - if((chessboard[src]&32) && (chessboard[eated]&32)) + //if((chessboard[src]&32) && (chessboard[eated]&32)) + if((chessboard[src]&32) && (chessboard[dst]&32)) return false; /** 判断是否过河的方法,dst & 0x80,在下方是非0, 上方是0 */ @@ -934,6 +928,7 @@ char str_fen[128]; to_fens(str_fen); fen_snapshots.push_back(std::string(str_fen)); + current_fen_snapshots = std::string(str_fen); add_move_chinese(mv_line); @@ -2215,3 +2210,138 @@ revchessboard[255]=0; } +void Engine::gen_which_can_move(std::vector& points, int chess_, bool rev) +{ + int sx,sy; + get_xy_from_chess(chess_,sx,sy,rev); + int chess_t = get_chessman_type(chess_); + int src = get_chessman_xy(chess_); + switch(chess_t){ + /** 将/帅的着法,同一纵线或横线,移动只一个单位,在九宫内*/ + case RED_PAWN: + case BLACK_PAWN: + case RED_KING: + case BLACK_KING: + { + //计算合法的能走的点再加入potins中 + int dst = get_dst_xy(sx+1,sy, rev); + int mv = get_move(src, dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx+1, sy)); + dst = get_dst_xy(sx-1,sy, rev); + mv = get_move(src, dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx-1, sy)); + dst = get_dst_xy(sx,sy+1, rev); + mv = get_move(src, dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx, sy+1)); + dst = get_dst_xy(sx,sy-1, rev); + mv = get_move(src, dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx, sy-1)); + } + break; + case RED_ADVISOR: + case BLACK_ADVISOR: + { + int dst = get_dst_xy(sx+1,sy+1, rev); + int mv = get_move(src, dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx+1, sy+1)); + dst = get_dst_xy(sx+1,sy-1, rev); + mv = get_move(src, dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx+1, sy-1)); + dst = get_dst_xy(sx-1,sy-1, rev); + mv = get_move(src, dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx-1, sy-1)); + dst = get_dst_xy(sx-1,sy+1, rev); + mv = get_move(src, dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx-1, sy+1)); + } + break; + case RED_BISHOP: + case BLACK_BISHOP: + { + int dst = get_dst_xy(sx+2,sy+2,rev); + int mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx+2,sy+2)); + dst = get_dst_xy(sx+2, sy-2, rev); + mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx+2,sy-2)); + dst = get_dst_xy(sx-2, sy+2, rev); + mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx-2,sy+2)); + dst = get_dst_xy(sx-2, sy-2, rev); + mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx-2,sy-2)); + } + break; + case RED_KNIGHT: + case BLACK_KNIGHT: + { + int dst = get_dst_xy(sx+1,sy+2,rev); + int mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx+1,sy+2)); + dst = get_dst_xy(sx+1, sy-2, rev); + mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx+1,sy-2)); + dst = get_dst_xy(sx-1, sy-2, rev); + mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx-1,sy-2)); + dst = get_dst_xy(sx-1, sy+2, rev); + mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx-1,sy+2)); + dst = get_dst_xy(sx-2, sy+1, rev); + mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx-2,sy+1)); + dst = get_dst_xy(sx-2, sy-1, rev); + mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx-2,sy-1)); + dst = get_dst_xy(sx+2, sy+1, rev); + mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx+2,sy+1)); + dst = get_dst_xy(sx+2, sy-1, rev); + mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx+2,sy-1)); + } + break; + case RED_ROOK: + case BLACK_ROOK: + case RED_CANNON: + case BLACK_CANNON: + { + for(int i = -9; i<9; ++i){ + int dst = get_dst_xy(sx,sy+i); + int mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx,sy+i)); + dst = get_dst_xy(sx+i, sy); + mv = get_move(src,dst); + if(logic_move(mv)) + points.push_back(Gdk::Point(sx+i,sy)); + } + + } + break; + + } + + + +} diff -Nru gmchess-0.29.4/src/Engine.h gmchess-0.29.6/src/Engine.h --- gmchess-0.29.4/src/Engine.h 2009-09-07 12:08:47.000000000 +0000 +++ gmchess-0.29.6/src/Engine.h 2011-10-25 16:09:37.000000000 +0000 @@ -25,6 +25,7 @@ #include #include #include +#include /** @@ -56,6 +57,7 @@ * @param num 某一步时 */ void get_snapshot(int num); + std::string get_current_snapshot(){ return current_fen_snapshots; } /** 添加中文表达着法 */ /** add the chinese moves */ void add_move_chinese(Glib::ustring f_line){ move_chinese.push_back(f_line); }; @@ -264,6 +266,8 @@ /** return the identify of checkby */ inline bool get_checkby(){ return m_checked;} + /**生成合法的步法着点集合*/ + void gen_which_can_move(std::vector& points, int chess_, bool rev); private: /** * @brief 从Fen串生成棋盘数组 @@ -288,6 +292,8 @@ /** 用于保存所有历史局面的FEN串数组*/ /** save the all history station FEN array */ std::vector fen_snapshots; + /** save the current FEN array for run chanju game*/ + std::string current_fen_snapshots; /** 用于保存所有的着法 */ /** save all history moves */ std::vector move_snapshots; diff -Nru gmchess-0.29.4/src/gmchess.h gmchess-0.29.6/src/gmchess.h --- gmchess-0.29.4/src/gmchess.h 2010-05-01 11:21:08.000000000 +0000 +++ gmchess-0.29.6/src/gmchess.h 2011-10-24 14:38:55.000000000 +0000 @@ -77,7 +77,7 @@ RED_KING=0,RED_ADVISOR,RED_BISHOP,RED_KNIGHT,RED_ROOK,RED_CANNON,RED_PAWN, BLACK_KING,BLACK_ADVISOR,BLACK_BISHOP,BLACK_KNIGHT,BLACK_ROOK,BLACK_CANNON,BLACK_PAWN, RED_KING_DIE,BLACK_KING_DIE, - NULL_CHESSMAN,SELECTED_CHESSMAN, + PROPMT,SELECTED_CHESSMAN, }; /** diff -Nru gmchess-0.29.4/src/MainWindow.cc gmchess-0.29.6/src/MainWindow.cc --- gmchess-0.29.4/src/MainWindow.cc 2011-10-15 08:39:33.000000000 +0000 +++ gmchess-0.29.6/src/MainWindow.cc 2011-11-28 12:23:29.000000000 +0000 @@ -28,7 +28,7 @@ #include "gmchess.h" #include "Sound.h" -#define version "0.29.4" +#define version "0.29.6" Glib::ustring ui_info = "" @@ -78,6 +78,7 @@ ui_xml->get_widget("button_end",btn_end); ui_xml->get_widget("button_prev",btn_prev); ui_xml->get_widget("button_next",btn_next); + ui_xml->get_widget("button_chanju", btn_chanjue); ui_xml->get_widget("button_begin",btn_begin); ui_xml->get_widget("button_lose",btn_lose); ui_xml->get_widget("button_draw",btn_draw); @@ -100,6 +101,8 @@ sigc::mem_fun(*this, &MainWindow::on_draw_game)); btn_rue->signal_clicked().connect( sigc::mem_fun(*this, &MainWindow::on_rue_game)); + btn_chanjue->signal_clicked().connect( + sigc::mem_fun(*this, &MainWindow::on_chanju_game)); board = Gtk::manage(new Board(*this)); box_board->pack_start(*board); @@ -149,9 +152,11 @@ this->signal_check_resize().connect( sigc::mem_fun(*this,&MainWindow::on_size_change)); - /** test for rgba */ +#ifdef __linux__ + /** test for rgba , it not work in mac osx*/ Glib::RefPtr colormap_ = this->get_screen()->get_rgba_colormap(); this->set_default_colormap(colormap_); +#endif show_all(); p1_image->hide(); @@ -178,12 +183,14 @@ board->set_time(_step_time,_play_time); std::string theme_ = GMConf["themes"]; std::string engine_name = GMConf["engine_name"]; + std::string color_ = GMConf["line_color"]; if(engine_name.empty()) engine_name = "eleeye_engine"; if(theme_.empty()) theme_ = "wood"; board->set_themes(theme_); board->set_engine(engine_name); + board->set_trace_color(color_.c_str()); } MainWindow::~MainWindow() @@ -240,6 +247,9 @@ std::ifstream file(buf); if(!file){ +#ifdef __APPLE__ + mkdir(homedir.c_str(),S_IRUSR|S_IWUSR|S_IXUSR); +#endif char homepath[512]; snprintf(homepath,512,"%s/gmchess/",homedir.c_str()); mkdir(homepath,S_IRUSR|S_IWUSR|S_IXUSR); @@ -248,6 +258,7 @@ GMConf["engine_depth"] ="5"; GMConf["themes"]="wood"; GMConf["engine_name"] = "eleeye_engine"; + GMConf["line_color"] = "#198964"; save_conf(); snprintf(file_dir,512,"%s/gmchess/files",homedir.c_str()); @@ -432,7 +443,7 @@ void MainWindow::on_menu_save_board_to_png() { - board->save_board_to_file(); + board->save_board_to_file("/tmp/1.png"); } void MainWindow::on_menu_save_file() @@ -841,8 +852,6 @@ void MainWindow::set_information() { - //Gtk::Label* p1_name= 0;ui_xml->get_widget("P1_name",p1_name); - //Gtk::Label* p2_name= 0;ui_xml->get_widget("P2_name",p2_name); Gtk::Label* info = 0;ui_xml->get_widget("info_label",info); const Board_info& board_info = board->get_board_info(); @@ -923,6 +932,53 @@ } +void MainWindow::on_chanju_game() +{ + /** 已经在对战中,则询问是否开始新游戏*/ + /** ask if start new game */ + if(board->is_fight_to_robot()){ + + Gtk::MessageDialog dialog(*this, _("new game"), false, + Gtk::MESSAGE_QUESTION, + Gtk::BUTTONS_OK_CANCEL); + Glib::ustring msg =_("Will you start a new game?"); + dialog.set_secondary_text(msg); + int result = dialog.run(); + switch (result) { + case (Gtk::RESPONSE_OK): { + m_refTreeModel->clear(); + board->chanju_game(); + break; + } + + case (Gtk::RESPONSE_CANCEL): { + break; + } + + default: { + break; + } + } + return; + + } + else if(board->is_network_game()){ + Gtk::MessageDialog dialog_info(*this, _("Information"), false); + Glib::ustring msg =_("You are play with network game,Please over it first!"); + dialog_info.set_secondary_text(msg); + dialog_info.run(); + return ; + + } + m_refTreeModel->clear(); + board->start_robot(false); + set_status(); + btn_begin->set_sensitive(false); + //btn_chanjue->set_sensitive(false); + + +} + void MainWindow::on_begin_game() { /** 已经在对战中,则询问是否开始新游戏*/ diff -Nru gmchess-0.29.4/src/MainWindow.h gmchess-0.29.6/src/MainWindow.h --- gmchess-0.29.4/src/MainWindow.h 2011-10-12 14:52:48.000000000 +0000 +++ gmchess-0.29.6/src/MainWindow.h 2011-10-25 15:54:56.000000000 +0000 @@ -46,6 +46,8 @@ void on_back_move(); /** 开始AI对战*/ void on_begin_game(); + /** start chanhue game*/ + void on_chanju_game(); /** 开始网络对战*/ /** * @param me_ 已方名字 @@ -161,11 +163,13 @@ Gtk::Button* btn_end ; Gtk::Button* btn_prev; Gtk::Button* btn_next; + Gtk::Button* btn_chanjue; /** 对战按钮*/ Gtk::Button* btn_begin; Gtk::Button* btn_lose; Gtk::Button* btn_draw; Gtk::Button* btn_rue; + }; diff -Nru gmchess-0.29.4/src/robot.cc gmchess-0.29.6/src/robot.cc --- gmchess-0.29.4/src/robot.cc 2011-10-15 03:01:08.000000000 +0000 +++ gmchess-0.29.6/src/robot.cc 2011-10-25 13:23:34.000000000 +0000 @@ -130,6 +130,7 @@ is_running = false; on_robot_exit(); + printf(" i have exit ======\n"); } } diff -Nru gmchess-0.29.4/src/Sound.cc gmchess-0.29.6/src/Sound.cc --- gmchess-0.29.4/src/Sound.cc 2010-05-15 08:51:25.000000000 +0000 +++ gmchess-0.29.6/src/Sound.cc 2011-10-26 12:01:39.000000000 +0000 @@ -77,9 +77,12 @@ void CSound::play_file(const char* filename) { gchar* argv[3]; +#ifdef __linux__ argv[0] = "aplay"; +#elif __APPLE__ + argv[0] = "afplay"; +#endif argv[1] = (gchar*)filename; - //argv[1] = filename; argv[2] = NULL; GError* err; GSpawnFlags flas = (GSpawnFlags)(G_SPAWN_SEARCH_PATH |