• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1996 (tree)
日時2012-10-30 11:31:42
作者satofumi

ログメッセージ

update ltmain.sh

変更サマリ

差分

--- trunk/libs/packages/urg/ltmain.sh (revision 1995)
+++ trunk/libs/packages/urg/ltmain.sh (revision 1996)
@@ -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 Debian-2.4.2-1ubuntu2
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 Debian-2.4.2-1ubuntu2"
8384 TIMESTAMP=""
84-package_revision=1.3293
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="grep -E"}
140-: ${FGREP="grep -F"}
141-: ${GREP="grep"}
142-: ${LN_S="ln -s"}
143140 : ${MAKE="make"}
144141 : ${MKDIR="mkdir"}
145142 : ${MV="mv -f"}
146143 : ${RM="rm -f"}
147-: ${SED="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
@@ -5643,7 +5655,8 @@
56435655 continue
56445656 ;;
56455657
5646- -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=*)
56475660 func_append compiler_flags " $arg"
56485661 func_append compile_command " $arg"
56495662 func_append finalize_command " $arg"
@@ -6111,7 +6124,10 @@
61116124 case $pass in
61126125 dlopen) libs="$dlfiles" ;;
61136126 dlpreopen) libs="$dlprefiles" ;;
6114- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
6127+ link)
6128+ libs="$deplibs %DEPLIBS%"
6129+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
6130+ ;;
61156131 esac
61166132 fi
61176133 if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6147,7 +6163,8 @@
61476163 lib=
61486164 found=no
61496165 case $deplib in
6150- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
6166+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
6167+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
61516168 if test "$linkmode,$pass" = "prog,link"; then
61526169 compile_deplibs="$deplib $compile_deplibs"
61536170 finalize_deplibs="$deplib $finalize_deplibs"
@@ -6430,19 +6447,19 @@
64306447 # It is a libtool convenience library, so add in its objects.
64316448 func_append convenience " $ladir/$objdir/$old_library"
64326449 func_append old_convenience " $ladir/$objdir/$old_library"
6450+ tmp_libs=
6451+ for deplib in $dependency_libs; do
6452+ deplibs="$deplib $deplibs"
6453+ if $opt_preserve_dup_deps ; then
6454+ case "$tmp_libs " in
6455+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
6456+ esac
6457+ fi
6458+ func_append tmp_libs " $deplib"
6459+ done
64336460 elif test "$linkmode" != prog && test "$linkmode" != lib; then
64346461 func_fatal_error "\`$lib' is not a convenience library"
64356462 fi
6436- tmp_libs=
6437- for deplib in $dependency_libs; do
6438- deplibs="$deplib $deplibs"
6439- if $opt_preserve_dup_deps ; then
6440- case "$tmp_libs " in
6441- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
6442- esac
6443- fi
6444- func_append tmp_libs " $deplib"
6445- done
64466463 continue
64476464 fi # $pass = conv
64486465
@@ -6831,7 +6848,7 @@
68316848 test "$hardcode_direct_absolute" = no; then
68326849 add="$dir/$linklib"
68336850 elif test "$hardcode_minus_L" = yes; then
6834- add_dir="-L$dir"
6851+ add_dir="-L$absdir"
68356852 # Try looking first in the location we're being installed to.
68366853 if test -n "$inst_prefix_dir"; then
68376854 case $libdir in
@@ -7316,6 +7333,7 @@
73167333 # which has an extra 1 added just for fun
73177334 #
73187335 case $version_type in
7336+ # correct linux to gnu/linux during the next big refactor
73197337 darwin|linux|osf|windows|none)
73207338 func_arith $number_major + $number_minor
73217339 current=$func_arith_result
@@ -7334,6 +7352,9 @@
73347352 revision="$number_minor"
73357353 lt_irix_increment=no
73367354 ;;
7355+ *)
7356+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
7357+ ;;
73377358 esac
73387359 ;;
73397360 no)
@@ -7432,7 +7453,7 @@
74327453 versuffix="$major.$revision"
74337454 ;;
74347455
7435- linux)
7456+ linux) # correct to gnu/linux during the next big refactor
74367457 func_arith $current - $age
74377458 major=.$func_arith_result
74387459 versuffix="$major.$age.$revision"
@@ -8020,6 +8041,11 @@
80208041
80218042 # Test again, we may have decided not to build it any more
80228043 if test "$build_libtool_libs" = yes; then
8044+ # Remove ${wl} instances when linking with ld.
8045+ # FIXME: should test the right _cmds variable.
8046+ case $archive_cmds in
8047+ *\$LD\ *) wl= ;;
8048+ esac
80238049 if test "$hardcode_into_libs" = yes; then
80248050 # Hardcode the library paths
80258051 hardcode_libdirs=
@@ -8050,7 +8076,7 @@
80508076 elif test -n "$runpath_var"; then
80518077 case "$perm_rpath " in
80528078 *" $libdir "*) ;;
8053- *) func_apped perm_rpath " $libdir" ;;
8079+ *) func_append perm_rpath " $libdir" ;;
80548080 esac
80558081 fi
80568082 done
@@ -8058,11 +8084,7 @@
80588084 if test -n "$hardcode_libdir_separator" &&
80598085 test -n "$hardcode_libdirs"; then
80608086 libdir="$hardcode_libdirs"
8061- if test -n "$hardcode_libdir_flag_spec_ld"; then
8062- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
8063- else
8064- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
8065- fi
8087+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
80668088 fi
80678089 if test -n "$runpath_var" && test -n "$perm_rpath"; then
80688090 # We should set the runpath_var.
@@ -9152,6 +9174,8 @@
91529174 esac
91539175 done
91549176 fi
9177+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
9178+ tool_oldlib=$func_to_tool_file_result
91559179 eval cmds=\"$old_archive_cmds\"
91569180
91579181 func_len " $cmds"
@@ -9261,7 +9285,8 @@
92619285 *.la)
92629286 func_basename "$deplib"
92639287 name="$func_basename_result"
9264- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
9288+ func_resolve_sysroot "$deplib"
9289+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
92659290 test -z "$libdir" && \
92669291 func_fatal_error "\`$deplib' is not a valid libtool archive"
92679292 func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
--- trunk/libs/packages/urg/config.h.in (revision 1995)
+++ trunk/libs/packages/urg/config.h.in (revision 1996)
@@ -158,6 +158,9 @@
158158 /* Define to the one symbol short name of this package. */
159159 #undef PACKAGE_TARNAME
160160
161+/* Define to the home page for this package. */
162+#undef PACKAGE_URL
163+
161164 /* Define to the version of this package. */
162165 #undef PACKAGE_VERSION
163166
--- trunk/libs/packages/urg/aclocal.m4 (revision 1995)
+++ trunk/libs/packages/urg/aclocal.m4 (revision 1996)
@@ -1,7 +1,8 @@
1-# generated automatically by aclocal 1.10 -*- Autoconf -*-
1+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
22
33 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4-# 2005, 2006 Free Software Foundation, Inc.
4+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
5+# Inc.
56 # This file is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
@@ -11,16 +12,19 @@
1112 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1213 # PARTICULAR PURPOSE.
1314
14-m4_if(m4_PACKAGE_VERSION, [2.61],,
15-[m4_fatal([this file was generated for autoconf 2.61.
16-You have another version of autoconf. If you want to use that,
17-you should regenerate the build system entirely.], [63])])
15+m4_ifndef([AC_AUTOCONF_VERSION],
16+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18+[m4_warning([this file was generated for autoconf 2.69.
19+You have another version of autoconf. It may work, but is not guaranteed to.
20+If you have problems, you may need to regenerate the build system entirely.
21+To do so, use the procedure documented by the package, typically `autoreconf'.])])
1822
1923 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
2024 #
2125 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
22-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
23-# Inc.
26+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
27+# Foundation, Inc.
2428 # Written by Gordon Matzigkeit, 1996
2529 #
2630 # This file is free software; the Free Software Foundation gives
@@ -29,8 +33,8 @@
2933
3034 m4_define([_LT_COPYING], [dnl
3135 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
32-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
33-# Inc.
36+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
37+# Foundation, Inc.
3438 # Written by Gordon Matzigkeit, 1996
3539 #
3640 # This file is part of GNU Libtool.
@@ -164,6 +168,8 @@
164168 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
165169 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
166170
171+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
172+dnl
167173 _LT_DECL([], [host_alias], [0], [The host system])dnl
168174 _LT_DECL([], [host], [0])dnl
169175 _LT_DECL([], [host_os], [0])dnl
@@ -649,7 +655,7 @@
649655 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
650656 configured by $[0], generated by m4_PACKAGE_STRING.
651657
652-Copyright (C) 2010 Free Software Foundation, Inc.
658+Copyright (C) 2011 Free Software Foundation, Inc.
653659 This config.lt script is free software; the Free Software Foundation
654660 gives unlimited permision to copy, distribute and modify it."
655661
@@ -813,6 +819,7 @@
813819 m4_case([$1],
814820 [C], [_LT_LANG(C)],
815821 [C++], [_LT_LANG(CXX)],
822+ [Go], [_LT_LANG(GO)],
816823 [Java], [_LT_LANG(GCJ)],
817824 [Fortran 77], [_LT_LANG(F77)],
818825 [Fortran], [_LT_LANG(FC)],
@@ -834,6 +841,29 @@
834841 ])# _LT_LANG
835842
836843
844+m4_ifndef([AC_PROG_GO], [
845+# NOTE: This macro has been submitted for inclusion into #
846+# GNU Autoconf as AC_PROG_GO. When it is available in #
847+# a released version of Autoconf we should remove this #
848+# macro and use it instead. #
849+m4_defun([AC_PROG_GO],
850+[AC_LANG_PUSH(Go)dnl
851+AC_ARG_VAR([GOC], [Go compiler command])dnl
852+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
853+_AC_ARG_VAR_LDFLAGS()dnl
854+AC_CHECK_TOOL(GOC, gccgo)
855+if test -z "$GOC"; then
856+ if test -n "$ac_tool_prefix"; then
857+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
858+ fi
859+fi
860+if test -z "$GOC"; then
861+ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
862+fi
863+])#m4_defun
864+])#m4_ifndef
865+
866+
837867 # _LT_LANG_DEFAULT_CONFIG
838868 # -----------------------
839869 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -864,6 +894,10 @@
864894 m4_ifdef([LT_PROG_GCJ],
865895 [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
866896
897+AC_PROVIDE_IFELSE([AC_PROG_GO],
898+ [LT_LANG(GO)],
899+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
900+
867901 AC_PROVIDE_IFELSE([LT_PROG_RC],
868902 [LT_LANG(RC)],
869903 [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -966,7 +1000,13 @@
9661000 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
9671001 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
9681002 _lt_result=$?
969- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
1003+ # If there is a non-empty error log, and "single_module"
1004+ # appears in it, assume the flag caused a linker warning
1005+ if test -s conftest.err && $GREP single_module conftest.err; then
1006+ cat conftest.err >&AS_MESSAGE_LOG_FD
1007+ # Otherwise, if the output was created with a 0 exit code from
1008+ # the compiler, it worked.
1009+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
9701010 lt_cv_apple_cc_single_mod=yes
9711011 else
9721012 cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -974,6 +1014,7 @@
9741014 rm -rf libconftest.dylib*
9751015 rm -f conftest.*
9761016 fi])
1017+
9771018 AC_CACHE_CHECK([for -exported_symbols_list linker flag],
9781019 [lt_cv_ld_exported_symbols_list],
9791020 [lt_cv_ld_exported_symbols_list=no
@@ -985,6 +1026,7 @@
9851026 [lt_cv_ld_exported_symbols_list=no])
9861027 LDFLAGS="$save_LDFLAGS"
9871028 ])
1029+
9881030 AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
9891031 [lt_cv_ld_force_load=no
9901032 cat > conftest.c << _LT_EOF
@@ -1002,7 +1044,9 @@
10021044 echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
10031045 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
10041046 _lt_result=$?
1005- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
1047+ if test -s conftest.err && $GREP force_load conftest.err; then
1048+ cat conftest.err >&AS_MESSAGE_LOG_FD
1049+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
10061050 lt_cv_ld_force_load=yes
10071051 else
10081052 cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1047,8 +1091,8 @@
10471091 ])
10481092
10491093
1050-# _LT_DARWIN_LINKER_FEATURES
1051-# --------------------------
1094+# _LT_DARWIN_LINKER_FEATURES([TAG])
1095+# ---------------------------------
10521096 # Checks for linker and compiler features on darwin
10531097 m4_defun([_LT_DARWIN_LINKER_FEATURES],
10541098 [
@@ -1059,6 +1103,8 @@
10591103 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
10601104 if test "$lt_cv_ld_force_load" = "yes"; then
10611105 _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\"`'
1106+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
1107+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
10621108 else
10631109 _LT_TAGVAR(whole_archive_flag_spec, $1)=''
10641110 fi
@@ -1342,7 +1388,7 @@
13421388 CFLAGS="$SAVE_CFLAGS"
13431389 fi
13441390 ;;
1345-sparc*-*solaris*)
1391+*-*solaris*)
13461392 # Find out which ABI we are using.
13471393 echo 'int i;' > conftest.$ac_ext
13481394 if AC_TRY_EVAL(ac_compile); then
@@ -1349,7 +1395,20 @@
13491395 case `/usr/bin/file conftest.o` in
13501396 *64-bit*)
13511397 case $lt_cv_prog_gnu_ld in
1352- yes*) LD="${LD-ld} -m elf64_sparc" ;;
1398+ yes*)
1399+ case $host in
1400+ i?86-*-solaris*)
1401+ LD="${LD-ld} -m elf_x86_64"
1402+ ;;
1403+ sparc*-*-solaris*)
1404+ LD="${LD-ld} -m elf64_sparc"
1405+ ;;
1406+ esac
1407+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
1408+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
1409+ LD="${LD-ld}_sol2"
1410+ fi
1411+ ;;
13531412 *)
13541413 if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
13551414 LD="${LD-ld} -64"
@@ -1426,13 +1485,13 @@
14261485 if test -n "$RANLIB"; then
14271486 case $host_os in
14281487 openbsd*)
1429- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
1488+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
14301489 ;;
14311490 *)
1432- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
1491+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
14331492 ;;
14341493 esac
1435- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1494+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
14361495 fi
14371496
14381497 case $host_os in
@@ -1612,6 +1671,11 @@
16121671 lt_cv_sys_max_cmd_len=196608
16131672 ;;
16141673
1674+ os2*)
1675+ # The test takes a long time on OS/2.
1676+ lt_cv_sys_max_cmd_len=8192
1677+ ;;
1678+
16151679 osf*)
16161680 # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
16171681 # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1651,7 +1715,7 @@
16511715 # If test is not a shell built-in, we'll probably end up computing a
16521716 # maximum length that is only half of the actual maximum length, but
16531717 # we can't tell.
1654- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
1718+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
16551719 = "X$teststring$teststring"; } >/dev/null 2>&1 &&
16561720 test $i != 17 # 1/2 MB should be enough
16571721 do
@@ -2197,7 +2261,7 @@
21972261
21982262 case $host_os in
21992263 aix3*)
2200- version_type=linux
2264+ version_type=linux # correct to gnu/linux during the next big refactor
22012265 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
22022266 shlibpath_var=LIBPATH
22032267
@@ -2206,7 +2270,7 @@
22062270 ;;
22072271
22082272 aix[[4-9]]*)
2209- version_type=linux
2273+ version_type=linux # correct to gnu/linux during the next big refactor
22102274 need_lib_prefix=no
22112275 need_version=no
22122276 hardcode_into_libs=yes
@@ -2271,7 +2335,7 @@
22712335 ;;
22722336
22732337 bsdi[[45]]*)
2274- version_type=linux
2338+ version_type=linux # correct to gnu/linux during the next big refactor
22752339 need_version=no
22762340 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
22772341 soname_spec='${libname}${release}${shared_ext}$major'
@@ -2410,7 +2474,7 @@
24102474 ;;
24112475
24122476 dgux*)
2413- version_type=linux
2477+ version_type=linux # correct to gnu/linux during the next big refactor
24142478 need_lib_prefix=no
24152479 need_version=no
24162480 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2418,10 +2482,6 @@
24182482 shlibpath_var=LD_LIBRARY_PATH
24192483 ;;
24202484
2421-freebsd1*)
2422- dynamic_linker=no
2423- ;;
2424-
24252485 freebsd* | dragonfly*)
24262486 # DragonFly does not have aout. When/if they implement a new
24272487 # versioning mechanism, adjust this.
@@ -2429,7 +2489,7 @@
24292489 objformat=`/usr/bin/objformat`
24302490 else
24312491 case $host_os in
2432- freebsd[[123]]*) objformat=aout ;;
2492+ freebsd[[23]].*) objformat=aout ;;
24332493 *) objformat=elf ;;
24342494 esac
24352495 fi
@@ -2447,7 +2507,7 @@
24472507 esac
24482508 shlibpath_var=LD_LIBRARY_PATH
24492509 case $host_os in
2450- freebsd2*)
2510+ freebsd2.*)
24512511 shlibpath_overrides_runpath=yes
24522512 ;;
24532513 freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2467,17 +2527,18 @@
24672527 ;;
24682528
24692529 gnu*)
2470- version_type=linux
2530+ version_type=linux # correct to gnu/linux during the next big refactor
24712531 need_lib_prefix=no
24722532 need_version=no
24732533 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
24742534 soname_spec='${libname}${release}${shared_ext}$major'
24752535 shlibpath_var=LD_LIBRARY_PATH
2536+ shlibpath_overrides_runpath=no
24762537 hardcode_into_libs=yes
24772538 ;;
24782539
24792540 haiku*)
2480- version_type=linux
2541+ version_type=linux # correct to gnu/linux during the next big refactor
24812542 need_lib_prefix=no
24822543 need_version=no
24832544 dynamic_linker="$host_os runtime_loader"
@@ -2538,7 +2599,7 @@
25382599 ;;
25392600
25402601 interix[[3-9]]*)
2541- version_type=linux
2602+ version_type=linux # correct to gnu/linux during the next big refactor
25422603 need_lib_prefix=no
25432604 need_version=no
25442605 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2554,7 +2615,7 @@
25542615 nonstopux*) version_type=nonstopux ;;
25552616 *)
25562617 if test "$lt_cv_prog_gnu_ld" = yes; then
2557- version_type=linux
2618+ version_type=linux # correct to gnu/linux during the next big refactor
25582619 else
25592620 version_type=irix
25602621 fi ;;
@@ -2591,9 +2652,9 @@
25912652 dynamic_linker=no
25922653 ;;
25932654
2594-# This must be Linux ELF.
2655+# This must be glibc/ELF.
25952656 linux* | k*bsd*-gnu | kopensolaris*-gnu)
2596- version_type=linux
2657+ version_type=linux # correct to gnu/linux during the next big refactor
25972658 need_lib_prefix=no
25982659 need_version=no
25992660 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2637,6 +2698,18 @@
26372698 dynamic_linker='GNU/Linux ld.so'
26382699 ;;
26392700
2701+netbsdelf*-gnu)
2702+ version_type=linux
2703+ need_lib_prefix=no
2704+ need_version=no
2705+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2706+ soname_spec='${libname}${release}${shared_ext}$major'
2707+ shlibpath_var=LD_LIBRARY_PATH
2708+ shlibpath_overrides_runpath=no
2709+ hardcode_into_libs=yes
2710+ dynamic_linker='NetBSD ld.elf_so'
2711+ ;;
2712+
26402713 netbsd*)
26412714 version_type=sunos
26422715 need_lib_prefix=no
@@ -2656,7 +2729,7 @@
26562729 ;;
26572730
26582731 newsos6)
2659- version_type=linux
2732+ version_type=linux # correct to gnu/linux during the next big refactor
26602733 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
26612734 shlibpath_var=LD_LIBRARY_PATH
26622735 shlibpath_overrides_runpath=yes
@@ -2725,7 +2798,7 @@
27252798 ;;
27262799
27272800 solaris*)
2728- version_type=linux
2801+ version_type=linux # correct to gnu/linux during the next big refactor
27292802 need_lib_prefix=no
27302803 need_version=no
27312804 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2750,7 +2823,7 @@
27502823 ;;
27512824
27522825 sysv4 | sysv4.3*)
2753- version_type=linux
2826+ version_type=linux # correct to gnu/linux during the next big refactor
27542827 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
27552828 soname_spec='${libname}${release}${shared_ext}$major'
27562829 shlibpath_var=LD_LIBRARY_PATH
@@ -2774,7 +2847,7 @@
27742847
27752848 sysv4*MP*)
27762849 if test -d /usr/nec ;then
2777- version_type=linux
2850+ version_type=linux # correct to gnu/linux during the next big refactor
27782851 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
27792852 soname_spec='$libname${shared_ext}.$major'
27802853 shlibpath_var=LD_LIBRARY_PATH
@@ -2805,7 +2878,7 @@
28052878
28062879 tpf*)
28072880 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
2808- version_type=linux
2881+ version_type=linux # correct to gnu/linux during the next big refactor
28092882 need_lib_prefix=no
28102883 need_version=no
28112884 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2815,7 +2888,7 @@
28152888 ;;
28162889
28172890 uts4*)
2818- version_type=linux
2891+ version_type=linux # correct to gnu/linux during the next big refactor
28192892 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
28202893 soname_spec='${libname}${release}${shared_ext}$major'
28212894 shlibpath_var=LD_LIBRARY_PATH
@@ -3237,12 +3310,12 @@
32373310 lt_cv_deplibs_check_method=pass_all
32383311 ;;
32393312
3240-# This must be Linux ELF.
3313+# This must be glibc/ELF.
32413314 linux* | k*bsd*-gnu | kopensolaris*-gnu)
32423315 lt_cv_deplibs_check_method=pass_all
32433316 ;;
32443317
3245-netbsd*)
3318+netbsd* | netbsdelf*-gnu)
32463319 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
32473320 lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
32483321 else
@@ -3657,6 +3730,7 @@
36573730 # which start with @ or ?.
36583731 lt_cv_sys_global_symbol_pipe="$AWK ['"\
36593732 " {last_section=section; section=\$ 3};"\
3733+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
36603734 " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
36613735 " \$ 0!~/External *\|/{next};"\
36623736 " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4053,7 +4127,7 @@
40534127 ;;
40544128 esac
40554129 ;;
4056- netbsd*)
4130+ netbsd* | netbsdelf*-gnu)
40574131 ;;
40584132 *qnx* | *nto*)
40594133 # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4241,7 +4315,9 @@
42414315 case $cc_basename in
42424316 nvcc*) # Cuda Compiler Driver 2.2
42434317 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
4244- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
4318+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
4319+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
4320+ fi
42454321 ;;
42464322 esac
42474323 else
@@ -4333,12 +4409,17 @@
43334409 ;;
43344410 *)
43354411 case `$CC -V 2>&1 | sed 5q` in
4336- *Sun\ F* | *Sun*Fortran*)
4412+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
43374413 # Sun Fortran 8.3 passes all unrecognized flags to the linker
43384414 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
43394415 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
43404416 _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
43414417 ;;
4418+ *Sun\ F* | *Sun*Fortran*)
4419+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
4420+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4421+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
4422+ ;;
43424423 *Sun\ C*)
43434424 # Sun C 5.9
43444425 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4345,6 +4426,16 @@
43454426 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
43464427 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
43474428 ;;
4429+ *Intel*\ [[CF]]*Compiler*)
4430+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4431+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4432+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4433+ ;;
4434+ *Portland\ Group*)
4435+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4436+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
4437+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4438+ ;;
43484439 esac
43494440 ;;
43504441 esac
@@ -4504,7 +4595,9 @@
45044595 ;;
45054596 cygwin* | mingw* | cegcc*)
45064597 case $cc_basename in
4507- cl*) ;;
4598+ cl*)
4599+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
4600+ ;;
45084601 *)
45094602 _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'
45104603 _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4511,6 +4604,9 @@
45114604 ;;
45124605 esac
45134606 ;;
4607+ linux* | k*bsd*-gnu | gnu*)
4608+ _LT_TAGVAR(link_all_deplibs, $1)=no
4609+ ;;
45144610 *)
45154611 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
45164612 ;;
@@ -4529,7 +4625,6 @@
45294625 _LT_TAGVAR(hardcode_direct, $1)=no
45304626 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
45314627 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
4532- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
45334628 _LT_TAGVAR(hardcode_libdir_separator, $1)=
45344629 _LT_TAGVAR(hardcode_minus_L, $1)=no
45354630 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4574,6 +4669,9 @@
45744669 openbsd*)
45754670 with_gnu_ld=no
45764671 ;;
4672+ linux* | k*bsd*-gnu | gnu*)
4673+ _LT_TAGVAR(link_all_deplibs, $1)=no
4674+ ;;
45774675 esac
45784676
45794677 _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4780,8 +4878,7 @@
47804878 xlf* | bgf* | bgxlf* | mpixlf*)
47814879 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
47824880 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
4783- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
4784- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
4881+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
47854882 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
47864883 if test "x$supports_anon_versioning" = xyes; then
47874884 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -4796,7 +4893,7 @@
47964893 fi
47974894 ;;
47984895
4799- netbsd*)
4896+ netbsd* | netbsdelf*-gnu)
48004897 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
48014898 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
48024899 wlarc=
@@ -4973,6 +5070,7 @@
49735070 if test "$aix_use_runtimelinking" = yes; then
49745071 shared_flag="$shared_flag "'${wl}-G'
49755072 fi
5073+ _LT_TAGVAR(link_all_deplibs, $1)=no
49765074 else
49775075 # not using gcc
49785076 if test "$host_cpu" = ia64; then
@@ -5076,6 +5174,7 @@
50765174 # The linker will not automatically build a static lib if we build a DLL.
50775175 # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
50785176 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
5177+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
50795178 _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'
50805179 # Don't use ranlib
50815180 _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5122,10 +5221,6 @@
51225221 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
51235222 ;;
51245223
5125- freebsd1*)
5126- _LT_TAGVAR(ld_shlibs, $1)=no
5127- ;;
5128-
51295224 # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
51305225 # support. Future versions do this automatically, but an explicit c++rt0.o
51315226 # does not break anything, and helps significantly (at the cost of a little
@@ -5138,7 +5233,7 @@
51385233 ;;
51395234
51405235 # Unfortunately, older versions of FreeBSD 2 do not have this feature.
5141- freebsd2*)
5236+ freebsd2.*)
51425237 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
51435238 _LT_TAGVAR(hardcode_direct, $1)=yes
51445239 _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5177,7 +5272,6 @@
51775272 fi
51785273 if test "$with_gnu_ld" = no; then
51795274 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
5180- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
51815275 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
51825276 _LT_TAGVAR(hardcode_direct, $1)=yes
51835277 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5281,7 +5375,7 @@
52815375 _LT_TAGVAR(link_all_deplibs, $1)=yes
52825376 ;;
52835377
5284- netbsd*)
5378+ netbsd* | netbsdelf*-gnu)
52855379 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
52865380 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
52875381 else
@@ -5619,9 +5713,6 @@
56195713 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
56205714 [Flag to hardcode $libdir into a binary during linking.
56215715 This must work even if $libdir does not exist])
5622-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
5623- [[If ld is used when linking, flag to hardcode $libdir into a binary
5624- during linking. This must work even if $libdir does not exist]])
56255716 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
56265717 [Whether we need a single "-rpath" flag with a separated argument])
56275718 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5775,7 +5866,6 @@
57755866 _LT_TAGVAR(hardcode_direct, $1)=no
57765867 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
57775868 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
5778-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
57795869 _LT_TAGVAR(hardcode_libdir_separator, $1)=
57805870 _LT_TAGVAR(hardcode_minus_L, $1)=no
57815871 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6145,7 +6235,7 @@
61456235 esac
61466236 ;;
61476237
6148- freebsd[[12]]*)
6238+ freebsd2.*)
61496239 # C++ shared libraries reported to be fairly broken before
61506240 # switch to ELF
61516241 _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6906,6 +6996,11 @@
69066996 }
69076997 };
69086998 _LT_EOF
6999+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
7000+package foo
7001+func foo() {
7002+}
7003+_LT_EOF
69097004 ])
69107005
69117006 _lt_libdeps_save_CFLAGS=$CFLAGS
@@ -6912,6 +7007,7 @@
69127007 case "$CC $CFLAGS " in #(
69137008 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
69147009 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
7010+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
69157011 esac
69167012
69177013 dnl Parse the compiler output and extract the necessary
@@ -7108,7 +7204,6 @@
71087204 _LT_TAGVAR(hardcode_direct, $1)=no
71097205 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
71107206 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
7111-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
71127207 _LT_TAGVAR(hardcode_libdir_separator, $1)=
71137208 _LT_TAGVAR(hardcode_minus_L, $1)=no
71147209 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7241,7 +7336,6 @@
72417336 _LT_TAGVAR(hardcode_direct, $1)=no
72427337 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
72437338 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
7244-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
72457339 _LT_TAGVAR(hardcode_libdir_separator, $1)=
72467340 _LT_TAGVAR(hardcode_minus_L, $1)=no
72477341 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7424,6 +7518,73 @@
74247518 ])# _LT_LANG_GCJ_CONFIG
74257519
74267520
7521+# _LT_LANG_GO_CONFIG([TAG])
7522+# --------------------------
7523+# Ensure that the configuration variables for the GNU Go compiler
7524+# are suitably defined. These variables are subsequently used by _LT_CONFIG
7525+# to write the compiler configuration to `libtool'.
7526+m4_defun([_LT_LANG_GO_CONFIG],
7527+[AC_REQUIRE([LT_PROG_GO])dnl
7528+AC_LANG_SAVE
7529+
7530+# Source file extension for Go test sources.
7531+ac_ext=go
7532+
7533+# Object file extension for compiled Go test sources.
7534+objext=o
7535+_LT_TAGVAR(objext, $1)=$objext
7536+
7537+# Code to be used in simple compile tests
7538+lt_simple_compile_test_code="package main; func main() { }"
7539+
7540+# Code to be used in simple link tests
7541+lt_simple_link_test_code='package main; func main() { }'
7542+
7543+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
7544+_LT_TAG_COMPILER
7545+
7546+# save warnings/boilerplate of simple test code
7547+_LT_COMPILER_BOILERPLATE
7548+_LT_LINKER_BOILERPLATE
7549+
7550+# Allow CC to be a program name with arguments.
7551+lt_save_CC=$CC
7552+lt_save_CFLAGS=$CFLAGS
7553+lt_save_GCC=$GCC
7554+GCC=yes
7555+CC=${GOC-"gccgo"}
7556+CFLAGS=$GOFLAGS
7557+compiler=$CC
7558+_LT_TAGVAR(compiler, $1)=$CC
7559+_LT_TAGVAR(LD, $1)="$LD"
7560+_LT_CC_BASENAME([$compiler])
7561+
7562+# Go did not exist at the time GCC didn't implicitly link libc in.
7563+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
7564+
7565+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
7566+_LT_TAGVAR(reload_flag, $1)=$reload_flag
7567+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
7568+
7569+if test -n "$compiler"; then
7570+ _LT_COMPILER_NO_RTTI($1)
7571+ _LT_COMPILER_PIC($1)
7572+ _LT_COMPILER_C_O($1)
7573+ _LT_COMPILER_FILE_LOCKS($1)
7574+ _LT_LINKER_SHLIBS($1)
7575+ _LT_LINKER_HARDCODE_LIBPATH($1)
7576+
7577+ _LT_CONFIG($1)
7578+fi
7579+
7580+AC_LANG_RESTORE
7581+
7582+GCC=$lt_save_GCC
7583+CC=$lt_save_CC
7584+CFLAGS=$lt_save_CFLAGS
7585+])# _LT_LANG_GO_CONFIG
7586+
7587+
74277588 # _LT_LANG_RC_CONFIG([TAG])
74287589 # -------------------------
74297590 # Ensure that the configuration variables for the Windows resource compiler
@@ -7493,6 +7654,13 @@
74937654 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
74947655
74957656
7657+# LT_PROG_GO
7658+# ----------
7659+AC_DEFUN([LT_PROG_GO],
7660+[AC_CHECK_TOOL(GOC, gccgo,)
7661+])
7662+
7663+
74967664 # LT_PROG_RC
74977665 # ----------
74987666 AC_DEFUN([LT_PROG_RC],
@@ -8157,9 +8325,24 @@
81578325 # MODE is either `yes' or `no'. If omitted, it defaults to `both'.
81588326 m4_define([_LT_WITH_PIC],
81598327 [AC_ARG_WITH([pic],
8160- [AS_HELP_STRING([--with-pic],
8328+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
81618329 [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
8162- [pic_mode="$withval"],
8330+ [lt_p=${PACKAGE-default}
8331+ case $withval in
8332+ yes|no) pic_mode=$withval ;;
8333+ *)
8334+ pic_mode=default
8335+ # Look at the argument we got. We use all the common list separators.
8336+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
8337+ for lt_pkg in $withval; do
8338+ IFS="$lt_save_ifs"
8339+ if test "X$lt_pkg" = "X$lt_p"; then
8340+ pic_mode=yes
8341+ fi
8342+ done
8343+ IFS="$lt_save_ifs"
8344+ ;;
8345+ esac],
81638346 [pic_mode=default])
81648347
81658348 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -8331,15 +8514,15 @@
83318514
83328515 # @configure_input@
83338516
8334-# serial 3293 ltversion.m4
8517+# serial 3337 ltversion.m4
83358518 # This file is part of GNU Libtool
83368519
8337-m4_define([LT_PACKAGE_VERSION], [2.4])
8338-m4_define([LT_PACKAGE_REVISION], [1.3293])
8520+m4_define([LT_PACKAGE_VERSION], [2.4.2])
8521+m4_define([LT_PACKAGE_REVISION], [1.3337])
83398522
83408523 AC_DEFUN([LTVERSION_VERSION],
8341-[macro_version='2.4'
8342-macro_revision='1.3293'
8524+[macro_version='2.4.2'
8525+macro_revision='1.3337'
83438526 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
83448527 _LT_DECL(, macro_revision, 0)
83458528 ])
@@ -8450,6 +8633,8 @@
84508633 # stolen from Manish Singh
84518634 # Shamelessly stolen from Owen Taylor
84528635
8636+# serial 1
8637+
84538638 dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
84548639 dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
84558640 dnl
@@ -8477,10 +8662,12 @@
84778662 fi
84788663 fi
84798664
8665+ as_save_PATH="$PATH"
84808666 if test "x$prefix" != xNONE; then
84818667 PATH="$prefix/bin:$prefix/usr/bin:$PATH"
84828668 fi
84838669 AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
8670+ PATH="$as_save_PATH"
84848671 min_sdl_version=ifelse([$1], ,0.11.0,$1)
84858672 AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
84868673 no_sdl=""
@@ -8625,12 +8812,15 @@
86258812 rm -f conf.sdltest
86268813 ])
86278814
8628-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
8815+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
8816+# Foundation, Inc.
86298817 #
86308818 # This file is free software; the Free Software Foundation
86318819 # gives unlimited permission to copy and/or distribute it,
86328820 # with or without modifications, as long as this notice is preserved.
86338821
8822+# serial 1
8823+
86348824 # AM_AUTOMAKE_VERSION(VERSION)
86358825 # ----------------------------
86368826 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -8637,10 +8827,10 @@
86378827 # generated from the m4 files accompanying Automake X.Y.
86388828 # (This private macro should not be called outside this file.)
86398829 AC_DEFUN([AM_AUTOMAKE_VERSION],
8640-[am__api_version='1.10'
8830+[am__api_version='1.11'
86418831 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
86428832 dnl require some minimum version. Point them to the right macro.
8643-m4_if([$1], [1.10], [],
8833+m4_if([$1], [1.11.6], [],
86448834 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
86458835 ])
86468836
@@ -8654,19 +8844,23 @@
86548844 # AM_SET_CURRENT_AUTOMAKE_VERSION
86558845 # -------------------------------
86568846 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
8657-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
8847+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
86588848 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
8659-[AM_AUTOMAKE_VERSION([1.10])dnl
8660-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
8849+[AM_AUTOMAKE_VERSION([1.11.6])dnl
8850+m4_ifndef([AC_AUTOCONF_VERSION],
8851+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
8852+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
86618853
86628854 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
86638855
8664-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
8856+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
86658857 #
86668858 # This file is free software; the Free Software Foundation
86678859 # gives unlimited permission to copy and/or distribute it,
86688860 # with or without modifications, as long as this notice is preserved.
86698861
8862+# serial 1
8863+
86708864 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
86718865 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
86728866 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -8714,7 +8908,7 @@
87148908
87158909 # AM_CONDITIONAL -*- Autoconf -*-
87168910
8717-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
8911+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
87188912 # Free Software Foundation, Inc.
87198913 #
87208914 # This file is free software; the Free Software Foundation
@@ -8721,7 +8915,7 @@
87218915 # gives unlimited permission to copy and/or distribute it,
87228916 # with or without modifications, as long as this notice is preserved.
87238917
8724-# serial 8
8918+# serial 9
87258919
87268920 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
87278921 # -------------------------------------
@@ -8734,6 +8928,7 @@
87348928 AC_SUBST([$1_FALSE])dnl
87358929 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
87368930 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
8931+m4_define([_AM_COND_VALUE_$1], [$2])dnl
87378932 if $2; then
87388933 $1_TRUE=
87398934 $1_FALSE='#'
@@ -8747,14 +8942,14 @@
87478942 Usually this means the macro was only invoked conditionally.]])
87488943 fi])])
87498944
8750-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
8751-# Free Software Foundation, Inc.
8945+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
8946+# 2010, 2011 Free Software Foundation, Inc.
87528947 #
87538948 # This file is free software; the Free Software Foundation
87548949 # gives unlimited permission to copy and/or distribute it,
87558950 # with or without modifications, as long as this notice is preserved.
87568951
8757-# serial 9
8952+# serial 12
87588953
87598954 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
87608955 # written in clear, in which case automake, when reading aclocal.m4,
@@ -8794,6 +8989,7 @@
87948989 # instance it was reported that on HP-UX the gcc test will end up
87958990 # making a dummy file named `D' -- because `-MD' means `put the output
87968991 # in D'.
8992+ rm -rf conftest.dir
87978993 mkdir conftest.dir
87988994 # Copy depcomp to subdir because otherwise we won't find it if we're
87998995 # using a relative directory.
@@ -8811,6 +9007,16 @@
88119007 if test "$am_compiler_list" = ""; then
88129008 am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
88139009 fi
9010+ am__universal=false
9011+ m4_case([$1], [CC],
9012+ [case " $depcc " in #(
9013+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
9014+ esac],
9015+ [CXX],
9016+ [case " $depcc " in #(
9017+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
9018+ esac])
9019+
88149020 for depmode in $am_compiler_list; do
88159021 # Setup a source with many dependencies, because some compilers
88169022 # like to wrap large dependency lists on column 80 (with \), and
@@ -8828,7 +9034,17 @@
88289034 done
88299035 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
88309036
9037+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
9038+ # mode. It turns out that the SunPro C++ compiler does not properly
9039+ # handle `-M -o', and we need to detect this. Also, some Intel
9040+ # versions had trouble with output in subdirs
9041+ am__obj=sub/conftest.${OBJEXT-o}
9042+ am__minus_obj="-o $am__obj"
88319043 case $depmode in
9044+ gcc)
9045+ # This depmode causes a compiler race in universal mode.
9046+ test "$am__universal" = false || continue
9047+ ;;
88329048 nosideeffect)
88339049 # after this tag, mechanisms are not by side-effect, so they'll
88349050 # only be used when explicitly requested
@@ -8838,19 +9054,23 @@
88389054 break
88399055 fi
88409056 ;;
9057+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
9058+ # This compiler won't grok `-c -o', but also, the minuso test has
9059+ # not run yet. These depmodes are late enough in the game, and
9060+ # so weak that their functioning should not be impacted.
9061+ am__obj=conftest.${OBJEXT-o}
9062+ am__minus_obj=
9063+ ;;
88419064 none) break ;;
88429065 esac
8843- # We check with `-c' and `-o' for the sake of the "dashmstdout"
8844- # mode. It turns out that the SunPro C++ compiler does not properly
8845- # handle `-M -o', and we need to detect this.
88469066 if depmode=$depmode \
8847- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
9067+ source=sub/conftest.c object=$am__obj \
88489068 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
8849- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
9069+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
88509070 >/dev/null 2>conftest.err &&
88519071 grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
88529072 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
8853- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
9073+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
88549074 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
88559075 # icc doesn't choke on unknown options, it will just issue warnings
88569076 # or remarks (even with -Werror). So we grep stderr for any message
@@ -8899,15 +9119,18 @@
88999119 if test "x$enable_dependency_tracking" != xno; then
89009120 am_depcomp="$ac_aux_dir/depcomp"
89019121 AMDEPBACKSLASH='\'
9122+ am__nodep='_no'
89029123 fi
89039124 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
89049125 AC_SUBST([AMDEPBACKSLASH])dnl
89059126 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
9127+AC_SUBST([am__nodep])dnl
9128+_AM_SUBST_NOTMAKE([am__nodep])dnl
89069129 ])
89079130
89089131 # Generate code to set up dependency tracking. -*- Autoconf -*-
89099132
8910-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
9133+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
89119134 # Free Software Foundation, Inc.
89129135 #
89139136 # This file is free software; the Free Software Foundation
@@ -8914,50 +9137,61 @@
89149137 # gives unlimited permission to copy and/or distribute it,
89159138 # with or without modifications, as long as this notice is preserved.
89169139
8917-#serial 3
9140+#serial 5
89189141
89199142 # _AM_OUTPUT_DEPENDENCY_COMMANDS
89209143 # ------------------------------
89219144 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
8922-[for mf in $CONFIG_FILES; do
8923- # Strip MF so we end up with the name of the file.
8924- mf=`echo "$mf" | sed -e 's/:.*$//'`
8925- # Check whether this is an Automake generated Makefile or not.
8926- # We used to match only the files named `Makefile.in', but
8927- # some people rename them; so instead we look at the file content.
8928- # Grep'ing the first line is not enough: some people post-process
8929- # each Makefile.in and add a new line on top of each file to say so.
8930- # Grep'ing the whole file is not good either: AIX grep has a line
8931- # limit of 2048, but all sed's we know have understand at least 4000.
8932- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
8933- dirpart=`AS_DIRNAME("$mf")`
8934- else
8935- continue
8936- fi
8937- # Extract the definition of DEPDIR, am__include, and am__quote
8938- # from the Makefile without running `make'.
8939- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
8940- test -z "$DEPDIR" && continue
8941- am__include=`sed -n 's/^am__include = //p' < "$mf"`
8942- test -z "am__include" && continue
8943- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
8944- # When using ansi2knr, U may be empty or an underscore; expand it
8945- U=`sed -n 's/^U = //p' < "$mf"`
8946- # Find all dependency output files, they are included files with
8947- # $(DEPDIR) in their names. We invoke sed twice because it is the
8948- # simplest approach to changing $(DEPDIR) to its actual value in the
8949- # expansion.
8950- for file in `sed -n "
8951- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
8952- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
8953- # Make sure the directory exists.
8954- test -f "$dirpart/$file" && continue
8955- fdir=`AS_DIRNAME(["$file"])`
8956- AS_MKDIR_P([$dirpart/$fdir])
8957- # echo "creating $dirpart/$file"
8958- echo '# dummy' > "$dirpart/$file"
9145+[{
9146+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
9147+ # are listed without --file. Let's play safe and only enable the eval
9148+ # if we detect the quoting.
9149+ case $CONFIG_FILES in
9150+ *\'*) eval set x "$CONFIG_FILES" ;;
9151+ *) set x $CONFIG_FILES ;;
9152+ esac
9153+ shift
9154+ for mf
9155+ do
9156+ # Strip MF so we end up with the name of the file.
9157+ mf=`echo "$mf" | sed -e 's/:.*$//'`
9158+ # Check whether this is an Automake generated Makefile or not.
9159+ # We used to match only the files named `Makefile.in', but
9160+ # some people rename them; so instead we look at the file content.
9161+ # Grep'ing the first line is not enough: some people post-process
9162+ # each Makefile.in and add a new line on top of each file to say so.
9163+ # Grep'ing the whole file is not good either: AIX grep has a line
9164+ # limit of 2048, but all sed's we know have understand at least 4000.
9165+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
9166+ dirpart=`AS_DIRNAME("$mf")`
9167+ else
9168+ continue
9169+ fi
9170+ # Extract the definition of DEPDIR, am__include, and am__quote
9171+ # from the Makefile without running `make'.
9172+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
9173+ test -z "$DEPDIR" && continue
9174+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
9175+ test -z "am__include" && continue
9176+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
9177+ # When using ansi2knr, U may be empty or an underscore; expand it
9178+ U=`sed -n 's/^U = //p' < "$mf"`
9179+ # Find all dependency output files, they are included files with
9180+ # $(DEPDIR) in their names. We invoke sed twice because it is the
9181+ # simplest approach to changing $(DEPDIR) to its actual value in the
9182+ # expansion.
9183+ for file in `sed -n "
9184+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
9185+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
9186+ # Make sure the directory exists.
9187+ test -f "$dirpart/$file" && continue
9188+ fdir=`AS_DIRNAME(["$file"])`
9189+ AS_MKDIR_P([$dirpart/$fdir])
9190+ # echo "creating $dirpart/$file"
9191+ echo '# dummy' > "$dirpart/$file"
9192+ done
89599193 done
8960-done
9194+}
89619195 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
89629196
89639197
@@ -8989,13 +9223,13 @@
89899223 # Do all the work for Automake. -*- Autoconf -*-
89909224
89919225 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
8992-# 2005, 2006 Free Software Foundation, Inc.
9226+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
89939227 #
89949228 # This file is free software; the Free Software Foundation
89959229 # gives unlimited permission to copy and/or distribute it,
89969230 # with or without modifications, as long as this notice is preserved.
89979231
8998-# serial 12
9232+# serial 16
89999233
90009234 # This macro actually does too much. Some checks are only needed if
90019235 # your package does certain things. But this isn't really a big deal.
@@ -9012,7 +9246,7 @@
90129246 # arguments mandatory, and then we can depend on a new Autoconf
90139247 # release and drop the old call support.
90149248 AC_DEFUN([AM_INIT_AUTOMAKE],
9015-[AC_PREREQ([2.60])dnl
9249+[AC_PREREQ([2.62])dnl
90169250 dnl Autoconf wants to disallow AM_ names. We explicitly allow
90179251 dnl the ones we care about.
90189252 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -9063,8 +9297,8 @@
90639297 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
90649298 AM_MISSING_PROG(AUTOHEADER, autoheader)
90659299 AM_MISSING_PROG(MAKEINFO, makeinfo)
9066-AM_PROG_INSTALL_SH
9067-AM_PROG_INSTALL_STRIP
9300+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
9301+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
90689302 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
90699303 # We need awk for the "check" target. The system "awk" is bad on
90709304 # some platforms.
@@ -9072,25 +9306,38 @@
90729306 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
90739307 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
90749308 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
9075- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
9076- [_AM_PROG_TAR([v7])])])
9309+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
9310+ [_AM_PROG_TAR([v7])])])
90779311 _AM_IF_OPTION([no-dependencies],,
90789312 [AC_PROVIDE_IFELSE([AC_PROG_CC],
9079- [_AM_DEPENDENCIES(CC)],
9080- [define([AC_PROG_CC],
9081- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
9313+ [_AM_DEPENDENCIES(CC)],
9314+ [define([AC_PROG_CC],
9315+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
90829316 AC_PROVIDE_IFELSE([AC_PROG_CXX],
9083- [_AM_DEPENDENCIES(CXX)],
9084- [define([AC_PROG_CXX],
9085- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
9317+ [_AM_DEPENDENCIES(CXX)],
9318+ [define([AC_PROG_CXX],
9319+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
90869320 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
9087- [_AM_DEPENDENCIES(OBJC)],
9088- [define([AC_PROG_OBJC],
9089- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
9321+ [_AM_DEPENDENCIES(OBJC)],
9322+ [define([AC_PROG_OBJC],
9323+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
90909324 ])
9325+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
9326+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
9327+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
9328+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
9329+AC_CONFIG_COMMANDS_PRE(dnl
9330+[m4_provide_if([_AM_COMPILER_EXEEXT],
9331+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
90919332 ])
90929333
9334+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
9335+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
9336+dnl mangled by Autoconf and run in a shell conditional statement.
9337+m4_define([_AC_COMPILER_EXEEXT],
9338+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
90939339
9340+
90949341 # When config.status generates a header, we must update the stamp-h file.
90959342 # This file resides in the same directory as the config header
90969343 # that is generated. The stamp files are numbered to have different names.
@@ -9100,29 +9347,40 @@
91009347 # our stamp files there.
91019348 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
91029349 [# Compute $1's index in $config_headers.
9350+_am_arg=$1
91039351 _am_stamp_count=1
91049352 for _am_header in $config_headers :; do
91059353 case $_am_header in
9106- $1 | $1:* )
9354+ $_am_arg | $_am_arg:* )
91079355 break ;;
91089356 * )
91099357 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
91109358 esac
91119359 done
9112-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
9360+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
91139361
9114-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
9362+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
9363+# Inc.
91159364 #
91169365 # This file is free software; the Free Software Foundation
91179366 # gives unlimited permission to copy and/or distribute it,
91189367 # with or without modifications, as long as this notice is preserved.
91199368
9369+# serial 1
9370+
91209371 # AM_PROG_INSTALL_SH
91219372 # ------------------
91229373 # Define $install_sh.
91239374 AC_DEFUN([AM_PROG_INSTALL_SH],
91249375 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
9125-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
9376+if test x"${install_sh}" != xset; then
9377+ case $am_aux_dir in
9378+ *\ * | *\ *)
9379+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
9380+ *)
9381+ install_sh="\${SHELL} $am_aux_dir/install-sh"
9382+ esac
9383+fi
91269384 AC_SUBST(install_sh)])
91279385
91289386 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -9148,13 +9406,13 @@
91489406
91499407 # Check to see how 'make' treats includes. -*- Autoconf -*-
91509408
9151-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
9409+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
91529410 #
91539411 # This file is free software; the Free Software Foundation
91549412 # gives unlimited permission to copy and/or distribute it,
91559413 # with or without modifications, as long as this notice is preserved.
91569414
9157-# serial 3
9415+# serial 4
91589416
91599417 # AM_MAKE_INCLUDE()
91609418 # -----------------
@@ -9163,7 +9421,7 @@
91639421 [am_make=${MAKE-make}
91649422 cat > confinc << 'END'
91659423 am__doit:
9166- @echo done
9424+ @echo this is the am__doit target
91679425 .PHONY: am__doit
91689426 END
91699427 # If we don't find an include directive, just comment out the code.
@@ -9173,24 +9431,24 @@
91739431 _am_result=none
91749432 # First try GNU make style include.
91759433 echo "include confinc" > confmf
9176-# We grep out `Entering directory' and `Leaving directory'
9177-# messages which can occur if `w' ends up in MAKEFLAGS.
9178-# In particular we don't look at `^make:' because GNU make might
9179-# be invoked under some other name (usually "gmake"), in which
9180-# case it prints its new name instead of `make'.
9181-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
9182- am__include=include
9183- am__quote=
9184- _am_result=GNU
9185-fi
9434+# Ignore all kinds of additional output from `make'.
9435+case `$am_make -s -f confmf 2> /dev/null` in #(
9436+*the\ am__doit\ target*)
9437+ am__include=include
9438+ am__quote=
9439+ _am_result=GNU
9440+ ;;
9441+esac
91869442 # Now try BSD make style include.
91879443 if test "$am__include" = "#"; then
91889444 echo '.include "confinc"' > confmf
9189- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
9190- am__include=.include
9191- am__quote="\""
9192- _am_result=BSD
9193- fi
9445+ case `$am_make -s -f confmf 2> /dev/null` in #(
9446+ *the\ am__doit\ target*)
9447+ am__include=.include
9448+ am__quote="\""
9449+ _am_result=BSD
9450+ ;;
9451+ esac
91949452 fi
91959453 AC_SUBST([am__include])
91969454 AC_SUBST([am__quote])
@@ -9200,7 +9458,7 @@
92009458
92019459 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
92029460
9203-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
9461+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
92049462 # Free Software Foundation, Inc.
92059463 #
92069464 # This file is free software; the Free Software Foundation
@@ -9207,7 +9465,7 @@
92079465 # gives unlimited permission to copy and/or distribute it,
92089466 # with or without modifications, as long as this notice is preserved.
92099467
9210-# serial 5
9468+# serial 6
92119469
92129470 # AM_MISSING_PROG(NAME, PROGRAM)
92139471 # ------------------------------
@@ -9224,7 +9482,14 @@
92249482 AC_DEFUN([AM_MISSING_HAS_RUN],
92259483 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
92269484 AC_REQUIRE_AUX_FILE([missing])dnl
9227-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
9485+if test x"${MISSING+set}" != xset; then
9486+ case $am_aux_dir in
9487+ *\ * | *\ *)
9488+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
9489+ *)
9490+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
9491+ esac
9492+fi
92289493 # Use eval to expand $SHELL
92299494 if eval "$MISSING --run true"; then
92309495 am_missing_run="$MISSING --run "
@@ -9234,12 +9499,15 @@
92349499 fi
92359500 ])
92369501
9237-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
9502+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
9503+# Inc.
92389504 #
92399505 # This file is free software; the Free Software Foundation
92409506 # gives unlimited permission to copy and/or distribute it,
92419507 # with or without modifications, as long as this notice is preserved.
92429508
9509+# serial 1
9510+
92439511 # AM_PROG_MKDIR_P
92449512 # ---------------
92459513 # Check for `mkdir -p'.
@@ -9262,13 +9530,14 @@
92629530
92639531 # Helper functions for option handling. -*- Autoconf -*-
92649532
9265-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
9533+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
9534+# Foundation, Inc.
92669535 #
92679536 # This file is free software; the Free Software Foundation
92689537 # gives unlimited permission to copy and/or distribute it,
92699538 # with or without modifications, as long as this notice is preserved.
92709539
9271-# serial 3
9540+# serial 5
92729541
92739542 # _AM_MANGLE_OPTION(NAME)
92749543 # -----------------------
@@ -9276,16 +9545,16 @@
92769545 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
92779546
92789547 # _AM_SET_OPTION(NAME)
9279-# ------------------------------
9548+# --------------------
92809549 # Set option NAME. Presently that only means defining a flag for this option.
92819550 AC_DEFUN([_AM_SET_OPTION],
92829551 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
92839552
92849553 # _AM_SET_OPTIONS(OPTIONS)
9285-# ----------------------------------
9554+# ------------------------
92869555 # OPTIONS is a space-separated list of Automake options.
92879556 AC_DEFUN([_AM_SET_OPTIONS],
9288-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
9557+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
92899558
92909559 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
92919560 # -------------------------------------------
@@ -9295,7 +9564,7 @@
92959564
92969565 # Check to make sure that the build environment is sane. -*- Autoconf -*-
92979566
9298-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
9567+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
92999568 # Free Software Foundation, Inc.
93009569 #
93019570 # This file is free software; the Free Software Foundation
@@ -9302,7 +9571,7 @@
93029571 # gives unlimited permission to copy and/or distribute it,
93039572 # with or without modifications, as long as this notice is preserved.
93049573
9305-# serial 4
9574+# serial 5
93069575
93079576 # AM_SANITY_CHECK
93089577 # ---------------
@@ -9311,6 +9580,19 @@
93119580 # Just in case
93129581 sleep 1
93139582 echo timestamp > conftest.file
9583+# Reject unsafe characters in $srcdir or the absolute working directory
9584+# name. Accept space and tab only in the latter.
9585+am_lf='
9586+'
9587+case `pwd` in
9588+ *[[\\\"\#\$\&\'\`$am_lf]]*)
9589+ AC_MSG_ERROR([unsafe absolute working directory name]);;
9590+esac
9591+case $srcdir in
9592+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
9593+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
9594+esac
9595+
93149596 # Do `set' in a subshell so we don't clobber the current shell's
93159597 # arguments. Must try -L first in case configure is actually a
93169598 # symlink; some systems play weird games with the mod time of symlinks
@@ -9317,10 +9599,10 @@
93179599 # (eg FreeBSD returns the mod time of the symlink's containing
93189600 # directory).
93199601 if (
9320- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
9602+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
93219603 if test "$[*]" = "X"; then
93229604 # -L didn't work.
9323- set X `ls -t $srcdir/configure conftest.file`
9605+ set X `ls -t "$srcdir/configure" conftest.file`
93249606 fi
93259607 rm -f conftest.file
93269608 if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -9345,12 +9627,14 @@
93459627 fi
93469628 AC_MSG_RESULT(yes)])
93479629
9348-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
9630+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
93499631 #
93509632 # This file is free software; the Free Software Foundation
93519633 # gives unlimited permission to copy and/or distribute it,
93529634 # with or without modifications, as long as this notice is preserved.
93539635
9636+# serial 1
9637+
93549638 # AM_PROG_INSTALL_STRIP
93559639 # ---------------------
93569640 # One issue with vendor `install' (even GNU) is that you can't
@@ -9373,21 +9657,28 @@
93739657 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
93749658 AC_SUBST([INSTALL_STRIP_PROGRAM])])
93759659
9376-# Copyright (C) 2006 Free Software Foundation, Inc.
9660+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
93779661 #
93789662 # This file is free software; the Free Software Foundation
93799663 # gives unlimited permission to copy and/or distribute it,
93809664 # with or without modifications, as long as this notice is preserved.
93819665
9666+# serial 3
9667+
93829668 # _AM_SUBST_NOTMAKE(VARIABLE)
93839669 # ---------------------------
9384-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
9670+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
93859671 # This macro is traced by Automake.
93869672 AC_DEFUN([_AM_SUBST_NOTMAKE])
93879673
9674+# AM_SUBST_NOTMAKE(VARIABLE)
9675+# --------------------------
9676+# Public sister of _AM_SUBST_NOTMAKE.
9677+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
9678+
93889679 # Check how to create a tarball. -*- Autoconf -*-
93899680
9390-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
9681+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
93919682 #
93929683 # This file is free software; the Free Software Foundation
93939684 # gives unlimited permission to copy and/or distribute it,
@@ -9409,10 +9700,11 @@
94099700 # a tarball read from stdin.
94109701 # $(am__untar) < result.tar
94119702 AC_DEFUN([_AM_PROG_TAR],
9412-[# Always define AMTAR for backward compatibility.
9413-AM_MISSING_PROG([AMTAR], [tar])
9703+[# Always define AMTAR for backward compatibility. Yes, it's still used
9704+# in the wild :-( We should find a proper way to deprecate it ...
9705+AC_SUBST([AMTAR], ['$${TAR-tar}'])
94149706 m4_if([$1], [v7],
9415- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
9707+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
94169708 [m4_case([$1], [ustar],, [pax],,
94179709 [m4_fatal([Unknown tar format])])
94189710 AC_MSG_CHECKING([how to create a $1 tar archive])
旧リポジトリブラウザで表示