Ubuntu
ubuntuone-client-gnome package

Merge lp:~dobey/ubuntu/precise/ubuntuone-client-gnome/release-2-99-2 into lp:ubuntu/precise/ubuntuone-client-gnome

  1. Precise (12.04)
  2. release-2-99-2
  3. Merge into precise
Proposed by dobey
Status: Merged
Merged at revision: 13
Proposed branch: lp:~dobey/ubuntu/precise/ubuntuone-client-gnome/release-2-99-2
Merge into: lp:ubuntu/precise/ubuntuone-client-gnome
Diff against target: 1662 lines (+414/-172)
7 files modified
configure (+121/-69)
configure.ac (+1/-1)
debian/changelog (+6/-0)
ltmain.sh (+57/-38)
m4/libtool.m4 (+207/-57)
m4/ltoptions.m4 (+17/-2)
m4/ltversion.m4 (+5/-5)
To merge this branch: bzr merge lp:~dobey/ubuntu/precise/ubuntuone-client-gnome/release-2-99-2
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+88960@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure'
2--- configure 2012-01-04 13:23:49 +0000
3+++ configure 2012-01-17 23:06:35 +0000
4@@ -1,6 +1,6 @@
5 #! /bin/sh
6 # Guess values for system-dependent variables and create Makefiles.
7-# Generated by GNU Autoconf 2.68 for ubuntuone-client-gnome 2.99.1.
8+# Generated by GNU Autoconf 2.68 for ubuntuone-client-gnome 2.99.2.
9 #
10 #
11 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
12@@ -567,8 +567,8 @@
13 # Identity of this package.
14 PACKAGE_NAME='ubuntuone-client-gnome'
15 PACKAGE_TARNAME='ubuntuone-client-gnome'
16-PACKAGE_VERSION='2.99.1'
17-PACKAGE_STRING='ubuntuone-client-gnome 2.99.1'
18+PACKAGE_VERSION='2.99.2'
19+PACKAGE_STRING='ubuntuone-client-gnome 2.99.2'
20 PACKAGE_BUGREPORT=''
21 PACKAGE_URL=''
22
23@@ -1353,7 +1353,7 @@
24 # Omit some internal or obsolete options to make the list less imposing.
25 # This message is too long to be a string in the A/UX 3.1 sh.
26 cat <<_ACEOF
27-\`configure' configures ubuntuone-client-gnome 2.99.1 to adapt to many kinds of systems.
28+\`configure' configures ubuntuone-client-gnome 2.99.2 to adapt to many kinds of systems.
29
30 Usage: $0 [OPTION]... [VAR=VALUE]...
31
32@@ -1424,7 +1424,7 @@
33
34 if test -n "$ac_init_help"; then
35 case $ac_init_help in
36- short | recursive ) echo "Configuration of ubuntuone-client-gnome 2.99.1:";;
37+ short | recursive ) echo "Configuration of ubuntuone-client-gnome 2.99.2:";;
38 esac
39 cat <<\_ACEOF
40
41@@ -1450,7 +1450,7 @@
42 Optional Packages:
43 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
44 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
45- --with-pic try to use only PIC/non-PIC objects [default=use
46+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
47 both]
48 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
49 --with-sysroot=DIR Search for dependent libraries within DIR
50@@ -1547,7 +1547,7 @@
51 test -n "$ac_init_help" && exit $ac_status
52 if $ac_init_version; then
53 cat <<\_ACEOF
54-ubuntuone-client-gnome configure 2.99.1
55+ubuntuone-client-gnome configure 2.99.2
56 generated by GNU Autoconf 2.68
57
58 Copyright (C) 2010 Free Software Foundation, Inc.
59@@ -1825,7 +1825,7 @@
60 This file contains any messages produced by compilers while
61 running configure, to aid debugging if configure makes a mistake.
62
63-It was created by ubuntuone-client-gnome $as_me 2.99.1, which was
64+It was created by ubuntuone-client-gnome $as_me 2.99.2, which was
65 generated by GNU Autoconf 2.68. Invocation command line was
66
67 $ $0 $@
68@@ -2642,7 +2642,7 @@
69
70 # Define the identity of the package.
71 PACKAGE='ubuntuone-client-gnome'
72- VERSION='2.99.1'
73+ VERSION='2.99.2'
74
75
76 cat >>confdefs.h <<_ACEOF
77@@ -4409,8 +4409,8 @@
78
79
80
81-macro_version='2.4'
82-macro_revision='1.3293'
83+macro_version='2.4.2'
84+macro_revision='1.3337'
85
86
87
88@@ -5255,6 +5255,11 @@
89 lt_cv_sys_max_cmd_len=196608
90 ;;
91
92+ os2*)
93+ # The test takes a long time on OS/2.
94+ lt_cv_sys_max_cmd_len=8192
95+ ;;
96+
97 osf*)
98 # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
99 # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
100@@ -5294,7 +5299,7 @@
101 # If test is not a shell built-in, we'll probably end up computing a
102 # maximum length that is only half of the actual maximum length, but
103 # we can't tell.
104- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
105+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
106 = "X$teststring$teststring"; } >/dev/null 2>&1 &&
107 test $i != 17 # 1/2 MB should be enough
108 do
109@@ -5723,7 +5728,7 @@
110 lt_cv_deplibs_check_method=pass_all
111 ;;
112
113-# This must be Linux ELF.
114+# This must be glibc/ELF.
115 linux* | k*bsd*-gnu | kopensolaris*-gnu)
116 lt_cv_deplibs_check_method=pass_all
117 ;;
118@@ -6363,13 +6368,13 @@
119 if test -n "$RANLIB"; then
120 case $host_os in
121 openbsd*)
122- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
123+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
124 ;;
125 *)
126- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
127+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
128 ;;
129 esac
130- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
131+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
132 fi
133
134 case $host_os in
135@@ -6516,6 +6521,7 @@
136 # which start with @ or ?.
137 lt_cv_sys_global_symbol_pipe="$AWK '"\
138 " {last_section=section; section=\$ 3};"\
139+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
140 " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
141 " \$ 0!~/External *\|/{next};"\
142 " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
143@@ -6904,7 +6910,7 @@
144 CFLAGS="$SAVE_CFLAGS"
145 fi
146 ;;
147-sparc*-*solaris*)
148+*-*solaris*)
149 # Find out which ABI we are using.
150 echo 'int i;' > conftest.$ac_ext
151 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
152@@ -6915,7 +6921,20 @@
153 case `/usr/bin/file conftest.o` in
154 *64-bit*)
155 case $lt_cv_prog_gnu_ld in
156- yes*) LD="${LD-ld} -m elf64_sparc" ;;
157+ yes*)
158+ case $host in
159+ i?86-*-solaris*)
160+ LD="${LD-ld} -m elf_x86_64"
161+ ;;
162+ sparc*-*-solaris*)
163+ LD="${LD-ld} -m elf64_sparc"
164+ ;;
165+ esac
166+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
167+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
168+ LD="${LD-ld}_sol2"
169+ fi
170+ ;;
171 *)
172 if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
173 LD="${LD-ld} -64"
174@@ -7555,7 +7574,13 @@
175 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
176 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
177 _lt_result=$?
178- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
179+ # If there is a non-empty error log, and "single_module"
180+ # appears in it, assume the flag caused a linker warning
181+ if test -s conftest.err && $GREP single_module conftest.err; then
182+ cat conftest.err >&5
183+ # Otherwise, if the output was created with a 0 exit code from
184+ # the compiler, it worked.
185+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
186 lt_cv_apple_cc_single_mod=yes
187 else
188 cat conftest.err >&5
189@@ -7566,6 +7591,7 @@
190 fi
191 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
192 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
193+
194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
195 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
196 if ${lt_cv_ld_exported_symbols_list+:} false; then :
197@@ -7598,6 +7624,7 @@
198 fi
199 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
200 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
201+
202 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
203 $as_echo_n "checking for -force_load linker flag... " >&6; }
204 if ${lt_cv_ld_force_load+:} false; then :
205@@ -7619,7 +7646,9 @@
206 echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
207 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
208 _lt_result=$?
209- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
210+ if test -s conftest.err && $GREP force_load conftest.err; then
211+ cat conftest.err >&5
212+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
213 lt_cv_ld_force_load=yes
214 else
215 cat conftest.err >&5
216@@ -8024,7 +8053,22 @@
217
218 # Check whether --with-pic was given.
219 if test "${with_pic+set}" = set; then :
220- withval=$with_pic; pic_mode="$withval"
221+ withval=$with_pic; lt_p=${PACKAGE-default}
222+ case $withval in
223+ yes|no) pic_mode=$withval ;;
224+ *)
225+ pic_mode=default
226+ # Look at the argument we got. We use all the common list separators.
227+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
228+ for lt_pkg in $withval; do
229+ IFS="$lt_save_ifs"
230+ if test "X$lt_pkg" = "X$lt_p"; then
231+ pic_mode=yes
232+ fi
233+ done
234+ IFS="$lt_save_ifs"
235+ ;;
236+ esac
237 else
238 pic_mode=default
239 fi
240@@ -8102,6 +8146,10 @@
241
242
243
244+
245+
246+
247+
248 test -z "$LN_S" && LN_S="ln -s"
249
250
251@@ -8561,7 +8609,9 @@
252 case $cc_basename in
253 nvcc*) # Cuda Compiler Driver 2.2
254 lt_prog_compiler_wl='-Xlinker '
255- lt_prog_compiler_pic='-Xcompiler -fPIC'
256+ if test -n "$lt_prog_compiler_pic"; then
257+ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
258+ fi
259 ;;
260 esac
261 else
262@@ -8652,18 +8702,33 @@
263 ;;
264 *)
265 case `$CC -V 2>&1 | sed 5q` in
266- *Sun\ F* | *Sun*Fortran*)
267+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
268 # Sun Fortran 8.3 passes all unrecognized flags to the linker
269 lt_prog_compiler_pic='-KPIC'
270 lt_prog_compiler_static='-Bstatic'
271 lt_prog_compiler_wl=''
272 ;;
273+ *Sun\ F* | *Sun*Fortran*)
274+ lt_prog_compiler_pic='-KPIC'
275+ lt_prog_compiler_static='-Bstatic'
276+ lt_prog_compiler_wl='-Qoption ld '
277+ ;;
278 *Sun\ C*)
279 # Sun C 5.9
280 lt_prog_compiler_pic='-KPIC'
281 lt_prog_compiler_static='-Bstatic'
282 lt_prog_compiler_wl='-Wl,'
283 ;;
284+ *Intel*\ [CF]*Compiler*)
285+ lt_prog_compiler_wl='-Wl,'
286+ lt_prog_compiler_pic='-fPIC'
287+ lt_prog_compiler_static='-static'
288+ ;;
289+ *Portland\ Group*)
290+ lt_prog_compiler_wl='-Wl,'
291+ lt_prog_compiler_pic='-fpic'
292+ lt_prog_compiler_static='-Bstatic'
293+ ;;
294 esac
295 ;;
296 esac
297@@ -9025,7 +9090,6 @@
298 hardcode_direct=no
299 hardcode_direct_absolute=no
300 hardcode_libdir_flag_spec=
301- hardcode_libdir_flag_spec_ld=
302 hardcode_libdir_separator=
303 hardcode_minus_L=no
304 hardcode_shlibpath_var=unsupported
305@@ -9278,8 +9342,7 @@
306 xlf* | bgf* | bgxlf* | mpixlf*)
307 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
308 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
309- hardcode_libdir_flag_spec=
310- hardcode_libdir_flag_spec_ld='-rpath $libdir'
311+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
312 archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
313 if test "x$supports_anon_versioning" = xyes; then
314 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
315@@ -9659,6 +9722,7 @@
316 # The linker will not automatically build a static lib if we build a DLL.
317 # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
318 enable_shared_with_static_runtimes=yes
319+ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
320 export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
321 # Don't use ranlib
322 old_postinstall_cmds='chmod 644 $oldlib'
323@@ -9704,6 +9768,7 @@
324 hardcode_shlibpath_var=unsupported
325 if test "$lt_cv_ld_force_load" = "yes"; then
326 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\"`'
327+
328 else
329 whole_archive_flag_spec=''
330 fi
331@@ -9732,10 +9797,6 @@
332 hardcode_shlibpath_var=no
333 ;;
334
335- freebsd1*)
336- ld_shlibs=no
337- ;;
338-
339 # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
340 # support. Future versions do this automatically, but an explicit c++rt0.o
341 # does not break anything, and helps significantly (at the cost of a little
342@@ -9748,7 +9809,7 @@
343 ;;
344
345 # Unfortunately, older versions of FreeBSD 2 do not have this feature.
346- freebsd2*)
347+ freebsd2.*)
348 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
349 hardcode_direct=yes
350 hardcode_minus_L=yes
351@@ -9787,7 +9848,6 @@
352 fi
353 if test "$with_gnu_ld" = no; then
354 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
355- hardcode_libdir_flag_spec_ld='+b $libdir'
356 hardcode_libdir_separator=:
357 hardcode_direct=yes
358 hardcode_direct_absolute=yes
359@@ -10411,11 +10471,6 @@
360
361
362
363-
364-
365-
366-
367-
368 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
369 $as_echo_n "checking dynamic linker characteristics... " >&6; }
370
371@@ -10505,7 +10560,7 @@
372
373 case $host_os in
374 aix3*)
375- version_type=linux
376+ version_type=linux # correct to gnu/linux during the next big refactor
377 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
378 shlibpath_var=LIBPATH
379
380@@ -10514,7 +10569,7 @@
381 ;;
382
383 aix[4-9]*)
384- version_type=linux
385+ version_type=linux # correct to gnu/linux during the next big refactor
386 need_lib_prefix=no
387 need_version=no
388 hardcode_into_libs=yes
389@@ -10579,7 +10634,7 @@
390 ;;
391
392 bsdi[45]*)
393- version_type=linux
394+ version_type=linux # correct to gnu/linux during the next big refactor
395 need_version=no
396 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
397 soname_spec='${libname}${release}${shared_ext}$major'
398@@ -10718,7 +10773,7 @@
399 ;;
400
401 dgux*)
402- version_type=linux
403+ version_type=linux # correct to gnu/linux during the next big refactor
404 need_lib_prefix=no
405 need_version=no
406 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
407@@ -10726,10 +10781,6 @@
408 shlibpath_var=LD_LIBRARY_PATH
409 ;;
410
411-freebsd1*)
412- dynamic_linker=no
413- ;;
414-
415 freebsd* | dragonfly*)
416 # DragonFly does not have aout. When/if they implement a new
417 # versioning mechanism, adjust this.
418@@ -10737,7 +10788,7 @@
419 objformat=`/usr/bin/objformat`
420 else
421 case $host_os in
422- freebsd[123]*) objformat=aout ;;
423+ freebsd[23].*) objformat=aout ;;
424 *) objformat=elf ;;
425 esac
426 fi
427@@ -10755,7 +10806,7 @@
428 esac
429 shlibpath_var=LD_LIBRARY_PATH
430 case $host_os in
431- freebsd2*)
432+ freebsd2.*)
433 shlibpath_overrides_runpath=yes
434 ;;
435 freebsd3.[01]* | freebsdelf3.[01]*)
436@@ -10775,7 +10826,7 @@
437 ;;
438
439 gnu*)
440- version_type=linux
441+ version_type=linux # correct to gnu/linux during the next big refactor
442 need_lib_prefix=no
443 need_version=no
444 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
445@@ -10786,7 +10837,7 @@
446 ;;
447
448 haiku*)
449- version_type=linux
450+ version_type=linux # correct to gnu/linux during the next big refactor
451 need_lib_prefix=no
452 need_version=no
453 dynamic_linker="$host_os runtime_loader"
454@@ -10847,7 +10898,7 @@
455 ;;
456
457 interix[3-9]*)
458- version_type=linux
459+ version_type=linux # correct to gnu/linux during the next big refactor
460 need_lib_prefix=no
461 need_version=no
462 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
463@@ -10863,7 +10914,7 @@
464 nonstopux*) version_type=nonstopux ;;
465 *)
466 if test "$lt_cv_prog_gnu_ld" = yes; then
467- version_type=linux
468+ version_type=linux # correct to gnu/linux during the next big refactor
469 else
470 version_type=irix
471 fi ;;
472@@ -10900,9 +10951,9 @@
473 dynamic_linker=no
474 ;;
475
476-# This must be Linux ELF.
477+# This must be glibc/ELF.
478 linux* | k*bsd*-gnu | kopensolaris*-gnu)
479- version_type=linux
480+ version_type=linux # correct to gnu/linux during the next big refactor
481 need_lib_prefix=no
482 need_version=no
483 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
484@@ -10996,7 +11047,7 @@
485 ;;
486
487 newsos6)
488- version_type=linux
489+ version_type=linux # correct to gnu/linux during the next big refactor
490 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
491 shlibpath_var=LD_LIBRARY_PATH
492 shlibpath_overrides_runpath=yes
493@@ -11065,7 +11116,7 @@
494 ;;
495
496 solaris*)
497- version_type=linux
498+ version_type=linux # correct to gnu/linux during the next big refactor
499 need_lib_prefix=no
500 need_version=no
501 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
502@@ -11090,7 +11141,7 @@
503 ;;
504
505 sysv4 | sysv4.3*)
506- version_type=linux
507+ version_type=linux # correct to gnu/linux during the next big refactor
508 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
509 soname_spec='${libname}${release}${shared_ext}$major'
510 shlibpath_var=LD_LIBRARY_PATH
511@@ -11114,7 +11165,7 @@
512
513 sysv4*MP*)
514 if test -d /usr/nec ;then
515- version_type=linux
516+ version_type=linux # correct to gnu/linux during the next big refactor
517 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
518 soname_spec='$libname${shared_ext}.$major'
519 shlibpath_var=LD_LIBRARY_PATH
520@@ -11145,7 +11196,7 @@
521
522 tpf*)
523 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
524- version_type=linux
525+ version_type=linux # correct to gnu/linux during the next big refactor
526 need_lib_prefix=no
527 need_version=no
528 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
529@@ -11155,7 +11206,7 @@
530 ;;
531
532 uts4*)
533- version_type=linux
534+ version_type=linux # correct to gnu/linux during the next big refactor
535 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
536 soname_spec='${libname}${release}${shared_ext}$major'
537 shlibpath_var=LD_LIBRARY_PATH
538@@ -11937,6 +11988,8 @@
539
540
541
542+
543+
544 ac_config_commands="$ac_config_commands libtool"
545
546
547@@ -14143,7 +14196,7 @@
548 # report actual input values of CONFIG_FILES etc. instead of their
549 # values after options handling.
550 ac_log="
551-This file was extended by ubuntuone-client-gnome $as_me 2.99.1, which was
552+This file was extended by ubuntuone-client-gnome $as_me 2.99.2, which was
553 generated by GNU Autoconf 2.68. Invocation command line was
554
555 CONFIG_FILES = $CONFIG_FILES
556@@ -14209,7 +14262,7 @@
557 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
558 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
559 ac_cs_version="\\
560-ubuntuone-client-gnome config.status 2.99.1
561+ubuntuone-client-gnome config.status 2.99.2
562 configured by $0, generated by GNU Autoconf 2.68,
563 with options \\"\$ac_cs_config\\"
564
565@@ -14346,6 +14399,7 @@
566 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
567 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
568 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
569+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
570 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
571 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
572 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
573@@ -14428,7 +14482,6 @@
574 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
575 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
576 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
577-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
578 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
579 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
580 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
581@@ -14484,6 +14537,7 @@
582 # Quote evaled strings.
583 for var in SHELL \
584 ECHO \
585+PATH_SEPARATOR \
586 SED \
587 GREP \
588 EGREP \
589@@ -14534,7 +14588,6 @@
590 allow_undefined_flag \
591 no_undefined_flag \
592 hardcode_libdir_flag_spec \
593-hardcode_libdir_flag_spec_ld \
594 hardcode_libdir_separator \
595 exclude_expsyms \
596 include_expsyms \
597@@ -15334,8 +15387,8 @@
598 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
599 #
600 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
601-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
602-# Inc.
603+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
604+# Foundation, Inc.
605 # Written by Gordon Matzigkeit, 1996
606 #
607 # This file is part of GNU Libtool.
608@@ -15389,6 +15442,9 @@
609 # An echo program that protects backslashes.
610 ECHO=$lt_ECHO
611
612+# The PATH separator for the build system.
613+PATH_SEPARATOR=$lt_PATH_SEPARATOR
614+
615 # The host system.
616 host_alias=$host_alias
617 host=$host
618@@ -15690,10 +15746,6 @@
619 # This must work even if \$libdir does not exist
620 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
621
622-# If ld is used when linking, flag to hardcode \$libdir into a binary
623-# during linking. This must work even if \$libdir does not exist.
624-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
625-
626 # Whether we need a single "-rpath" flag with a separated argument.
627 hardcode_libdir_separator=$lt_hardcode_libdir_separator
628
629
630=== modified file 'configure.ac'
631--- configure.ac 2012-01-04 13:23:49 +0000
632+++ configure.ac 2012-01-17 23:06:35 +0000
633@@ -1,7 +1,7 @@
634 dnl Process this file with autoconf to produce a configure script.
635 AC_PREREQ(2.53)
636
637-AC_INIT([ubuntuone-client-gnome], [2.99.1])
638+AC_INIT([ubuntuone-client-gnome], [2.99.2])
639 AC_CONFIG_SRCDIR([config.h.in])
640
641 AM_INIT_AUTOMAKE([1.10 foreign])
642
643=== modified file 'debian/changelog'
644--- debian/changelog 2012-01-12 12:31:05 +0000
645+++ debian/changelog 2012-01-17 23:06:35 +0000
646@@ -1,3 +1,9 @@
647+ubuntuone-client-gnome (2.99.2-0ubuntu1) precise; urgency=low
648+
649+ * New upstream release.
650+
651+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Tue, 17 Jan 2012 14:21:06 -0500
652+
653 ubuntuone-client-gnome (2.99.1-0ubuntu2) precise; urgency=low
654
655 * Rebuild for latest evolution-data-server
656
657=== modified file 'ltmain.sh' (properties changed: +x to -x)
658--- ltmain.sh 2011-12-21 00:31:37 +0000
659+++ ltmain.sh 2012-01-17 23:06:35 +0000
660@@ -1,9 +1,9 @@
661
662-# libtool (GNU libtool) 2.4
663+# libtool (GNU libtool) 2.4.2
664 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
665
666 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
667-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
668+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
669 # This is free software; see the source for copying conditions. There is NO
670 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
671
672@@ -41,6 +41,7 @@
673 # --quiet, --silent don't print informational messages
674 # --no-quiet, --no-silent
675 # print informational messages (default)
676+# --no-warn don't display warning messages
677 # --tag=TAG use configuration variables from tag TAG
678 # -v, --verbose print more informational messages than default
679 # --no-verbose don't print the extra informational messages
680@@ -69,7 +70,7 @@
681 # compiler: $LTCC
682 # compiler flags: $LTCFLAGS
683 # linker: $LD (gnu? $with_gnu_ld)
684-# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1
685+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
686 # automake: $automake_version
687 # autoconf: $autoconf_version
688 #
689@@ -79,9 +80,9 @@
690
691 PROGRAM=libtool
692 PACKAGE=libtool
693-VERSION="2.4 Debian-2.4-2ubuntu1"
694+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
695 TIMESTAMP=""
696-package_revision=1.3293
697+package_revision=1.3337
698
699 # Be Bourne compatible
700 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
701@@ -136,15 +137,10 @@
702
703 : ${CP="cp -f"}
704 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
705-: ${EGREP="/bin/grep -E"}
706-: ${FGREP="/bin/grep -F"}
707-: ${GREP="/bin/grep"}
708-: ${LN_S="ln -s"}
709 : ${MAKE="make"}
710 : ${MKDIR="mkdir"}
711 : ${MV="mv -f"}
712 : ${RM="rm -f"}
713-: ${SED="/bin/sed"}
714 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
715 : ${Xsed="$SED -e 1s/^X//"}
716
717@@ -387,7 +383,7 @@
718 ;;
719 *)
720 save_IFS="$IFS"
721- IFS=:
722+ IFS=${PATH_SEPARATOR-:}
723 for progdir in $PATH; do
724 IFS="$save_IFS"
725 test -x "$progdir/$progname" && break
726@@ -771,8 +767,8 @@
727 s*\$LTCFLAGS*'"$LTCFLAGS"'*
728 s*\$LD*'"$LD"'*
729 s/\$with_gnu_ld/'"$with_gnu_ld"'/
730- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
731- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
732+ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
733+ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
734 p
735 d
736 }
737@@ -1052,6 +1048,7 @@
738 opt_help=false
739 opt_help_all=false
740 opt_silent=:
741+opt_warning=:
742 opt_verbose=:
743 opt_silent=false
744 opt_verbose=false
745@@ -1120,6 +1117,10 @@
746 opt_silent=false
747 func_append preserve_args " $opt"
748 ;;
749+ --no-warning|--no-warn)
750+ opt_warning=false
751+func_append preserve_args " $opt"
752+ ;;
753 --no-verbose)
754 opt_verbose=false
755 func_append preserve_args " $opt"
756@@ -2059,7 +2060,7 @@
757 *.[cCFSifmso] | \
758 *.ada | *.adb | *.ads | *.asm | \
759 *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
760- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
761+ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
762 func_xform "$libobj"
763 libobj=$func_xform_result
764 ;;
765@@ -3201,11 +3202,13 @@
766
767 # Set up the ranlib parameters.
768 oldlib="$destdir/$name"
769+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
770+ tool_oldlib=$func_to_tool_file_result
771
772 func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
773
774 if test -n "$stripme" && test -n "$old_striplib"; then
775- func_show_eval "$old_striplib $oldlib" 'exit $?'
776+ func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
777 fi
778
779 # Do each command in the postinstall commands.
780@@ -3470,7 +3473,7 @@
781 # linked before any other PIC object. But we must not use
782 # pic_flag when linking with -static. The problem exists in
783 # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
784- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
785+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
786 pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
787 *-*-hpux*)
788 pic_flag_for_symtable=" $pic_flag" ;;
789@@ -3982,14 +3985,17 @@
790 # launches target application with the remaining arguments.
791 func_exec_program ()
792 {
793- for lt_wr_arg
794- do
795- case \$lt_wr_arg in
796- --lt-*) ;;
797- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
798- esac
799- shift
800- done
801+ case \" \$* \" in
802+ *\\ --lt-*)
803+ for lt_wr_arg
804+ do
805+ case \$lt_wr_arg in
806+ --lt-*) ;;
807+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
808+ esac
809+ shift
810+ done ;;
811+ esac
812 func_exec_program_core \${1+\"\$@\"}
813 }
814
815@@ -5057,9 +5063,15 @@
816 {
817 EOF
818 func_emit_wrapper yes |
819- $SED -e 's/\([\\"]\)/\\\1/g' \
820- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
821-
822+ $SED -n -e '
823+s/^\(.\{79\}\)\(..*\)/\1\
824+\2/
825+h
826+s/\([\\"]\)/\\\1/g
827+s/$/\\n/
828+s/\([^\n]*\).*/ fputs ("\1", f);/p
829+g
830+D'
831 cat <<"EOF"
832 }
833 EOF
834@@ -5643,7 +5655,8 @@
835 continue
836 ;;
837
838- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
839+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
840+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
841 func_append compiler_flags " $arg"
842 func_append compile_command " $arg"
843 func_append finalize_command " $arg"
844@@ -6150,7 +6163,8 @@
845 lib=
846 found=no
847 case $deplib in
848- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
849+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
850+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
851 if test "$linkmode,$pass" = "prog,link"; then
852 compile_deplibs="$deplib $compile_deplibs"
853 finalize_deplibs="$deplib $finalize_deplibs"
854@@ -6834,7 +6848,7 @@
855 test "$hardcode_direct_absolute" = no; then
856 add="$dir/$linklib"
857 elif test "$hardcode_minus_L" = yes; then
858- add_dir="-L$dir"
859+ add_dir="-L$absdir"
860 # Try looking first in the location we're being installed to.
861 if test -n "$inst_prefix_dir"; then
862 case $libdir in
863@@ -7319,6 +7333,7 @@
864 # which has an extra 1 added just for fun
865 #
866 case $version_type in
867+ # correct linux to gnu/linux during the next big refactor
868 darwin|linux|osf|windows|none)
869 func_arith $number_major + $number_minor
870 current=$func_arith_result
871@@ -7438,7 +7453,7 @@
872 versuffix="$major.$revision"
873 ;;
874
875- linux)
876+ linux) # correct to gnu/linux during the next big refactor
877 func_arith $current - $age
878 major=.$func_arith_result
879 versuffix="$major.$age.$revision"
880@@ -8026,6 +8041,11 @@
881
882 # Test again, we may have decided not to build it any more
883 if test "$build_libtool_libs" = yes; then
884+ # Remove ${wl} instances when linking with ld.
885+ # FIXME: should test the right _cmds variable.
886+ case $archive_cmds in
887+ *\$LD\ *) wl= ;;
888+ esac
889 if test "$hardcode_into_libs" = yes; then
890 # Hardcode the library paths
891 hardcode_libdirs=
892@@ -8056,7 +8076,7 @@
893 elif test -n "$runpath_var"; then
894 case "$perm_rpath " in
895 *" $libdir "*) ;;
896- *) func_apped perm_rpath " $libdir" ;;
897+ *) func_append perm_rpath " $libdir" ;;
898 esac
899 fi
900 done
901@@ -8064,11 +8084,7 @@
902 if test -n "$hardcode_libdir_separator" &&
903 test -n "$hardcode_libdirs"; then
904 libdir="$hardcode_libdirs"
905- if test -n "$hardcode_libdir_flag_spec_ld"; then
906- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
907- else
908- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
909- fi
910+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
911 fi
912 if test -n "$runpath_var" && test -n "$perm_rpath"; then
913 # We should set the runpath_var.
914@@ -9158,6 +9174,8 @@
915 esac
916 done
917 fi
918+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
919+ tool_oldlib=$func_to_tool_file_result
920 eval cmds=\"$old_archive_cmds\"
921
922 func_len " $cmds"
923@@ -9267,7 +9285,8 @@
924 *.la)
925 func_basename "$deplib"
926 name="$func_basename_result"
927- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
928+ func_resolve_sysroot "$deplib"
929+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
930 test -z "$libdir" && \
931 func_fatal_error "\`$deplib' is not a valid libtool archive"
932 func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
933
934=== modified file 'm4/libtool.m4'
935--- m4/libtool.m4 2011-12-21 00:31:37 +0000
936+++ m4/libtool.m4 2012-01-17 23:06:35 +0000
937@@ -1,8 +1,8 @@
938 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
939 #
940 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
941-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
942-# Inc.
943+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
944+# Foundation, Inc.
945 # Written by Gordon Matzigkeit, 1996
946 #
947 # This file is free software; the Free Software Foundation gives
948@@ -11,8 +11,8 @@
949
950 m4_define([_LT_COPYING], [dnl
951 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
952-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
953-# Inc.
954+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
955+# Foundation, Inc.
956 # Written by Gordon Matzigkeit, 1996
957 #
958 # This file is part of GNU Libtool.
959@@ -146,6 +146,8 @@
960 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
961 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
962
963+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
964+dnl
965 _LT_DECL([], [host_alias], [0], [The host system])dnl
966 _LT_DECL([], [host], [0])dnl
967 _LT_DECL([], [host_os], [0])dnl
968@@ -637,7 +639,7 @@
969 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
970 configured by $[0], generated by m4_PACKAGE_STRING.
971
972-Copyright (C) 2010 Free Software Foundation, Inc.
973+Copyright (C) 2011 Free Software Foundation, Inc.
974 This config.lt script is free software; the Free Software Foundation
975 gives unlimited permision to copy, distribute and modify it."
976
977@@ -801,6 +803,7 @@
978 m4_case([$1],
979 [C], [_LT_LANG(C)],
980 [C++], [_LT_LANG(CXX)],
981+ [Go], [_LT_LANG(GO)],
982 [Java], [_LT_LANG(GCJ)],
983 [Fortran 77], [_LT_LANG(F77)],
984 [Fortran], [_LT_LANG(FC)],
985@@ -822,6 +825,31 @@
986 ])# _LT_LANG
987
988
989+m4_ifndef([AC_PROG_GO], [
990+############################################################
991+# NOTE: This macro has been submitted for inclusion into #
992+# GNU Autoconf as AC_PROG_GO. When it is available in #
993+# a released version of Autoconf we should remove this #
994+# macro and use it instead. #
995+############################################################
996+m4_defun([AC_PROG_GO],
997+[AC_LANG_PUSH(Go)dnl
998+AC_ARG_VAR([GOC], [Go compiler command])dnl
999+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
1000+_AC_ARG_VAR_LDFLAGS()dnl
1001+AC_CHECK_TOOL(GOC, gccgo)
1002+if test -z "$GOC"; then
1003+ if test -n "$ac_tool_prefix"; then
1004+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
1005+ fi
1006+fi
1007+if test -z "$GOC"; then
1008+ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
1009+fi
1010+])#m4_defun
1011+])#m4_ifndef
1012+
1013+
1014 # _LT_LANG_DEFAULT_CONFIG
1015 # -----------------------
1016 m4_defun([_LT_LANG_DEFAULT_CONFIG],
1017@@ -852,6 +880,10 @@
1018 m4_ifdef([LT_PROG_GCJ],
1019 [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
1020
1021+AC_PROVIDE_IFELSE([AC_PROG_GO],
1022+ [LT_LANG(GO)],
1023+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
1024+
1025 AC_PROVIDE_IFELSE([LT_PROG_RC],
1026 [LT_LANG(RC)],
1027 [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
1028@@ -954,7 +986,13 @@
1029 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
1030 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
1031 _lt_result=$?
1032- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
1033+ # If there is a non-empty error log, and "single_module"
1034+ # appears in it, assume the flag caused a linker warning
1035+ if test -s conftest.err && $GREP single_module conftest.err; then
1036+ cat conftest.err >&AS_MESSAGE_LOG_FD
1037+ # Otherwise, if the output was created with a 0 exit code from
1038+ # the compiler, it worked.
1039+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
1040 lt_cv_apple_cc_single_mod=yes
1041 else
1042 cat conftest.err >&AS_MESSAGE_LOG_FD
1043@@ -962,6 +1000,7 @@
1044 rm -rf libconftest.dylib*
1045 rm -f conftest.*
1046 fi])
1047+
1048 AC_CACHE_CHECK([for -exported_symbols_list linker flag],
1049 [lt_cv_ld_exported_symbols_list],
1050 [lt_cv_ld_exported_symbols_list=no
1051@@ -973,6 +1012,7 @@
1052 [lt_cv_ld_exported_symbols_list=no])
1053 LDFLAGS="$save_LDFLAGS"
1054 ])
1055+
1056 AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
1057 [lt_cv_ld_force_load=no
1058 cat > conftest.c << _LT_EOF
1059@@ -990,7 +1030,9 @@
1060 echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
1061 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
1062 _lt_result=$?
1063- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
1064+ if test -s conftest.err && $GREP force_load conftest.err; then
1065+ cat conftest.err >&AS_MESSAGE_LOG_FD
1066+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
1067 lt_cv_ld_force_load=yes
1068 else
1069 cat conftest.err >&AS_MESSAGE_LOG_FD
1070@@ -1035,8 +1077,8 @@
1071 ])
1072
1073
1074-# _LT_DARWIN_LINKER_FEATURES
1075-# --------------------------
1076+# _LT_DARWIN_LINKER_FEATURES([TAG])
1077+# ---------------------------------
1078 # Checks for linker and compiler features on darwin
1079 m4_defun([_LT_DARWIN_LINKER_FEATURES],
1080 [
1081@@ -1047,6 +1089,8 @@
1082 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
1083 if test "$lt_cv_ld_force_load" = "yes"; then
1084 _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\"`'
1085+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
1086+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
1087 else
1088 _LT_TAGVAR(whole_archive_flag_spec, $1)=''
1089 fi
1090@@ -1330,14 +1374,27 @@
1091 CFLAGS="$SAVE_CFLAGS"
1092 fi
1093 ;;
1094-sparc*-*solaris*)
1095+*-*solaris*)
1096 # Find out which ABI we are using.
1097 echo 'int i;' > conftest.$ac_ext
1098 if AC_TRY_EVAL(ac_compile); then
1099 case `/usr/bin/file conftest.o` in
1100 *64-bit*)
1101 case $lt_cv_prog_gnu_ld in
1102- yes*) LD="${LD-ld} -m elf64_sparc" ;;
1103+ yes*)
1104+ case $host in
1105+ i?86-*-solaris*)
1106+ LD="${LD-ld} -m elf_x86_64"
1107+ ;;
1108+ sparc*-*-solaris*)
1109+ LD="${LD-ld} -m elf64_sparc"
1110+ ;;
1111+ esac
1112+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
1113+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
1114+ LD="${LD-ld}_sol2"
1115+ fi
1116+ ;;
1117 *)
1118 if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
1119 LD="${LD-ld} -64"
1120@@ -1414,13 +1471,13 @@
1121 if test -n "$RANLIB"; then
1122 case $host_os in
1123 openbsd*)
1124- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
1125+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
1126 ;;
1127 *)
1128- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
1129+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
1130 ;;
1131 esac
1132- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
1133+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
1134 fi
1135
1136 case $host_os in
1137@@ -1600,6 +1657,11 @@
1138 lt_cv_sys_max_cmd_len=196608
1139 ;;
1140
1141+ os2*)
1142+ # The test takes a long time on OS/2.
1143+ lt_cv_sys_max_cmd_len=8192
1144+ ;;
1145+
1146 osf*)
1147 # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
1148 # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
1149@@ -1639,7 +1701,7 @@
1150 # If test is not a shell built-in, we'll probably end up computing a
1151 # maximum length that is only half of the actual maximum length, but
1152 # we can't tell.
1153- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
1154+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
1155 = "X$teststring$teststring"; } >/dev/null 2>&1 &&
1156 test $i != 17 # 1/2 MB should be enough
1157 do
1158@@ -2185,7 +2247,7 @@
1159
1160 case $host_os in
1161 aix3*)
1162- version_type=linux
1163+ version_type=linux # correct to gnu/linux during the next big refactor
1164 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
1165 shlibpath_var=LIBPATH
1166
1167@@ -2194,7 +2256,7 @@
1168 ;;
1169
1170 aix[[4-9]]*)
1171- version_type=linux
1172+ version_type=linux # correct to gnu/linux during the next big refactor
1173 need_lib_prefix=no
1174 need_version=no
1175 hardcode_into_libs=yes
1176@@ -2259,7 +2321,7 @@
1177 ;;
1178
1179 bsdi[[45]]*)
1180- version_type=linux
1181+ version_type=linux # correct to gnu/linux during the next big refactor
1182 need_version=no
1183 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1184 soname_spec='${libname}${release}${shared_ext}$major'
1185@@ -2398,7 +2460,7 @@
1186 ;;
1187
1188 dgux*)
1189- version_type=linux
1190+ version_type=linux # correct to gnu/linux during the next big refactor
1191 need_lib_prefix=no
1192 need_version=no
1193 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
1194@@ -2406,10 +2468,6 @@
1195 shlibpath_var=LD_LIBRARY_PATH
1196 ;;
1197
1198-freebsd1*)
1199- dynamic_linker=no
1200- ;;
1201-
1202 freebsd* | dragonfly*)
1203 # DragonFly does not have aout. When/if they implement a new
1204 # versioning mechanism, adjust this.
1205@@ -2417,7 +2475,7 @@
1206 objformat=`/usr/bin/objformat`
1207 else
1208 case $host_os in
1209- freebsd[[123]]*) objformat=aout ;;
1210+ freebsd[[23]].*) objformat=aout ;;
1211 *) objformat=elf ;;
1212 esac
1213 fi
1214@@ -2435,7 +2493,7 @@
1215 esac
1216 shlibpath_var=LD_LIBRARY_PATH
1217 case $host_os in
1218- freebsd2*)
1219+ freebsd2.*)
1220 shlibpath_overrides_runpath=yes
1221 ;;
1222 freebsd3.[[01]]* | freebsdelf3.[[01]]*)
1223@@ -2455,7 +2513,7 @@
1224 ;;
1225
1226 gnu*)
1227- version_type=linux
1228+ version_type=linux # correct to gnu/linux during the next big refactor
1229 need_lib_prefix=no
1230 need_version=no
1231 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
1232@@ -2466,7 +2524,7 @@
1233 ;;
1234
1235 haiku*)
1236- version_type=linux
1237+ version_type=linux # correct to gnu/linux during the next big refactor
1238 need_lib_prefix=no
1239 need_version=no
1240 dynamic_linker="$host_os runtime_loader"
1241@@ -2527,7 +2585,7 @@
1242 ;;
1243
1244 interix[[3-9]]*)
1245- version_type=linux
1246+ version_type=linux # correct to gnu/linux during the next big refactor
1247 need_lib_prefix=no
1248 need_version=no
1249 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1250@@ -2543,7 +2601,7 @@
1251 nonstopux*) version_type=nonstopux ;;
1252 *)
1253 if test "$lt_cv_prog_gnu_ld" = yes; then
1254- version_type=linux
1255+ version_type=linux # correct to gnu/linux during the next big refactor
1256 else
1257 version_type=irix
1258 fi ;;
1259@@ -2580,9 +2638,9 @@
1260 dynamic_linker=no
1261 ;;
1262
1263-# This must be Linux ELF.
1264+# This must be glibc/ELF.
1265 linux* | k*bsd*-gnu | kopensolaris*-gnu)
1266- version_type=linux
1267+ version_type=linux # correct to gnu/linux during the next big refactor
1268 need_lib_prefix=no
1269 need_version=no
1270 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1271@@ -2657,7 +2715,7 @@
1272 ;;
1273
1274 newsos6)
1275- version_type=linux
1276+ version_type=linux # correct to gnu/linux during the next big refactor
1277 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1278 shlibpath_var=LD_LIBRARY_PATH
1279 shlibpath_overrides_runpath=yes
1280@@ -2726,7 +2784,7 @@
1281 ;;
1282
1283 solaris*)
1284- version_type=linux
1285+ version_type=linux # correct to gnu/linux during the next big refactor
1286 need_lib_prefix=no
1287 need_version=no
1288 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1289@@ -2751,7 +2809,7 @@
1290 ;;
1291
1292 sysv4 | sysv4.3*)
1293- version_type=linux
1294+ version_type=linux # correct to gnu/linux during the next big refactor
1295 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1296 soname_spec='${libname}${release}${shared_ext}$major'
1297 shlibpath_var=LD_LIBRARY_PATH
1298@@ -2775,7 +2833,7 @@
1299
1300 sysv4*MP*)
1301 if test -d /usr/nec ;then
1302- version_type=linux
1303+ version_type=linux # correct to gnu/linux during the next big refactor
1304 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
1305 soname_spec='$libname${shared_ext}.$major'
1306 shlibpath_var=LD_LIBRARY_PATH
1307@@ -2806,7 +2864,7 @@
1308
1309 tpf*)
1310 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
1311- version_type=linux
1312+ version_type=linux # correct to gnu/linux during the next big refactor
1313 need_lib_prefix=no
1314 need_version=no
1315 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1316@@ -2816,7 +2874,7 @@
1317 ;;
1318
1319 uts4*)
1320- version_type=linux
1321+ version_type=linux # correct to gnu/linux during the next big refactor
1322 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1323 soname_spec='${libname}${release}${shared_ext}$major'
1324 shlibpath_var=LD_LIBRARY_PATH
1325@@ -3238,7 +3296,7 @@
1326 lt_cv_deplibs_check_method=pass_all
1327 ;;
1328
1329-# This must be Linux ELF.
1330+# This must be glibc/ELF.
1331 linux* | k*bsd*-gnu | kopensolaris*-gnu)
1332 lt_cv_deplibs_check_method=pass_all
1333 ;;
1334@@ -3658,6 +3716,7 @@
1335 # which start with @ or ?.
1336 lt_cv_sys_global_symbol_pipe="$AWK ['"\
1337 " {last_section=section; section=\$ 3};"\
1338+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
1339 " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
1340 " \$ 0!~/External *\|/{next};"\
1341 " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
1342@@ -4242,7 +4301,9 @@
1343 case $cc_basename in
1344 nvcc*) # Cuda Compiler Driver 2.2
1345 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
1346- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
1347+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
1348+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
1349+ fi
1350 ;;
1351 esac
1352 else
1353@@ -4334,18 +4395,33 @@
1354 ;;
1355 *)
1356 case `$CC -V 2>&1 | sed 5q` in
1357- *Sun\ F* | *Sun*Fortran*)
1358+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
1359 # Sun Fortran 8.3 passes all unrecognized flags to the linker
1360 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1361 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1362 _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
1363 ;;
1364+ *Sun\ F* | *Sun*Fortran*)
1365+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1366+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1367+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
1368+ ;;
1369 *Sun\ C*)
1370 # Sun C 5.9
1371 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
1372 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1373 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1374 ;;
1375+ *Intel*\ [[CF]]*Compiler*)
1376+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1377+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
1378+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
1379+ ;;
1380+ *Portland\ Group*)
1381+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
1382+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
1383+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
1384+ ;;
1385 esac
1386 ;;
1387 esac
1388@@ -4505,7 +4581,9 @@
1389 ;;
1390 cygwin* | mingw* | cegcc*)
1391 case $cc_basename in
1392- cl*) ;;
1393+ cl*)
1394+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
1395+ ;;
1396 *)
1397 _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'
1398 _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
1399@@ -4533,7 +4611,6 @@
1400 _LT_TAGVAR(hardcode_direct, $1)=no
1401 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
1402 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
1403- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
1404 _LT_TAGVAR(hardcode_libdir_separator, $1)=
1405 _LT_TAGVAR(hardcode_minus_L, $1)=no
1406 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
1407@@ -4787,8 +4864,7 @@
1408 xlf* | bgf* | bgxlf* | mpixlf*)
1409 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
1410 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
1411- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
1412- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
1413+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
1414 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
1415 if test "x$supports_anon_versioning" = xyes; then
1416 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
1417@@ -5084,6 +5160,7 @@
1418 # The linker will not automatically build a static lib if we build a DLL.
1419 # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
1420 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
1421+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
1422 _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'
1423 # Don't use ranlib
1424 _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
1425@@ -5130,10 +5207,6 @@
1426 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
1427 ;;
1428
1429- freebsd1*)
1430- _LT_TAGVAR(ld_shlibs, $1)=no
1431- ;;
1432-
1433 # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
1434 # support. Future versions do this automatically, but an explicit c++rt0.o
1435 # does not break anything, and helps significantly (at the cost of a little
1436@@ -5146,7 +5219,7 @@
1437 ;;
1438
1439 # Unfortunately, older versions of FreeBSD 2 do not have this feature.
1440- freebsd2*)
1441+ freebsd2.*)
1442 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
1443 _LT_TAGVAR(hardcode_direct, $1)=yes
1444 _LT_TAGVAR(hardcode_minus_L, $1)=yes
1445@@ -5185,7 +5258,6 @@
1446 fi
1447 if test "$with_gnu_ld" = no; then
1448 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
1449- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
1450 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
1451 _LT_TAGVAR(hardcode_direct, $1)=yes
1452 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
1453@@ -5627,9 +5699,6 @@
1454 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
1455 [Flag to hardcode $libdir into a binary during linking.
1456 This must work even if $libdir does not exist])
1457-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
1458- [[If ld is used when linking, flag to hardcode $libdir into a binary
1459- during linking. This must work even if $libdir does not exist]])
1460 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
1461 [Whether we need a single "-rpath" flag with a separated argument])
1462 _LT_TAGDECL([], [hardcode_direct], [0],
1463@@ -5787,7 +5856,6 @@
1464 _LT_TAGVAR(hardcode_direct, $1)=no
1465 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
1466 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
1467-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
1468 _LT_TAGVAR(hardcode_libdir_separator, $1)=
1469 _LT_TAGVAR(hardcode_minus_L, $1)=no
1470 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
1471@@ -6157,7 +6225,7 @@
1472 esac
1473 ;;
1474
1475- freebsd[[12]]*)
1476+ freebsd2.*)
1477 # C++ shared libraries reported to be fairly broken before
1478 # switch to ELF
1479 _LT_TAGVAR(ld_shlibs, $1)=no
1480@@ -6918,12 +6986,18 @@
1481 }
1482 };
1483 _LT_EOF
1484+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
1485+package foo
1486+func foo() {
1487+}
1488+_LT_EOF
1489 ])
1490
1491 _lt_libdeps_save_CFLAGS=$CFLAGS
1492 case "$CC $CFLAGS " in #(
1493 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
1494 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
1495+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
1496 esac
1497
1498 dnl Parse the compiler output and extract the necessary
1499@@ -7120,7 +7194,6 @@
1500 _LT_TAGVAR(hardcode_direct, $1)=no
1501 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
1502 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
1503-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
1504 _LT_TAGVAR(hardcode_libdir_separator, $1)=
1505 _LT_TAGVAR(hardcode_minus_L, $1)=no
1506 _LT_TAGVAR(hardcode_automatic, $1)=no
1507@@ -7253,7 +7326,6 @@
1508 _LT_TAGVAR(hardcode_direct, $1)=no
1509 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
1510 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
1511-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
1512 _LT_TAGVAR(hardcode_libdir_separator, $1)=
1513 _LT_TAGVAR(hardcode_minus_L, $1)=no
1514 _LT_TAGVAR(hardcode_automatic, $1)=no
1515@@ -7440,6 +7512,77 @@
1516 ])# _LT_LANG_GCJ_CONFIG
1517
1518
1519+# _LT_LANG_GO_CONFIG([TAG])
1520+# --------------------------
1521+# Ensure that the configuration variables for the GNU Go compiler
1522+# are suitably defined. These variables are subsequently used by _LT_CONFIG
1523+# to write the compiler configuration to `libtool'.
1524+m4_defun([_LT_LANG_GO_CONFIG],
1525+[AC_REQUIRE([LT_PROG_GO])dnl
1526+AC_LANG_SAVE
1527+
1528+# Source file extension for Go test sources.
1529+ac_ext=go
1530+
1531+# Object file extension for compiled Go test sources.
1532+objext=o
1533+_LT_TAGVAR(objext, $1)=$objext
1534+
1535+# Code to be used in simple compile tests
1536+lt_simple_compile_test_code="package main; func main() { }"
1537+
1538+# Code to be used in simple link tests
1539+lt_simple_link_test_code='package main; func main() { }'
1540+
1541+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
1542+_LT_TAG_COMPILER
1543+
1544+# save warnings/boilerplate of simple test code
1545+_LT_COMPILER_BOILERPLATE
1546+_LT_LINKER_BOILERPLATE
1547+
1548+# Allow CC to be a program name with arguments.
1549+lt_save_CC=$CC
1550+lt_save_CFLAGS=$CFLAGS
1551+lt_save_GCC=$GCC
1552+GCC=yes
1553+CC=${GOC-"gccgo"}
1554+CFLAGS=$GOFLAGS
1555+compiler=$CC
1556+_LT_TAGVAR(compiler, $1)=$CC
1557+_LT_TAGVAR(LD, $1)="$LD"
1558+_LT_CC_BASENAME([$compiler])
1559+
1560+# Go did not exist at the time GCC didn't implicitly link libc in.
1561+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
1562+
1563+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
1564+_LT_TAGVAR(reload_flag, $1)=$reload_flag
1565+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
1566+
1567+## CAVEAT EMPTOR:
1568+## There is no encapsulation within the following macros, do not change
1569+## the running order or otherwise move them around unless you know exactly
1570+## what you are doing...
1571+if test -n "$compiler"; then
1572+ _LT_COMPILER_NO_RTTI($1)
1573+ _LT_COMPILER_PIC($1)
1574+ _LT_COMPILER_C_O($1)
1575+ _LT_COMPILER_FILE_LOCKS($1)
1576+ _LT_LINKER_SHLIBS($1)
1577+ _LT_LINKER_HARDCODE_LIBPATH($1)
1578+
1579+ _LT_CONFIG($1)
1580+fi
1581+
1582+AC_LANG_RESTORE
1583+
1584+GCC=$lt_save_GCC
1585+CC=$lt_save_CC
1586+CFLAGS=$lt_save_CFLAGS
1587+])# _LT_LANG_GO_CONFIG
1588+
1589+
1590 # _LT_LANG_RC_CONFIG([TAG])
1591 # -------------------------
1592 # Ensure that the configuration variables for the Windows resource compiler
1593@@ -7509,6 +7652,13 @@
1594 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
1595
1596
1597+# LT_PROG_GO
1598+# ----------
1599+AC_DEFUN([LT_PROG_GO],
1600+[AC_CHECK_TOOL(GOC, gccgo,)
1601+])
1602+
1603+
1604 # LT_PROG_RC
1605 # ----------
1606 AC_DEFUN([LT_PROG_RC],
1607
1608=== modified file 'm4/ltoptions.m4'
1609--- m4/ltoptions.m4 2011-12-21 00:31:37 +0000
1610+++ m4/ltoptions.m4 2012-01-17 23:06:35 +0000
1611@@ -326,9 +326,24 @@
1612 # MODE is either `yes' or `no'. If omitted, it defaults to `both'.
1613 m4_define([_LT_WITH_PIC],
1614 [AC_ARG_WITH([pic],
1615- [AS_HELP_STRING([--with-pic],
1616+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
1617 [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
1618- [pic_mode="$withval"],
1619+ [lt_p=${PACKAGE-default}
1620+ case $withval in
1621+ yes|no) pic_mode=$withval ;;
1622+ *)
1623+ pic_mode=default
1624+ # Look at the argument we got. We use all the common list separators.
1625+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
1626+ for lt_pkg in $withval; do
1627+ IFS="$lt_save_ifs"
1628+ if test "X$lt_pkg" = "X$lt_p"; then
1629+ pic_mode=yes
1630+ fi
1631+ done
1632+ IFS="$lt_save_ifs"
1633+ ;;
1634+ esac],
1635 [pic_mode=default])
1636
1637 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
1638
1639=== modified file 'm4/ltversion.m4'
1640--- m4/ltversion.m4 2011-12-21 00:31:37 +0000
1641+++ m4/ltversion.m4 2012-01-17 23:06:35 +0000
1642@@ -9,15 +9,15 @@
1643
1644 # @configure_input@
1645
1646-# serial 3293 ltversion.m4
1647+# serial 3337 ltversion.m4
1648 # This file is part of GNU Libtool
1649
1650-m4_define([LT_PACKAGE_VERSION], [2.4])
1651-m4_define([LT_PACKAGE_REVISION], [1.3293])
1652+m4_define([LT_PACKAGE_VERSION], [2.4.2])
1653+m4_define([LT_PACKAGE_REVISION], [1.3337])
1654
1655 AC_DEFUN([LTVERSION_VERSION],
1656-[macro_version='2.4'
1657-macro_revision='1.3293'
1658+[macro_version='2.4.2'
1659+macro_revision='1.3337'
1660 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
1661 _LT_DECL(, macro_revision, 0)
1662 ])

Subscribers

People subscribed via source and target branches

to all changes: