• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン519 (tree)
日時2012-02-12 12:00:49
作者logue

ログメッセージ

libtoolが古くてビルドできない問題を修正。

変更サマリ

差分

--- atque/trunk/ferro/m4/libtool.m4 (revision 518)
+++ atque/trunk/ferro/m4/libtool.m4 (revision 519)
@@ -1,8 +1,8 @@
11 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
22 #
33 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
4-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
5-# Inc.
4+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5+# Foundation, Inc.
66 # Written by Gordon Matzigkeit, 1996
77 #
88 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
1111
1212 m4_define([_LT_COPYING], [dnl
1313 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
14-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
15-# Inc.
14+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
15+# Foundation, Inc.
1616 # Written by Gordon Matzigkeit, 1996
1717 #
1818 # This file is part of GNU Libtool.
@@ -146,6 +146,8 @@
146146 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
147147 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
148148
149+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
150+dnl
149151 _LT_DECL([], [host_alias], [0], [The host system])dnl
150152 _LT_DECL([], [host], [0])dnl
151153 _LT_DECL([], [host_os], [0])dnl
@@ -637,7 +639,7 @@
637639 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
638640 configured by $[0], generated by m4_PACKAGE_STRING.
639641
640-Copyright (C) 2010 Free Software Foundation, Inc.
642+Copyright (C) 2011 Free Software Foundation, Inc.
641643 This config.lt script is free software; the Free Software Foundation
642644 gives unlimited permision to copy, distribute and modify it."
643645
@@ -801,6 +803,7 @@
801803 m4_case([$1],
802804 [C], [_LT_LANG(C)],
803805 [C++], [_LT_LANG(CXX)],
806+ [Go], [_LT_LANG(GO)],
804807 [Java], [_LT_LANG(GCJ)],
805808 [Fortran 77], [_LT_LANG(F77)],
806809 [Fortran], [_LT_LANG(FC)],
@@ -822,6 +825,31 @@
822825 ])# _LT_LANG
823826
824827
828+m4_ifndef([AC_PROG_GO], [
829+############################################################
830+# NOTE: This macro has been submitted for inclusion into #
831+# GNU Autoconf as AC_PROG_GO. When it is available in #
832+# a released version of Autoconf we should remove this #
833+# macro and use it instead. #
834+############################################################
835+m4_defun([AC_PROG_GO],
836+[AC_LANG_PUSH(Go)dnl
837+AC_ARG_VAR([GOC], [Go compiler command])dnl
838+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
839+_AC_ARG_VAR_LDFLAGS()dnl
840+AC_CHECK_TOOL(GOC, gccgo)
841+if test -z "$GOC"; then
842+ if test -n "$ac_tool_prefix"; then
843+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
844+ fi
845+fi
846+if test -z "$GOC"; then
847+ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
848+fi
849+])#m4_defun
850+])#m4_ifndef
851+
852+
825853 # _LT_LANG_DEFAULT_CONFIG
826854 # -----------------------
827855 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -852,6 +880,10 @@
852880 m4_ifdef([LT_PROG_GCJ],
853881 [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
854882
883+AC_PROVIDE_IFELSE([AC_PROG_GO],
884+ [LT_LANG(GO)],
885+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
886+
855887 AC_PROVIDE_IFELSE([LT_PROG_RC],
856888 [LT_LANG(RC)],
857889 [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -954,7 +986,13 @@
954986 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
955987 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
956988 _lt_result=$?
957- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
989+ # If there is a non-empty error log, and "single_module"
990+ # appears in it, assume the flag caused a linker warning
991+ if test -s conftest.err && $GREP single_module conftest.err; then
992+ cat conftest.err >&AS_MESSAGE_LOG_FD
993+ # Otherwise, if the output was created with a 0 exit code from
994+ # the compiler, it worked.
995+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
958996 lt_cv_apple_cc_single_mod=yes
959997 else
960998 cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@
9621000 rm -rf libconftest.dylib*
9631001 rm -f conftest.*
9641002 fi])
1003+
9651004 AC_CACHE_CHECK([for -exported_symbols_list linker flag],
9661005 [lt_cv_ld_exported_symbols_list],
9671006 [lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@
9731012 [lt_cv_ld_exported_symbols_list=no])
9741013 LDFLAGS="$save_LDFLAGS"
9751014 ])
1015+
9761016 AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
9771017 [lt_cv_ld_force_load=no
9781018 cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@
9901030 echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
9911031 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
9921032 _lt_result=$?
993- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
1033+ if test -s conftest.err && $GREP force_load conftest.err; then
1034+ cat conftest.err >&AS_MESSAGE_LOG_FD
1035+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
9941036 lt_cv_ld_force_load=yes
9951037 else
9961038 cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@
10351077 ])
10361078
10371079
1038-# _LT_DARWIN_LINKER_FEATURES
1039-# --------------------------
1080+# _LT_DARWIN_LINKER_FEATURES([TAG])
1081+# ---------------------------------
10401082 # Checks for linker and compiler features on darwin
10411083 m4_defun([_LT_DARWIN_LINKER_FEATURES],
10421084 [
@@ -1047,6 +1089,8 @@
10471089 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
10481090 if test "$lt_cv_ld_force_load" = "yes"; then
10491091 _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\"`'
1092+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
1093+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
10501094 else
10511095 _LT_TAGVAR(whole_archive_flag_spec, $1)=''
10521096 fi
@@ -1330,7 +1374,7 @@
13301374 CFLAGS="$SAVE_CFLAGS"
13311375 fi
13321376 ;;
1333-sparc*-*solaris*)
1377+*-*solaris*)
13341378 # Find out which ABI we are using.
13351379 echo 'int i;' > conftest.$ac_ext
13361380 if AC_TRY_EVAL(ac_compile); then
@@ -1337,7 +1381,20 @@
13371381 case `/usr/bin/file conftest.o` in
13381382 *64-bit*)
13391383 case $lt_cv_prog_gnu_ld in
1340- yes*) LD="${LD-ld} -m elf64_sparc" ;;
1384+ yes*)
1385+ case $host in
1386+ i?86-*-solaris*)
1387+ LD="${LD-ld} -m elf_x86_64"
1388+ ;;
1389+ sparc*-*-solaris*)
1390+ LD="${LD-ld} -m elf64_sparc"
1391+ ;;
1392+ esac
1393+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
1394+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
1395+ LD="${LD-ld}_sol2"
1396+ fi
1397+ ;;
13411398 *)
13421399 if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
13431400 LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@
14141471 if test -n "$RANLIB"; then
14151472 case $host_os in
14161473 openbsd*)
1417- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
1474+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
14181475 ;;
14191476 *)
1420- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
1477+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
14211478 ;;
14221479 esac
1423- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1480+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
14241481 fi
14251482
14261483 case $host_os in
@@ -1600,6 +1657,11 @@
16001657 lt_cv_sys_max_cmd_len=196608
16011658 ;;
16021659
1660+ os2*)
1661+ # The test takes a long time on OS/2.
1662+ lt_cv_sys_max_cmd_len=8192
1663+ ;;
1664+
16031665 osf*)
16041666 # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
16051667 # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -2185,7 +2247,7 @@
21852247
21862248 case $host_os in
21872249 aix3*)
2188- version_type=linux
2250+ version_type=linux # correct to gnu/linux during the next big refactor
21892251 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
21902252 shlibpath_var=LIBPATH
21912253
@@ -2194,7 +2256,7 @@
21942256 ;;
21952257
21962258 aix[[4-9]]*)
2197- version_type=linux
2259+ version_type=linux # correct to gnu/linux during the next big refactor
21982260 need_lib_prefix=no
21992261 need_version=no
22002262 hardcode_into_libs=yes
@@ -2259,7 +2321,7 @@
22592321 ;;
22602322
22612323 bsdi[[45]]*)
2262- version_type=linux
2324+ version_type=linux # correct to gnu/linux during the next big refactor
22632325 need_version=no
22642326 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
22652327 soname_spec='${libname}${release}${shared_ext}$major'
@@ -2398,7 +2460,7 @@
23982460 ;;
23992461
24002462 dgux*)
2401- version_type=linux
2463+ version_type=linux # correct to gnu/linux during the next big refactor
24022464 need_lib_prefix=no
24032465 need_version=no
24042466 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2406,10 +2468,6 @@
24062468 shlibpath_var=LD_LIBRARY_PATH
24072469 ;;
24082470
2409-freebsd1*)
2410- dynamic_linker=no
2411- ;;
2412-
24132471 freebsd* | dragonfly*)
24142472 # DragonFly does not have aout. When/if they implement a new
24152473 # versioning mechanism, adjust this.
@@ -2417,7 +2475,7 @@
24172475 objformat=`/usr/bin/objformat`
24182476 else
24192477 case $host_os in
2420- freebsd[[123]]*) objformat=aout ;;
2478+ freebsd[[23]].*) objformat=aout ;;
24212479 *) objformat=elf ;;
24222480 esac
24232481 fi
@@ -2435,7 +2493,7 @@
24352493 esac
24362494 shlibpath_var=LD_LIBRARY_PATH
24372495 case $host_os in
2438- freebsd2*)
2496+ freebsd2.*)
24392497 shlibpath_overrides_runpath=yes
24402498 ;;
24412499 freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2455,17 +2513,18 @@
24552513 ;;
24562514
24572515 gnu*)
2458- version_type=linux
2516+ version_type=linux # correct to gnu/linux during the next big refactor
24592517 need_lib_prefix=no
24602518 need_version=no
24612519 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
24622520 soname_spec='${libname}${release}${shared_ext}$major'
24632521 shlibpath_var=LD_LIBRARY_PATH
2522+ shlibpath_overrides_runpath=no
24642523 hardcode_into_libs=yes
24652524 ;;
24662525
24672526 haiku*)
2468- version_type=linux
2527+ version_type=linux # correct to gnu/linux during the next big refactor
24692528 need_lib_prefix=no
24702529 need_version=no
24712530 dynamic_linker="$host_os runtime_loader"
@@ -2526,7 +2585,7 @@
25262585 ;;
25272586
25282587 interix[[3-9]]*)
2529- version_type=linux
2588+ version_type=linux # correct to gnu/linux during the next big refactor
25302589 need_lib_prefix=no
25312590 need_version=no
25322591 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2542,7 +2601,7 @@
25422601 nonstopux*) version_type=nonstopux ;;
25432602 *)
25442603 if test "$lt_cv_prog_gnu_ld" = yes; then
2545- version_type=linux
2604+ version_type=linux # correct to gnu/linux during the next big refactor
25462605 else
25472606 version_type=irix
25482607 fi ;;
@@ -2579,9 +2638,9 @@
25792638 dynamic_linker=no
25802639 ;;
25812640
2582-# This must be Linux ELF.
2641+# This must be glibc/ELF.
25832642 linux* | k*bsd*-gnu | kopensolaris*-gnu)
2584- version_type=linux
2643+ version_type=linux # correct to gnu/linux during the next big refactor
25852644 need_lib_prefix=no
25862645 need_version=no
25872646 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2644,7 +2703,7 @@
26442703 ;;
26452704
26462705 newsos6)
2647- version_type=linux
2706+ version_type=linux # correct to gnu/linux during the next big refactor
26482707 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
26492708 shlibpath_var=LD_LIBRARY_PATH
26502709 shlibpath_overrides_runpath=yes
@@ -2713,7 +2772,7 @@
27132772 ;;
27142773
27152774 solaris*)
2716- version_type=linux
2775+ version_type=linux # correct to gnu/linux during the next big refactor
27172776 need_lib_prefix=no
27182777 need_version=no
27192778 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2738,7 +2797,7 @@
27382797 ;;
27392798
27402799 sysv4 | sysv4.3*)
2741- version_type=linux
2800+ version_type=linux # correct to gnu/linux during the next big refactor
27422801 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
27432802 soname_spec='${libname}${release}${shared_ext}$major'
27442803 shlibpath_var=LD_LIBRARY_PATH
@@ -2762,7 +2821,7 @@
27622821
27632822 sysv4*MP*)
27642823 if test -d /usr/nec ;then
2765- version_type=linux
2824+ version_type=linux # correct to gnu/linux during the next big refactor
27662825 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
27672826 soname_spec='$libname${shared_ext}.$major'
27682827 shlibpath_var=LD_LIBRARY_PATH
@@ -2793,7 +2852,7 @@
27932852
27942853 tpf*)
27952854 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
2796- version_type=linux
2855+ version_type=linux # correct to gnu/linux during the next big refactor
27972856 need_lib_prefix=no
27982857 need_version=no
27992858 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2803,7 +2862,7 @@
28032862 ;;
28042863
28052864 uts4*)
2806- version_type=linux
2865+ version_type=linux # correct to gnu/linux during the next big refactor
28072866 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
28082867 soname_spec='${libname}${release}${shared_ext}$major'
28092868 shlibpath_var=LD_LIBRARY_PATH
@@ -3225,7 +3284,7 @@
32253284 lt_cv_deplibs_check_method=pass_all
32263285 ;;
32273286
3228-# This must be Linux ELF.
3287+# This must be glibc/ELF.
32293288 linux* | k*bsd*-gnu | kopensolaris*-gnu)
32303289 lt_cv_deplibs_check_method=pass_all
32313290 ;;
@@ -3645,6 +3704,7 @@
36453704 # which start with @ or ?.
36463705 lt_cv_sys_global_symbol_pipe="$AWK ['"\
36473706 " {last_section=section; section=\$ 3};"\
3707+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
36483708 " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
36493709 " \$ 0!~/External *\|/{next};"\
36503710 " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4229,7 +4289,9 @@
42294289 case $cc_basename in
42304290 nvcc*) # Cuda Compiler Driver 2.2
42314291 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
4232- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
4292+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
4293+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
4294+ fi
42334295 ;;
42344296 esac
42354297 else
@@ -4321,12 +4383,17 @@
43214383 ;;
43224384 *)
43234385 case `$CC -V 2>&1 | sed 5q` in
4324- *Sun\ F* | *Sun*Fortran*)
4386+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
43254387 # Sun Fortran 8.3 passes all unrecognized flags to the linker
43264388 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
43274389 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
43284390 _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
43294391 ;;
4392+ *Sun\ F* | *Sun*Fortran*)
4393+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4394+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4395+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
4396+ ;;
43304397 *Sun\ C*)
43314398 # Sun C 5.9
43324399 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4333,6 +4400,16 @@
43334400 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
43344401 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
43354402 ;;
4403+ *Intel*\ [[CF]]*Compiler*)
4404+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4405+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4406+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4407+ ;;
4408+ *Portland\ Group*)
4409+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4410+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
4411+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4412+ ;;
43364413 esac
43374414 ;;
43384415 esac
@@ -4492,7 +4569,9 @@
44924569 ;;
44934570 cygwin* | mingw* | cegcc*)
44944571 case $cc_basename in
4495- cl*) ;;
4572+ cl*)
4573+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
4574+ ;;
44964575 *)
44974576 _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'
44984577 _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4517,7 +4596,6 @@
45174596 _LT_TAGVAR(hardcode_direct, $1)=no
45184597 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
45194598 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
4520- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
45214599 _LT_TAGVAR(hardcode_libdir_separator, $1)=
45224600 _LT_TAGVAR(hardcode_minus_L, $1)=no
45234601 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4768,8 +4846,7 @@
47684846 xlf* | bgf* | bgxlf* | mpixlf*)
47694847 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
47704848 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
4771- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
4772- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
4849+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
47734850 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
47744851 if test "x$supports_anon_versioning" = xyes; then
47754852 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5064,6 +5141,7 @@
50645141 # The linker will not automatically build a static lib if we build a DLL.
50655142 # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
50665143 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
5144+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
50675145 _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'
50685146 # Don't use ranlib
50695147 _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5110,10 +5188,6 @@
51105188 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
51115189 ;;
51125190
5113- freebsd1*)
5114- _LT_TAGVAR(ld_shlibs, $1)=no
5115- ;;
5116-
51175191 # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
51185192 # support. Future versions do this automatically, but an explicit c++rt0.o
51195193 # does not break anything, and helps significantly (at the cost of a little
@@ -5126,7 +5200,7 @@
51265200 ;;
51275201
51285202 # Unfortunately, older versions of FreeBSD 2 do not have this feature.
5129- freebsd2*)
5203+ freebsd2.*)
51305204 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
51315205 _LT_TAGVAR(hardcode_direct, $1)=yes
51325206 _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5165,7 +5239,6 @@
51655239 fi
51665240 if test "$with_gnu_ld" = no; then
51675241 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
5168- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
51695242 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
51705243 _LT_TAGVAR(hardcode_direct, $1)=yes
51715244 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5607,9 +5680,6 @@
56075680 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
56085681 [Flag to hardcode $libdir into a binary during linking.
56095682 This must work even if $libdir does not exist])
5610-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
5611- [[If ld is used when linking, flag to hardcode $libdir into a binary
5612- during linking. This must work even if $libdir does not exist]])
56135683 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
56145684 [Whether we need a single "-rpath" flag with a separated argument])
56155685 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5767,7 +5837,6 @@
57675837 _LT_TAGVAR(hardcode_direct, $1)=no
57685838 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
57695839 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
5770-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
57715840 _LT_TAGVAR(hardcode_libdir_separator, $1)=
57725841 _LT_TAGVAR(hardcode_minus_L, $1)=no
57735842 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6137,7 +6206,7 @@
61376206 esac
61386207 ;;
61396208
6140- freebsd[[12]]*)
6209+ freebsd2.*)
61416210 # C++ shared libraries reported to be fairly broken before
61426211 # switch to ELF
61436212 _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6898,6 +6967,11 @@
68986967 }
68996968 };
69006969 _LT_EOF
6970+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
6971+package foo
6972+func foo() {
6973+}
6974+_LT_EOF
69016975 ])
69026976
69036977 _lt_libdeps_save_CFLAGS=$CFLAGS
@@ -6904,6 +6978,7 @@
69046978 case "$CC $CFLAGS " in #(
69056979 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
69066980 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
6981+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
69076982 esac
69086983
69096984 dnl Parse the compiler output and extract the necessary
@@ -7100,7 +7175,6 @@
71007175 _LT_TAGVAR(hardcode_direct, $1)=no
71017176 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
71027177 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
7103-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
71047178 _LT_TAGVAR(hardcode_libdir_separator, $1)=
71057179 _LT_TAGVAR(hardcode_minus_L, $1)=no
71067180 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7233,7 +7307,6 @@
72337307 _LT_TAGVAR(hardcode_direct, $1)=no
72347308 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
72357309 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
7236-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
72377310 _LT_TAGVAR(hardcode_libdir_separator, $1)=
72387311 _LT_TAGVAR(hardcode_minus_L, $1)=no
72397312 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7420,6 +7493,77 @@
74207493 ])# _LT_LANG_GCJ_CONFIG
74217494
74227495
7496+# _LT_LANG_GO_CONFIG([TAG])
7497+# --------------------------
7498+# Ensure that the configuration variables for the GNU Go compiler
7499+# are suitably defined. These variables are subsequently used by _LT_CONFIG
7500+# to write the compiler configuration to `libtool'.
7501+m4_defun([_LT_LANG_GO_CONFIG],
7502+[AC_REQUIRE([LT_PROG_GO])dnl
7503+AC_LANG_SAVE
7504+
7505+# Source file extension for Go test sources.
7506+ac_ext=go
7507+
7508+# Object file extension for compiled Go test sources.
7509+objext=o
7510+_LT_TAGVAR(objext, $1)=$objext
7511+
7512+# Code to be used in simple compile tests
7513+lt_simple_compile_test_code="package main; func main() { }"
7514+
7515+# Code to be used in simple link tests
7516+lt_simple_link_test_code='package main; func main() { }'
7517+
7518+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
7519+_LT_TAG_COMPILER
7520+
7521+# save warnings/boilerplate of simple test code
7522+_LT_COMPILER_BOILERPLATE
7523+_LT_LINKER_BOILERPLATE
7524+
7525+# Allow CC to be a program name with arguments.
7526+lt_save_CC=$CC
7527+lt_save_CFLAGS=$CFLAGS
7528+lt_save_GCC=$GCC
7529+GCC=yes
7530+CC=${GOC-"gccgo"}
7531+CFLAGS=$GOFLAGS
7532+compiler=$CC
7533+_LT_TAGVAR(compiler, $1)=$CC
7534+_LT_TAGVAR(LD, $1)="$LD"
7535+_LT_CC_BASENAME([$compiler])
7536+
7537+# Go did not exist at the time GCC didn't implicitly link libc in.
7538+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
7539+
7540+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
7541+_LT_TAGVAR(reload_flag, $1)=$reload_flag
7542+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
7543+
7544+## CAVEAT EMPTOR:
7545+## There is no encapsulation within the following macros, do not change
7546+## the running order or otherwise move them around unless you know exactly
7547+## what you are doing...
7548+if test -n "$compiler"; then
7549+ _LT_COMPILER_NO_RTTI($1)
7550+ _LT_COMPILER_PIC($1)
7551+ _LT_COMPILER_C_O($1)
7552+ _LT_COMPILER_FILE_LOCKS($1)
7553+ _LT_LINKER_SHLIBS($1)
7554+ _LT_LINKER_HARDCODE_LIBPATH($1)
7555+
7556+ _LT_CONFIG($1)
7557+fi
7558+
7559+AC_LANG_RESTORE
7560+
7561+GCC=$lt_save_GCC
7562+CC=$lt_save_CC
7563+CFLAGS=$lt_save_CFLAGS
7564+])# _LT_LANG_GO_CONFIG
7565+
7566+
74237567 # _LT_LANG_RC_CONFIG([TAG])
74247568 # -------------------------
74257569 # Ensure that the configuration variables for the Windows resource compiler
@@ -7489,6 +7633,13 @@
74897633 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
74907634
74917635
7636+# LT_PROG_GO
7637+# ----------
7638+AC_DEFUN([LT_PROG_GO],
7639+[AC_CHECK_TOOL(GOC, gccgo,)
7640+])
7641+
7642+
74927643 # LT_PROG_RC
74937644 # ----------
74947645 AC_DEFUN([LT_PROG_RC],
--- atque/trunk/ferro/m4/ltversion.m4 (revision 518)
+++ atque/trunk/ferro/m4/ltversion.m4 (revision 519)
@@ -9,15 +9,15 @@
99
1010 # @configure_input@
1111
12-# serial 3294 ltversion.m4
12+# serial 3337 ltversion.m4
1313 # This file is part of GNU Libtool
1414
15-m4_define([LT_PACKAGE_VERSION], [2.4])
16-m4_define([LT_PACKAGE_REVISION], [1.3294])
15+m4_define([LT_PACKAGE_VERSION], [2.4.2])
16+m4_define([LT_PACKAGE_REVISION], [1.3337])
1717
1818 AC_DEFUN([LTVERSION_VERSION],
19-[macro_version='2.4'
20-macro_revision='1.3294'
19+[macro_version='2.4.2'
20+macro_revision='1.3337'
2121 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
2222 _LT_DECL(, macro_revision, 0)
2323 ])
--- atque/trunk/ferro/m4/ltoptions.m4 (revision 518)
+++ atque/trunk/ferro/m4/ltoptions.m4 (revision 519)
@@ -326,9 +326,24 @@
326326 # MODE is either `yes' or `no'. If omitted, it defaults to `both'.
327327 m4_define([_LT_WITH_PIC],
328328 [AC_ARG_WITH([pic],
329- [AS_HELP_STRING([--with-pic],
329+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
330330 [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
331- [pic_mode="$withval"],
331+ [lt_p=${PACKAGE-default}
332+ case $withval in
333+ yes|no) pic_mode=$withval ;;
334+ *)
335+ pic_mode=default
336+ # Look at the argument we got. We use all the common list separators.
337+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
338+ for lt_pkg in $withval; do
339+ IFS="$lt_save_ifs"
340+ if test "X$lt_pkg" = "X$lt_p"; then
341+ pic_mode=yes
342+ fi
343+ done
344+ IFS="$lt_save_ifs"
345+ ;;
346+ esac],
332347 [pic_mode=default])
333348
334349 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
--- atque/trunk/ferro/configure (revision 518)
+++ atque/trunk/ferro/configure (revision 519)
@@ -1391,7 +1391,7 @@
13911391 Optional Packages:
13921392 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
13931393 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1394- --with-pic try to use only PIC/non-PIC objects [default=use
1394+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
13951395 both]
13961396 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
13971397 --with-sysroot=DIR Search for dependent libraries within DIR
@@ -4391,8 +4391,8 @@
43914391
43924392
43934393
4394-macro_version='2.4'
4395-macro_revision='1.3294'
4394+macro_version='2.4.2'
4395+macro_revision='1.3337'
43964396
43974397
43984398
@@ -5237,6 +5237,11 @@
52375237 lt_cv_sys_max_cmd_len=196608
52385238 ;;
52395239
5240+ os2*)
5241+ # The test takes a long time on OS/2.
5242+ lt_cv_sys_max_cmd_len=8192
5243+ ;;
5244+
52405245 osf*)
52415246 # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
52425247 # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -5705,7 +5710,7 @@
57055710 lt_cv_deplibs_check_method=pass_all
57065711 ;;
57075712
5708-# This must be Linux ELF.
5713+# This must be glibc/ELF.
57095714 linux* | k*bsd*-gnu | kopensolaris*-gnu)
57105715 lt_cv_deplibs_check_method=pass_all
57115716 ;;
@@ -6346,13 +6351,13 @@
63466351 if test -n "$RANLIB"; then
63476352 case $host_os in
63486353 openbsd*)
6349- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
6354+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
63506355 ;;
63516356 *)
6352- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
6357+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
63536358 ;;
63546359 esac
6355- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
6360+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
63566361 fi
63576362
63586363 case $host_os in
@@ -6499,6 +6504,7 @@
64996504 # which start with @ or ?.
65006505 lt_cv_sys_global_symbol_pipe="$AWK '"\
65016506 " {last_section=section; section=\$ 3};"\
6507+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
65026508 " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
65036509 " \$ 0!~/External *\|/{next};"\
65046510 " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -6887,7 +6893,7 @@
68876893 CFLAGS="$SAVE_CFLAGS"
68886894 fi
68896895 ;;
6890-sparc*-*solaris*)
6896+*-*solaris*)
68916897 # Find out which ABI we are using.
68926898 echo 'int i;' > conftest.$ac_ext
68936899 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -6898,7 +6904,20 @@
68986904 case `/usr/bin/file conftest.o` in
68996905 *64-bit*)
69006906 case $lt_cv_prog_gnu_ld in
6901- yes*) LD="${LD-ld} -m elf64_sparc" ;;
6907+ yes*)
6908+ case $host in
6909+ i?86-*-solaris*)
6910+ LD="${LD-ld} -m elf_x86_64"
6911+ ;;
6912+ sparc*-*-solaris*)
6913+ LD="${LD-ld} -m elf64_sparc"
6914+ ;;
6915+ esac
6916+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
6917+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
6918+ LD="${LD-ld}_sol2"
6919+ fi
6920+ ;;
69026921 *)
69036922 if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
69046923 LD="${LD-ld} -64"
@@ -7538,7 +7557,13 @@
75387557 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
75397558 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
75407559 _lt_result=$?
7541- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
7560+ # If there is a non-empty error log, and "single_module"
7561+ # appears in it, assume the flag caused a linker warning
7562+ if test -s conftest.err && $GREP single_module conftest.err; then
7563+ cat conftest.err >&5
7564+ # Otherwise, if the output was created with a 0 exit code from
7565+ # the compiler, it worked.
7566+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
75427567 lt_cv_apple_cc_single_mod=yes
75437568 else
75447569 cat conftest.err >&5
@@ -7549,6 +7574,7 @@
75497574 fi
75507575 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
75517576 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
7577+
75527578 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
75537579 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
75547580 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -7581,6 +7607,7 @@
75817607 fi
75827608 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
75837609 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
7610+
75847611 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
75857612 $as_echo_n "checking for -force_load linker flag... " >&6; }
75867613 if ${lt_cv_ld_force_load+:} false; then :
@@ -7602,7 +7629,9 @@
76027629 echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
76037630 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
76047631 _lt_result=$?
7605- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
7632+ if test -s conftest.err && $GREP force_load conftest.err; then
7633+ cat conftest.err >&5
7634+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
76067635 lt_cv_ld_force_load=yes
76077636 else
76087637 cat conftest.err >&5
@@ -7881,7 +7910,22 @@
78817910
78827911 # Check whether --with-pic was given.
78837912 if test "${with_pic+set}" = set; then :
7884- withval=$with_pic; pic_mode="$withval"
7913+ withval=$with_pic; lt_p=${PACKAGE-default}
7914+ case $withval in
7915+ yes|no) pic_mode=$withval ;;
7916+ *)
7917+ pic_mode=default
7918+ # Look at the argument we got. We use all the common list separators.
7919+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
7920+ for lt_pkg in $withval; do
7921+ IFS="$lt_save_ifs"
7922+ if test "X$lt_pkg" = "X$lt_p"; then
7923+ pic_mode=yes
7924+ fi
7925+ done
7926+ IFS="$lt_save_ifs"
7927+ ;;
7928+ esac
78857929 else
78867930 pic_mode=default
78877931 fi
@@ -7959,6 +8003,10 @@
79598003
79608004
79618005
8006+
8007+
8008+
8009+
79628010 test -z "$LN_S" && LN_S="ln -s"
79638011
79648012
@@ -8418,7 +8466,9 @@
84188466 case $cc_basename in
84198467 nvcc*) # Cuda Compiler Driver 2.2
84208468 lt_prog_compiler_wl='-Xlinker '
8421- lt_prog_compiler_pic='-Xcompiler -fPIC'
8469+ if test -n "$lt_prog_compiler_pic"; then
8470+ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
8471+ fi
84228472 ;;
84238473 esac
84248474 else
@@ -8509,12 +8559,17 @@
85098559 ;;
85108560 *)
85118561 case `$CC -V 2>&1 | sed 5q` in
8512- *Sun\ F* | *Sun*Fortran*)
8562+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
85138563 # Sun Fortran 8.3 passes all unrecognized flags to the linker
85148564 lt_prog_compiler_pic='-KPIC'
85158565 lt_prog_compiler_static='-Bstatic'
85168566 lt_prog_compiler_wl=''
85178567 ;;
8568+ *Sun\ F* | *Sun*Fortran*)
8569+ lt_prog_compiler_pic='-KPIC'
8570+ lt_prog_compiler_static='-Bstatic'
8571+ lt_prog_compiler_wl='-Qoption ld '
8572+ ;;
85188573 *Sun\ C*)
85198574 # Sun C 5.9
85208575 lt_prog_compiler_pic='-KPIC'
@@ -8521,6 +8576,16 @@
85218576 lt_prog_compiler_static='-Bstatic'
85228577 lt_prog_compiler_wl='-Wl,'
85238578 ;;
8579+ *Intel*\ [CF]*Compiler*)
8580+ lt_prog_compiler_wl='-Wl,'
8581+ lt_prog_compiler_pic='-fPIC'
8582+ lt_prog_compiler_static='-static'
8583+ ;;
8584+ *Portland\ Group*)
8585+ lt_prog_compiler_wl='-Wl,'
8586+ lt_prog_compiler_pic='-fpic'
8587+ lt_prog_compiler_static='-Bstatic'
8588+ ;;
85248589 esac
85258590 ;;
85268591 esac
@@ -8882,7 +8947,6 @@
88828947 hardcode_direct=no
88838948 hardcode_direct_absolute=no
88848949 hardcode_libdir_flag_spec=
8885- hardcode_libdir_flag_spec_ld=
88868950 hardcode_libdir_separator=
88878951 hardcode_minus_L=no
88888952 hardcode_shlibpath_var=unsupported
@@ -9132,8 +9196,7 @@
91329196 xlf* | bgf* | bgxlf* | mpixlf*)
91339197 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
91349198 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
9135- hardcode_libdir_flag_spec=
9136- hardcode_libdir_flag_spec_ld='-rpath $libdir'
9199+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
91379200 archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
91389201 if test "x$supports_anon_versioning" = xyes; then
91399202 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -9512,6 +9575,7 @@
95129575 # The linker will not automatically build a static lib if we build a DLL.
95139576 # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
95149577 enable_shared_with_static_runtimes=yes
9578+ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
95159579 export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
95169580 # Don't use ranlib
95179581 old_postinstall_cmds='chmod 644 $oldlib'
@@ -9557,6 +9621,7 @@
95579621 hardcode_shlibpath_var=unsupported
95589622 if test "$lt_cv_ld_force_load" = "yes"; then
95599623 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\"`'
9624+
95609625 else
95619626 whole_archive_flag_spec=''
95629627 fi
@@ -9585,10 +9650,6 @@
95859650 hardcode_shlibpath_var=no
95869651 ;;
95879652
9588- freebsd1*)
9589- ld_shlibs=no
9590- ;;
9591-
95929653 # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
95939654 # support. Future versions do this automatically, but an explicit c++rt0.o
95949655 # does not break anything, and helps significantly (at the cost of a little
@@ -9601,7 +9662,7 @@
96019662 ;;
96029663
96039664 # Unfortunately, older versions of FreeBSD 2 do not have this feature.
9604- freebsd2*)
9665+ freebsd2.*)
96059666 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
96069667 hardcode_direct=yes
96079668 hardcode_minus_L=yes
@@ -9640,7 +9701,6 @@
96409701 fi
96419702 if test "$with_gnu_ld" = no; then
96429703 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
9643- hardcode_libdir_flag_spec_ld='+b $libdir'
96449704 hardcode_libdir_separator=:
96459705 hardcode_direct=yes
96469706 hardcode_direct_absolute=yes
@@ -10264,11 +10324,6 @@
1026410324
1026510325
1026610326
10267-
10268-
10269-
10270-
10271-
1027210327 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
1027310328 $as_echo_n "checking dynamic linker characteristics... " >&6; }
1027410329
@@ -10358,7 +10413,7 @@
1035810413
1035910414 case $host_os in
1036010415 aix3*)
10361- version_type=linux
10416+ version_type=linux # correct to gnu/linux during the next big refactor
1036210417 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
1036310418 shlibpath_var=LIBPATH
1036410419
@@ -10367,7 +10422,7 @@
1036710422 ;;
1036810423
1036910424 aix[4-9]*)
10370- version_type=linux
10425+ version_type=linux # correct to gnu/linux during the next big refactor
1037110426 need_lib_prefix=no
1037210427 need_version=no
1037310428 hardcode_into_libs=yes
@@ -10432,7 +10487,7 @@
1043210487 ;;
1043310488
1043410489 bsdi[45]*)
10435- version_type=linux
10490+ version_type=linux # correct to gnu/linux during the next big refactor
1043610491 need_version=no
1043710492 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1043810493 soname_spec='${libname}${release}${shared_ext}$major'
@@ -10571,7 +10626,7 @@
1057110626 ;;
1057210627
1057310628 dgux*)
10574- version_type=linux
10629+ version_type=linux # correct to gnu/linux during the next big refactor
1057510630 need_lib_prefix=no
1057610631 need_version=no
1057710632 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10579,10 +10634,6 @@
1057910634 shlibpath_var=LD_LIBRARY_PATH
1058010635 ;;
1058110636
10582-freebsd1*)
10583- dynamic_linker=no
10584- ;;
10585-
1058610637 freebsd* | dragonfly*)
1058710638 # DragonFly does not have aout. When/if they implement a new
1058810639 # versioning mechanism, adjust this.
@@ -10590,7 +10641,7 @@
1059010641 objformat=`/usr/bin/objformat`
1059110642 else
1059210643 case $host_os in
10593- freebsd[123]*) objformat=aout ;;
10644+ freebsd[23].*) objformat=aout ;;
1059410645 *) objformat=elf ;;
1059510646 esac
1059610647 fi
@@ -10608,7 +10659,7 @@
1060810659 esac
1060910660 shlibpath_var=LD_LIBRARY_PATH
1061010661 case $host_os in
10611- freebsd2*)
10662+ freebsd2.*)
1061210663 shlibpath_overrides_runpath=yes
1061310664 ;;
1061410665 freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10628,17 +10679,18 @@
1062810679 ;;
1062910680
1063010681 gnu*)
10631- version_type=linux
10682+ version_type=linux # correct to gnu/linux during the next big refactor
1063210683 need_lib_prefix=no
1063310684 need_version=no
1063410685 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
1063510686 soname_spec='${libname}${release}${shared_ext}$major'
1063610687 shlibpath_var=LD_LIBRARY_PATH
10688+ shlibpath_overrides_runpath=no
1063710689 hardcode_into_libs=yes
1063810690 ;;
1063910691
1064010692 haiku*)
10641- version_type=linux
10693+ version_type=linux # correct to gnu/linux during the next big refactor
1064210694 need_lib_prefix=no
1064310695 need_version=no
1064410696 dynamic_linker="$host_os runtime_loader"
@@ -10699,7 +10751,7 @@
1069910751 ;;
1070010752
1070110753 interix[3-9]*)
10702- version_type=linux
10754+ version_type=linux # correct to gnu/linux during the next big refactor
1070310755 need_lib_prefix=no
1070410756 need_version=no
1070510757 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10715,7 +10767,7 @@
1071510767 nonstopux*) version_type=nonstopux ;;
1071610768 *)
1071710769 if test "$lt_cv_prog_gnu_ld" = yes; then
10718- version_type=linux
10770+ version_type=linux # correct to gnu/linux during the next big refactor
1071910771 else
1072010772 version_type=irix
1072110773 fi ;;
@@ -10752,9 +10804,9 @@
1075210804 dynamic_linker=no
1075310805 ;;
1075410806
10755-# This must be Linux ELF.
10807+# This must be glibc/ELF.
1075610808 linux* | k*bsd*-gnu | kopensolaris*-gnu)
10757- version_type=linux
10809+ version_type=linux # correct to gnu/linux during the next big refactor
1075810810 need_lib_prefix=no
1075910811 need_version=no
1076010812 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10836,7 +10888,7 @@
1083610888 ;;
1083710889
1083810890 newsos6)
10839- version_type=linux
10891+ version_type=linux # correct to gnu/linux during the next big refactor
1084010892 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1084110893 shlibpath_var=LD_LIBRARY_PATH
1084210894 shlibpath_overrides_runpath=yes
@@ -10905,7 +10957,7 @@
1090510957 ;;
1090610958
1090710959 solaris*)
10908- version_type=linux
10960+ version_type=linux # correct to gnu/linux during the next big refactor
1090910961 need_lib_prefix=no
1091010962 need_version=no
1091110963 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10930,7 +10982,7 @@
1093010982 ;;
1093110983
1093210984 sysv4 | sysv4.3*)
10933- version_type=linux
10985+ version_type=linux # correct to gnu/linux during the next big refactor
1093410986 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1093510987 soname_spec='${libname}${release}${shared_ext}$major'
1093610988 shlibpath_var=LD_LIBRARY_PATH
@@ -10954,7 +11006,7 @@
1095411006
1095511007 sysv4*MP*)
1095611008 if test -d /usr/nec ;then
10957- version_type=linux
11009+ version_type=linux # correct to gnu/linux during the next big refactor
1095811010 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
1095911011 soname_spec='$libname${shared_ext}.$major'
1096011012 shlibpath_var=LD_LIBRARY_PATH
@@ -10985,7 +11037,7 @@
1098511037
1098611038 tpf*)
1098711039 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
10988- version_type=linux
11040+ version_type=linux # correct to gnu/linux during the next big refactor
1098911041 need_lib_prefix=no
1099011042 need_version=no
1099111043 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10995,7 +11047,7 @@
1099511047 ;;
1099611048
1099711049 uts4*)
10998- version_type=linux
11050+ version_type=linux # correct to gnu/linux during the next big refactor
1099911051 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1100011052 soname_spec='${libname}${release}${shared_ext}$major'
1100111053 shlibpath_var=LD_LIBRARY_PATH
@@ -11920,7 +11972,6 @@
1192011972 hardcode_direct_CXX=no
1192111973 hardcode_direct_absolute_CXX=no
1192211974 hardcode_libdir_flag_spec_CXX=
11923-hardcode_libdir_flag_spec_ld_CXX=
1192411975 hardcode_libdir_separator_CXX=
1192511976 hardcode_minus_L_CXX=no
1192611977 hardcode_shlibpath_var_CXX=unsupported
@@ -12504,6 +12555,7 @@
1250412555 hardcode_shlibpath_var_CXX=unsupported
1250512556 if test "$lt_cv_ld_force_load" = "yes"; then
1250612557 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\"`'
12558+
1250712559 else
1250812560 whole_archive_flag_spec_CXX=''
1250912561 fi
@@ -12548,7 +12600,7 @@
1254812600 esac
1254912601 ;;
1255012602
12551- freebsd[12]*)
12603+ freebsd2.*)
1255212604 # C++ shared libraries reported to be fairly broken before
1255312605 # switch to ELF
1255412606 ld_shlibs_CXX=no
@@ -13224,6 +13276,7 @@
1322413276 case "$CC $CFLAGS " in #(
1322513277 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
1322613278 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
13279+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
1322713280 esac
1322813281
1322913282 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -14013,7 +14066,9 @@
1401314066 ;;
1401414067 cygwin* | mingw* | cegcc*)
1401514068 case $cc_basename in
14016- cl*) ;;
14069+ cl*)
14070+ exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
14071+ ;;
1401714072 *)
1401814073 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'
1401914074 exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
@@ -14166,8 +14221,6 @@
1416614221
1416714222
1416814223
14169-
14170-
1417114224 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
1417214225 $as_echo_n "checking dynamic linker characteristics... " >&6; }
1417314226
@@ -14193,7 +14246,7 @@
1419314246
1419414247 case $host_os in
1419514248 aix3*)
14196- version_type=linux
14249+ version_type=linux # correct to gnu/linux during the next big refactor
1419714250 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
1419814251 shlibpath_var=LIBPATH
1419914252
@@ -14202,7 +14255,7 @@
1420214255 ;;
1420314256
1420414257 aix[4-9]*)
14205- version_type=linux
14258+ version_type=linux # correct to gnu/linux during the next big refactor
1420614259 need_lib_prefix=no
1420714260 need_version=no
1420814261 hardcode_into_libs=yes
@@ -14267,7 +14320,7 @@
1426714320 ;;
1426814321
1426914322 bsdi[45]*)
14270- version_type=linux
14323+ version_type=linux # correct to gnu/linux during the next big refactor
1427114324 need_version=no
1427214325 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1427314326 soname_spec='${libname}${release}${shared_ext}$major'
@@ -14404,7 +14457,7 @@
1440414457 ;;
1440514458
1440614459 dgux*)
14407- version_type=linux
14460+ version_type=linux # correct to gnu/linux during the next big refactor
1440814461 need_lib_prefix=no
1440914462 need_version=no
1441014463 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -14412,10 +14465,6 @@
1441214465 shlibpath_var=LD_LIBRARY_PATH
1441314466 ;;
1441414467
14415-freebsd1*)
14416- dynamic_linker=no
14417- ;;
14418-
1441914468 freebsd* | dragonfly*)
1442014469 # DragonFly does not have aout. When/if they implement a new
1442114470 # versioning mechanism, adjust this.
@@ -14423,7 +14472,7 @@
1442314472 objformat=`/usr/bin/objformat`
1442414473 else
1442514474 case $host_os in
14426- freebsd[123]*) objformat=aout ;;
14475+ freebsd[23].*) objformat=aout ;;
1442714476 *) objformat=elf ;;
1442814477 esac
1442914478 fi
@@ -14441,7 +14490,7 @@
1444114490 esac
1444214491 shlibpath_var=LD_LIBRARY_PATH
1444314492 case $host_os in
14444- freebsd2*)
14493+ freebsd2.*)
1444514494 shlibpath_overrides_runpath=yes
1444614495 ;;
1444714496 freebsd3.[01]* | freebsdelf3.[01]*)
@@ -14461,17 +14510,18 @@
1446114510 ;;
1446214511
1446314512 gnu*)
14464- version_type=linux
14513+ version_type=linux # correct to gnu/linux during the next big refactor
1446514514 need_lib_prefix=no
1446614515 need_version=no
1446714516 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
1446814517 soname_spec='${libname}${release}${shared_ext}$major'
1446914518 shlibpath_var=LD_LIBRARY_PATH
14519+ shlibpath_overrides_runpath=no
1447014520 hardcode_into_libs=yes
1447114521 ;;
1447214522
1447314523 haiku*)
14474- version_type=linux
14524+ version_type=linux # correct to gnu/linux during the next big refactor
1447514525 need_lib_prefix=no
1447614526 need_version=no
1447714527 dynamic_linker="$host_os runtime_loader"
@@ -14532,7 +14582,7 @@
1453214582 ;;
1453314583
1453414584 interix[3-9]*)
14535- version_type=linux
14585+ version_type=linux # correct to gnu/linux during the next big refactor
1453614586 need_lib_prefix=no
1453714587 need_version=no
1453814588 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -14548,7 +14598,7 @@
1454814598 nonstopux*) version_type=nonstopux ;;
1454914599 *)
1455014600 if test "$lt_cv_prog_gnu_ld" = yes; then
14551- version_type=linux
14601+ version_type=linux # correct to gnu/linux during the next big refactor
1455214602 else
1455314603 version_type=irix
1455414604 fi ;;
@@ -14585,9 +14635,9 @@
1458514635 dynamic_linker=no
1458614636 ;;
1458714637
14588-# This must be Linux ELF.
14638+# This must be glibc/ELF.
1458914639 linux* | k*bsd*-gnu | kopensolaris*-gnu)
14590- version_type=linux
14640+ version_type=linux # correct to gnu/linux during the next big refactor
1459114641 need_lib_prefix=no
1459214642 need_version=no
1459314643 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14669,7 +14719,7 @@
1466914719 ;;
1467014720
1467114721 newsos6)
14672- version_type=linux
14722+ version_type=linux # correct to gnu/linux during the next big refactor
1467314723 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1467414724 shlibpath_var=LD_LIBRARY_PATH
1467514725 shlibpath_overrides_runpath=yes
@@ -14738,7 +14788,7 @@
1473814788 ;;
1473914789
1474014790 solaris*)
14741- version_type=linux
14791+ version_type=linux # correct to gnu/linux during the next big refactor
1474214792 need_lib_prefix=no
1474314793 need_version=no
1474414794 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14763,7 +14813,7 @@
1476314813 ;;
1476414814
1476514815 sysv4 | sysv4.3*)
14766- version_type=linux
14816+ version_type=linux # correct to gnu/linux during the next big refactor
1476714817 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1476814818 soname_spec='${libname}${release}${shared_ext}$major'
1476914819 shlibpath_var=LD_LIBRARY_PATH
@@ -14787,7 +14837,7 @@
1478714837
1478814838 sysv4*MP*)
1478914839 if test -d /usr/nec ;then
14790- version_type=linux
14840+ version_type=linux # correct to gnu/linux during the next big refactor
1479114841 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
1479214842 soname_spec='$libname${shared_ext}.$major'
1479314843 shlibpath_var=LD_LIBRARY_PATH
@@ -14818,7 +14868,7 @@
1481814868
1481914869 tpf*)
1482014870 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
14821- version_type=linux
14871+ version_type=linux # correct to gnu/linux during the next big refactor
1482214872 need_lib_prefix=no
1482314873 need_version=no
1482414874 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14828,7 +14878,7 @@
1482814878 ;;
1482914879
1483014880 uts4*)
14831- version_type=linux
14881+ version_type=linux # correct to gnu/linux during the next big refactor
1483214882 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1483314883 soname_spec='${libname}${release}${shared_ext}$major'
1483414884 shlibpath_var=LD_LIBRARY_PATH
@@ -14967,6 +15017,8 @@
1496715017
1496815018
1496915019
15020+
15021+
1497015022 ac_config_commands="$ac_config_commands libtool"
1497115023
1497215024
@@ -16025,6 +16077,7 @@
1602516077 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
1602616078 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
1602716079 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
16080+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
1602816081 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
1602916082 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
1603016083 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -16107,7 +16160,6 @@
1610716160 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
1610816161 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
1610916162 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
16110-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
1611116163 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
1611216164 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
1611316165 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -16179,7 +16231,6 @@
1617916231 allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
1618016232 no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
1618116233 hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
16182-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
1618316234 hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
1618416235 hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
1618516236 hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
@@ -16218,6 +16269,7 @@
1621816269 # Quote evaled strings.
1621916270 for var in SHELL \
1622016271 ECHO \
16272+PATH_SEPARATOR \
1622116273 SED \
1622216274 GREP \
1622316275 EGREP \
@@ -16268,7 +16320,6 @@
1626816320 allow_undefined_flag \
1626916321 no_undefined_flag \
1627016322 hardcode_libdir_flag_spec \
16271-hardcode_libdir_flag_spec_ld \
1627216323 hardcode_libdir_separator \
1627316324 exclude_expsyms \
1627416325 include_expsyms \
@@ -16302,7 +16353,6 @@
1630216353 allow_undefined_flag_CXX \
1630316354 no_undefined_flag_CXX \
1630416355 hardcode_libdir_flag_spec_CXX \
16305-hardcode_libdir_flag_spec_ld_CXX \
1630616356 hardcode_libdir_separator_CXX \
1630716357 exclude_expsyms_CXX \
1630816358 include_expsyms_CXX \
@@ -17111,8 +17161,8 @@
1711117161 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1711217162 #
1711317163 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
17114-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
17115-# Inc.
17164+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
17165+# Foundation, Inc.
1711617166 # Written by Gordon Matzigkeit, 1996
1711717167 #
1711817168 # This file is part of GNU Libtool.
@@ -17166,6 +17216,9 @@
1716617216 # An echo program that protects backslashes.
1716717217 ECHO=$lt_ECHO
1716817218
17219+# The PATH separator for the build system.
17220+PATH_SEPARATOR=$lt_PATH_SEPARATOR
17221+
1716917222 # The host system.
1717017223 host_alias=$host_alias
1717117224 host=$host
@@ -17467,10 +17520,6 @@
1746717520 # This must work even if \$libdir does not exist
1746817521 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
1746917522
17470-# If ld is used when linking, flag to hardcode \$libdir into a binary
17471-# during linking. This must work even if \$libdir does not exist.
17472-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
17473-
1747417523 # Whether we need a single "-rpath" flag with a separated argument.
1747517524 hardcode_libdir_separator=$lt_hardcode_libdir_separator
1747617525
@@ -17813,10 +17862,6 @@
1781317862 # This must work even if \$libdir does not exist
1781417863 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
1781517864
17816-# If ld is used when linking, flag to hardcode \$libdir into a binary
17817-# during linking. This must work even if \$libdir does not exist.
17818-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
17819-
1782017865 # Whether we need a single "-rpath" flag with a separated argument.
1782117866 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
1782217867
--- atque/trunk/ferro/config.h (revision 518)
+++ atque/trunk/ferro/config.h (revision 519)
@@ -2,7 +2,7 @@
22 /* config.h.in. Generated from configure.ac by autoheader. */
33
44 /* define if the Boost library is available */
5-/* #undef HAVE_BOOST */
5+#define HAVE_BOOST /**/
66
77 /* Define to 1 if you have the <dlfcn.h> header file. */
88 /* #undef HAVE_DLFCN_H */
--- atque/trunk/ferro/tools/Makefile (revision 518)
+++ atque/trunk/ferro/tools/Makefile (revision 519)
@@ -80,8 +80,8 @@
8080 AUTOHEADER = ${SHELL} /home/logue/atque2/ferro/config/missing --run autoheader
8181 AUTOMAKE = ${SHELL} /home/logue/atque2/ferro/config/missing --run automake-1.11
8282 AWK = gawk
83-BOOST_CPPFLAGS = -I/include/boost-0
84-BOOST_LDFLAGS = -L/lib
83+BOOST_CPPFLAGS =
84+BOOST_LDFLAGS =
8585 CC = gcc
8686 CCDEPMODE = depmode=gcc3
8787 CFLAGS = -g -O2
@@ -109,7 +109,7 @@
109109 INSTALL_PROGRAM = ${INSTALL}
110110 INSTALL_SCRIPT = ${INSTALL}
111111 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
112-LD = e:/mingw/mingw32/bin/ld.exe
112+LD = c:/mingw32/mingw32/bin/ld.exe
113113 LDFLAGS = -liconv
114114 LIBOBJS =
115115 LIBS =
@@ -182,7 +182,7 @@
182182 mkdir_p = /bin/mkdir -p
183183 oldincludedir = /usr/include
184184 pdfdir = ${docdir}
185-prefix = /c/mingw32
185+prefix = /mingw
186186 program_transform_name = s,x,x,
187187 psdir = ${docdir}
188188 sbindir = ${exec_prefix}/sbin
--- atque/trunk/ferro/config/ltmain.sh (revision 518)
+++ atque/trunk/ferro/config/ltmain.sh (revision 519)
@@ -1,9 +1,9 @@
11
2-# libtool (GNU libtool) 2.4
2+# libtool (GNU libtool) 2.4.2
33 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
44
55 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
6-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
6+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
77 # This is free software; see the source for copying conditions. There is NO
88 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
99
@@ -41,6 +41,7 @@
4141 # --quiet, --silent don't print informational messages
4242 # --no-quiet, --no-silent
4343 # print informational messages (default)
44+# --no-warn don't display warning messages
4445 # --tag=TAG use configuration variables from tag TAG
4546 # -v, --verbose print more informational messages than default
4647 # --no-verbose don't print the extra informational messages
@@ -69,7 +70,7 @@
6970 # compiler: $LTCC
7071 # compiler flags: $LTCFLAGS
7172 # linker: $LD (gnu? $with_gnu_ld)
72-# $progname: (GNU libtool) 2.4
73+# $progname: (GNU libtool) 2.4.2
7374 # automake: $automake_version
7475 # autoconf: $autoconf_version
7576 #
@@ -79,9 +80,9 @@
7980
8081 PROGRAM=libtool
8182 PACKAGE=libtool
82-VERSION=2.4
83+VERSION=2.4.2
8384 TIMESTAMP=""
84-package_revision=1.3294
85+package_revision=1.3337
8586
8687 # Be Bourne compatible
8788 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
136137
137138 : ${CP="cp -f"}
138139 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
139-: ${EGREP="/bin/grep -E"}
140-: ${FGREP="/bin/grep -F"}
141-: ${GREP="/bin/grep"}
142-: ${LN_S="cp -p"}
143140 : ${MAKE="make"}
144141 : ${MKDIR="mkdir"}
145142 : ${MV="mv -f"}
146143 : ${RM="rm -f"}
147-: ${SED="/bin/sed"}
148144 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
149145 : ${Xsed="$SED -e 1s/^X//"}
150146
@@ -387,7 +383,7 @@
387383 ;;
388384 *)
389385 save_IFS="$IFS"
390- IFS=:
386+ IFS=${PATH_SEPARATOR-:}
391387 for progdir in $PATH; do
392388 IFS="$save_IFS"
393389 test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
771767 s*\$LTCFLAGS*'"$LTCFLAGS"'*
772768 s*\$LD*'"$LD"'*
773769 s/\$with_gnu_ld/'"$with_gnu_ld"'/
774- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
775- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
770+ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
771+ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
776772 p
777773 d
778774 }
@@ -1052,6 +1048,7 @@
10521048 opt_help=false
10531049 opt_help_all=false
10541050 opt_silent=:
1051+opt_warning=:
10551052 opt_verbose=:
10561053 opt_silent=false
10571054 opt_verbose=false
@@ -1120,6 +1117,10 @@
11201117 opt_silent=false
11211118 func_append preserve_args " $opt"
11221119 ;;
1120+ --no-warning|--no-warn)
1121+ opt_warning=false
1122+func_append preserve_args " $opt"
1123+ ;;
11231124 --no-verbose)
11241125 opt_verbose=false
11251126 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
20592060 *.[cCFSifmso] | \
20602061 *.ada | *.adb | *.ads | *.asm | \
20612062 *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
2062- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
2063+ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
20632064 func_xform "$libobj"
20642065 libobj=$func_xform_result
20652066 ;;
@@ -3201,11 +3202,13 @@
32013202
32023203 # Set up the ranlib parameters.
32033204 oldlib="$destdir/$name"
3205+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
3206+ tool_oldlib=$func_to_tool_file_result
32043207
32053208 func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
32063209
32073210 if test -n "$stripme" && test -n "$old_striplib"; then
3208- func_show_eval "$old_striplib $oldlib" 'exit $?'
3211+ func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
32093212 fi
32103213
32113214 # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
34703473 # linked before any other PIC object. But we must not use
34713474 # pic_flag when linking with -static. The problem exists in
34723475 # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
3473- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
3476+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
34743477 pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
34753478 *-*-hpux*)
34763479 pic_flag_for_symtable=" $pic_flag" ;;
@@ -3982,14 +3985,17 @@
39823985 # launches target application with the remaining arguments.
39833986 func_exec_program ()
39843987 {
3985- for lt_wr_arg
3986- do
3987- case \$lt_wr_arg in
3988- --lt-*) ;;
3989- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
3990- esac
3991- shift
3992- done
3988+ case \" \$* \" in
3989+ *\\ --lt-*)
3990+ for lt_wr_arg
3991+ do
3992+ case \$lt_wr_arg in
3993+ --lt-*) ;;
3994+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
3995+ esac
3996+ shift
3997+ done ;;
3998+ esac
39933999 func_exec_program_core \${1+\"\$@\"}
39944000 }
39954001
@@ -5057,9 +5063,15 @@
50575063 {
50585064 EOF
50595065 func_emit_wrapper yes |
5060- $SED -e 's/\([\\"]\)/\\\1/g' \
5061- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
5062-
5066+ $SED -n -e '
5067+s/^\(.\{79\}\)\(..*\)/\1\
5068+\2/
5069+h
5070+s/\([\\"]\)/\\\1/g
5071+s/$/\\n/
5072+s/\([^\n]*\).*/ fputs ("\1", f);/p
5073+g
5074+D'
50635075 cat <<"EOF"
50645076 }
50655077 EOF
@@ -5066,41 +5078,6 @@
50665078 }
50675079 # end: func_emit_cwrapperexe_src
50685080
5069-# func_emit_exe_manifest
5070-# emit a Win32 UAC manifest for executable on stdout
5071-# Must ONLY be called from within func_mode_link because
5072-# it depends on a number of variable set therein.
5073-func_emit_exe_manifest ()
5074-{
5075- cat <<EOF
5076-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
5077-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
5078- <assemblyIdentity version="1.0.0.0"
5079-EOF
5080-
5081- case $host in
5082- i?86-*-* ) echo ' processorArchitecture="x86"' ;;
5083- ia64-*-* ) echo ' processorArchitecture="ia64"' ;;
5084- x86_64-*-* ) echo ' processorArchitecture="amd64"' ;;
5085- *) echo ' processorArchitecture="*"' ;;
5086- esac
5087-
5088- cat <<EOF
5089- name="$host_os.$PROGRAM.$outputname"
5090- type="win32"/>
5091-
5092- <!-- Identify the application security requirements. -->
5093- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
5094- <security>
5095- <requestedPrivileges>
5096- <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
5097- </requestedPrivileges>
5098- </security>
5099- </trustInfo>
5100-</assembly>
5101-EOF
5102-}
5103-
51045081 # func_win32_import_lib_p ARG
51055082 # True if ARG is an import lib, as indicated by $file_magic_cmd
51065083 func_win32_import_lib_p ()
@@ -5678,7 +5655,8 @@
56785655 continue
56795656 ;;
56805657
5681- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
5658+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
5659+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
56825660 func_append compiler_flags " $arg"
56835661 func_append compile_command " $arg"
56845662 func_append finalize_command " $arg"
@@ -5873,14 +5851,9 @@
58735851 # -tp=* Portland pgcc target processor selection
58745852 # --sysroot=* for sysroot support
58755853 # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
5876- # -{shared,static}-libgcc, -static-{libgfortran|libstdc++}
5877- # link against specified runtime library
5878- # -fstack-protector* stack protector flags for GCC
58795854 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
58805855 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
5881- -O*|-flto*|-fwhopr*|-fuse-linker-plugin| \
5882- -shared-libgcc|-static-libgcc|-static-libgfortran|-static-libstdc++| \
5883- -fstack-protector*)
5856+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
58845857 func_quote_for_eval "$arg"
58855858 arg="$func_quote_for_eval_result"
58865859 func_append compile_command " $arg"
@@ -6187,7 +6160,8 @@
61876160 lib=
61886161 found=no
61896162 case $deplib in
6190- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
6163+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
6164+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
61916165 if test "$linkmode,$pass" = "prog,link"; then
61926166 compile_deplibs="$deplib $compile_deplibs"
61936167 finalize_deplibs="$deplib $finalize_deplibs"
@@ -6871,7 +6845,7 @@
68716845 test "$hardcode_direct_absolute" = no; then
68726846 add="$dir/$linklib"
68736847 elif test "$hardcode_minus_L" = yes; then
6874- add_dir="-L$dir"
6848+ add_dir="-L$absdir"
68756849 # Try looking first in the location we're being installed to.
68766850 if test -n "$inst_prefix_dir"; then
68776851 case $libdir in
@@ -7356,6 +7330,7 @@
73567330 # which has an extra 1 added just for fun
73577331 #
73587332 case $version_type in
7333+ # correct linux to gnu/linux during the next big refactor
73597334 darwin|linux|osf|windows|none)
73607335 func_arith $number_major + $number_minor
73617336 current=$func_arith_result
@@ -7472,7 +7447,7 @@
74727447 versuffix="$major.$revision"
74737448 ;;
74747449
7475- linux)
7450+ linux) # correct to gnu/linux during the next big refactor
74767451 func_arith $current - $age
74777452 major=.$func_arith_result
74787453 versuffix="$major.$age.$revision"
@@ -8060,6 +8035,11 @@
80608035
80618036 # Test again, we may have decided not to build it any more
80628037 if test "$build_libtool_libs" = yes; then
8038+ # Remove ${wl} instances when linking with ld.
8039+ # FIXME: should test the right _cmds variable.
8040+ case $archive_cmds in
8041+ *\$LD\ *) wl= ;;
8042+ esac
80638043 if test "$hardcode_into_libs" = yes; then
80648044 # Hardcode the library paths
80658045 hardcode_libdirs=
@@ -8090,7 +8070,7 @@
80908070 elif test -n "$runpath_var"; then
80918071 case "$perm_rpath " in
80928072 *" $libdir "*) ;;
8093- *) func_apped perm_rpath " $libdir" ;;
8073+ *) func_append perm_rpath " $libdir" ;;
80948074 esac
80958075 fi
80968076 done
@@ -8098,11 +8078,7 @@
80988078 if test -n "$hardcode_libdir_separator" &&
80998079 test -n "$hardcode_libdirs"; then
81008080 libdir="$hardcode_libdirs"
8101- if test -n "$hardcode_libdir_flag_spec_ld"; then
8102- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
8103- else
8104- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
8105- fi
8081+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
81068082 fi
81078083 if test -n "$runpath_var" && test -n "$perm_rpath"; then
81088084 # We should set the runpath_var.
@@ -9066,7 +9042,7 @@
90669042 cwrappersource="$output_path/$objdir/lt-$output_name.c"
90679043 cwrapper="$output_path/$output_name.exe"
90689044 $RM $cwrappersource $cwrapper
9069- trap "$RM $cwrappersource $cwrapper $cwrapper.manifest; exit $EXIT_FAILURE" 1 2 15
9045+ trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
90709046
90719047 func_emit_cwrapperexe_src > $cwrappersource
90729048
@@ -9086,16 +9062,6 @@
90869062 $opt_dry_run || {
90879063 # note: this script will not be executed, so do not chmod.
90889064 if test "x$build" = "x$host" ; then
9089- # Create the UAC manifests first if necessary (but the
9090- # manifest files must have executable permission regardless).
9091- case $output_name in
9092- *instal*|*patch*|*setup*|*update*)
9093- func_emit_exe_manifest > $cwrapper.manifest
9094- func_emit_exe_manifest > $output_path/$objdir/$output_name.exe.manifest
9095- chmod +x $cwrapper.manifest
9096- chmod +x $output_path/$objdir/$output_name.exe.manifest
9097- ;;
9098- esac
90999065 $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
91009066 else
91019067 func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9202,6 +9168,8 @@
92029168 esac
92039169 done
92049170 fi
9171+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
9172+ tool_oldlib=$func_to_tool_file_result
92059173 eval cmds=\"$old_archive_cmds\"
92069174
92079175 func_len " $cmds"
@@ -9311,7 +9279,8 @@
93119279 *.la)
93129280 func_basename "$deplib"
93139281 name="$func_basename_result"
9314- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
9282+ func_resolve_sysroot "$deplib"
9283+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
93159284 test -z "$libdir" && \
93169285 func_fatal_error "\`$deplib' is not a valid libtool archive"
93179286 func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
@@ -9616,9 +9585,8 @@
96169585 # note $name still contains .exe if it was in $file originally
96179586 # as does the version of $file that was added into $rmfiles
96189587 func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
9619- func_append rmfiles " ${name}.manifest $objdir/${name}.manifest"
96209588 if test "$fast_install" = yes && test -n "$relink_command"; then
9621- func_append rmfiles " $odir/lt-$name $objdir/lt-${name}.manifest"
9589+ func_append rmfiles " $odir/lt-$name"
96229590 fi
96239591 if test "X$noexename" != "X$name" ; then
96249592 func_append rmfiles " $odir/lt-${noexename}.c"
--- atque/trunk/ferro/autogen.sh (revision 518)
+++ atque/trunk/ferro/autogen.sh (revision 519)
@@ -1,4 +1,70 @@
1-#!/bin/sh
2-
3-autoreconf -i
4-
1+#!/bin/sh
2+# Run this to generate all the initial makefiles, etc.
3+# This was lifted from the Gimp, and adapted slightly by
4+# Raph Levien, slightly hacked for xine by Daniel Caujolle-Bert.
5+
6+DIE=0
7+
8+PROG=atque
9+
10+# Check how echo works in this /bin/sh
11+case `echo -n` in
12+-n) _echo_n= _echo_c='\c';;
13+*) _echo_n=-n _echo_c=;;
14+esac
15+
16+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
17+ echo
18+ echo "You must have autoconf installed to compile $PROG."
19+ echo "Download the appropriate package for your distribution,"
20+ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
21+ DIE=1
22+}
23+
24+(automake --version) < /dev/null > /dev/null 2>&1 || {
25+ echo
26+ echo "You must have automake installed to compile $PROG."
27+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
28+ echo "(or a newer version if it is available)"
29+ DIE=1
30+}
31+
32+(aclocal --version) < /dev/null > /dev/null 2>&1 || {
33+ echo
34+ echo "**Error**: Missing aclocal. The version of automake"
35+ echo "installed doesn't appear recent enough."
36+ echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
37+ echo "(or a newer version if it is available)"
38+ DIE=1
39+}
40+
41+if [ "$DIE" -eq 1 ]; then
42+ exit 1
43+fi
44+
45+rm -rf autom4te.cache
46+
47+aclocalinclude="$ACLOCAL_FLAGS"; \
48+(echo $_echo_n " + Running aclocal: $_echo_c"; \
49+ aclocal $aclocalinclude; \
50+ echo "done.") && \
51+(echo $_echo_n " + Running autoheader: $_echo_c"; \
52+ autoheader; \
53+ echo "done.") && \
54+(echo $_echo_n " + Running automake: $_echo_c"; \
55+ automake --gnu --add-missing --copy; \
56+ echo "done.") && \
57+(echo $_echo_n " + Running autoconf: $_echo_c"; \
58+ autoconf; \
59+ echo "done.")
60+
61+rm -f config.cache
62+
63+if [ x"$NO_CONFIGURE" = "x" ]; then
64+ echo " + Running 'configure $@':"
65+ if [ -z "$*" ]; then
66+ echo " ** If you wish to pass arguments to ./configure, please"
67+ echo " ** specify them on the command line."
68+ fi
69+ ./configure "$@"
70+fi
--- atque/trunk/ferro/ferro/Makefile (revision 518)
+++ atque/trunk/ferro/ferro/Makefile (revision 519)
@@ -109,8 +109,8 @@
109109 AUTOHEADER = ${SHELL} /home/logue/atque2/ferro/config/missing --run autoheader
110110 AUTOMAKE = ${SHELL} /home/logue/atque2/ferro/config/missing --run automake-1.11
111111 AWK = gawk
112-BOOST_CPPFLAGS = -I/include/boost-0
113-BOOST_LDFLAGS = -L/lib
112+BOOST_CPPFLAGS =
113+BOOST_LDFLAGS =
114114 CC = gcc
115115 CCDEPMODE = depmode=gcc3
116116 CFLAGS = -g -O2
@@ -138,7 +138,7 @@
138138 INSTALL_PROGRAM = ${INSTALL}
139139 INSTALL_SCRIPT = ${INSTALL}
140140 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
141-LD = e:/mingw/mingw32/bin/ld.exe
141+LD = c:/mingw32/mingw32/bin/ld.exe
142142 LDFLAGS = -liconv
143143 LIBOBJS =
144144 LIBS =
@@ -211,7 +211,7 @@
211211 mkdir_p = /bin/mkdir -p
212212 oldincludedir = /usr/include
213213 pdfdir = ${docdir}
214-prefix = /c/mingw32
214+prefix = /mingw
215215 program_transform_name = s,x,x,
216216 psdir = ${docdir}
217217 sbindir = ${exec_prefix}/sbin
--- atque/trunk/ferro/Makefile (revision 518)
+++ atque/trunk/ferro/Makefile (revision 519)
@@ -114,8 +114,8 @@
114114 AUTOHEADER = ${SHELL} /home/logue/atque2/ferro/config/missing --run autoheader
115115 AUTOMAKE = ${SHELL} /home/logue/atque2/ferro/config/missing --run automake-1.11
116116 AWK = gawk
117-BOOST_CPPFLAGS = -I/include/boost-0
118-BOOST_LDFLAGS = -L/lib
117+BOOST_CPPFLAGS =
118+BOOST_LDFLAGS =
119119 CC = gcc
120120 CCDEPMODE = depmode=gcc3
121121 CFLAGS = -g -O2
@@ -143,7 +143,7 @@
143143 INSTALL_PROGRAM = ${INSTALL}
144144 INSTALL_SCRIPT = ${INSTALL}
145145 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
146-LD = e:/mingw/mingw32/bin/ld.exe
146+LD = c:/mingw32/mingw32/bin/ld.exe
147147 LDFLAGS = -liconv
148148 LIBOBJS =
149149 LIBS =
@@ -216,7 +216,7 @@
216216 mkdir_p = /bin/mkdir -p
217217 oldincludedir = /usr/include
218218 pdfdir = ${docdir}
219-prefix = /c/mingw32
219+prefix = /mingw
220220 program_transform_name = s,x,x,
221221 psdir = ${docdir}
222222 sbindir = ${exec_prefix}/sbin
旧リポジトリブラウザで表示