1 diff -Nur libffi-3.0.6/Makefile.in build/Makefile.in
2 --- libffi-3.0.6/Makefile.in 2008-02-21 13:36:18.000000000 +0000
3 +++ build/Makefile.in 2009-01-23 17:56:34.000000000 +0000
5 -# Makefile.in generated by automake 1.10 from Makefile.am.
6 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
9 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
10 -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
11 +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
12 # This Makefile.in is free software; the Free Software Foundation
13 # gives unlimited permission to copy and/or distribute it,
14 # with or without modifications, as long as this notice is preserved.
17 AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@
21 AUTOHEADER = @AUTOHEADER@
24 CYGPATH_W = @CYGPATH_W@
28 +DSYMUTIL = @DSYMUTIL@
33 INSTALL_SCRIPT = @INSTALL_SCRIPT@
34 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
36 +LIBFFI_DLL = @LIBFFI_DLL@
37 +LIBFFI_LDFLAGS = @LIBFFI_LDFLAGS@
49 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
51 libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
52 nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
53 AM_CFLAGS = -Wall -g -fexceptions
54 -libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
55 +libffi_la_LDFLAGS = $(LIBFFI_LDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version`
56 AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
57 AM_CCASFLAGS = $(AM_CPPFLAGS)
60 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
61 if test -f $$p; then \
63 - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
64 - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
65 + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
66 + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
72 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
74 - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
75 - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
76 + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
77 + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
82 unique=`for i in $$list; do \
83 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
85 - $(AWK) ' { files[$$0] = 1; } \
86 - END { for (i in files) print i; }'`; \
87 + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
88 + END { if (nonempty) { for (i in files) print i; }; }'`; \
93 unique=`for i in $$list; do \
94 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
96 - $(AWK) ' { files[$$0] = 1; } \
97 - END { for (i in files) print i; }'`; \
98 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
99 + END { if (nonempty) { for (i in files) print i; }; }'`; \
100 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
101 test -n "$$unique" || unique=$$empty_fix; \
102 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
103 @@ -1240,13 +1247,12 @@
104 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) fficonfig.h.in $(TAGS_DEPENDENCIES) \
105 $(TAGS_FILES) $(LISP)
108 list='$(SOURCES) $(HEADERS) fficonfig.h.in $(LISP) $(TAGS_FILES)'; \
109 unique=`for i in $$list; do \
110 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
112 - $(AWK) ' { files[$$0] = 1; } \
113 - END { for (i in files) print i; }'`; \
114 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
115 + END { if (nonempty) { for (i in files) print i; }; }'`; \
116 test -z "$(CTAGS_ARGS)$$tags$$unique" \
117 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
119 @@ -1320,6 +1326,10 @@
120 tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
121 $(am__remove_distdir)
124 + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
125 + $(am__remove_distdir)
128 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
129 $(am__remove_distdir)
130 @@ -1346,6 +1356,8 @@
131 GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
133 bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
135 + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
137 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
139 @@ -1612,8 +1624,8 @@
140 all all-am am--refresh check check-am clean clean-generic \
141 clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
142 ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
143 - dist-info dist-shar dist-tarZ dist-zip distcheck distclean \
144 - distclean-compile distclean-generic distclean-hdr \
145 + dist-info dist-lzma dist-shar dist-tarZ dist-zip distcheck \
146 + distclean distclean-compile distclean-generic distclean-hdr \
147 distclean-libtool distclean-tags distcleancheck distdir \
148 distuninstallcheck dvi dvi-am html html-am info info-am \
149 install install-am install-data install-data-am install-dvi \
150 diff -Nur libffi-3.0.6/configure build/configure
151 --- libffi-3.0.6/configure 2008-07-17 14:07:39.000000000 +0100
152 +++ build/configure 2009-01-23 17:56:34.000000000 +0000
156 am__fastdepCCAS_FALSE
174 @@ -3965,6 +3972,22 @@
185 + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
186 + if test "$enable_shared" = yes; then
187 + LIBFFI_LDFLAGS="-no-undefined -Wl,--export-all-symbols"
194 # Check whether --enable-shared was given.
195 if test "${enable_shared+set}" = set; then
196 enableval=$enable_shared; p=${PACKAGE-default}
197 @@ -4474,7 +4497,7 @@
198 # whether `pass_all' will *always* work, you probably want this one.
203 lt_cv_deplibs_check_method=pass_all
206 @@ -4690,7 +4713,7 @@
209 # Find out which ABI we are using.
210 - echo '#line 4693 "configure"' > conftest.$ac_ext
211 + echo '#line 4716 "configure"' > conftest.$ac_ext
212 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
213 (eval $ac_compile) 2>&5
215 @@ -4755,7 +4778,6 @@
221 x86_64-*kfreebsd*-gnu)
222 LD="${LD-ld} -m elf_x86_64_fbsd"
223 @@ -4863,7 +4885,11 @@
225 case $lt_cv_prog_gnu_ld in
226 yes*) LD="${LD-ld} -m elf64_sparc" ;;
227 - *) LD="${LD-ld} -64" ;;
229 + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
236 @@ -4871,6 +4897,296 @@
240 +*-*-cygwin* | *-*-mingw* | *-*-pw32*)
241 + if test -n "$ac_tool_prefix"; then
242 + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
243 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
244 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
245 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
246 +if test "${ac_cv_prog_DLLTOOL+set}" = set; then
247 + echo $ECHO_N "(cached) $ECHO_C" >&6
249 + if test -n "$DLLTOOL"; then
250 + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
252 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
256 + test -z "$as_dir" && as_dir=.
257 + for ac_exec_ext in '' $ac_executable_extensions; do
258 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
259 + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
260 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
269 +DLLTOOL=$ac_cv_prog_DLLTOOL
270 +if test -n "$DLLTOOL"; then
271 + { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
272 +echo "${ECHO_T}$DLLTOOL" >&6; }
274 + { echo "$as_me:$LINENO: result: no" >&5
275 +echo "${ECHO_T}no" >&6; }
280 +if test -z "$ac_cv_prog_DLLTOOL"; then
281 + ac_ct_DLLTOOL=$DLLTOOL
282 + # Extract the first word of "dlltool", so it can be a program name with args.
283 +set dummy dlltool; ac_word=$2
284 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
285 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
286 +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
287 + echo $ECHO_N "(cached) $ECHO_C" >&6
289 + if test -n "$ac_ct_DLLTOOL"; then
290 + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
292 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
296 + test -z "$as_dir" && as_dir=.
297 + for ac_exec_ext in '' $ac_executable_extensions; do
298 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
299 + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
300 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
309 +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
310 +if test -n "$ac_ct_DLLTOOL"; then
311 + { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
312 +echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
314 + { echo "$as_me:$LINENO: result: no" >&5
315 +echo "${ECHO_T}no" >&6; }
318 + if test "x$ac_ct_DLLTOOL" = x; then
321 + case $cross_compiling:$ac_tool_warned in
323 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
324 +whose name does not start with the host triplet. If you think this
325 +configuration is useful to you, please write to autoconf@gnu.org." >&5
326 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
327 +whose name does not start with the host triplet. If you think this
328 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
329 +ac_tool_warned=yes ;;
331 + DLLTOOL=$ac_ct_DLLTOOL
334 + DLLTOOL="$ac_cv_prog_DLLTOOL"
337 + if test -n "$ac_tool_prefix"; then
338 + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
339 +set dummy ${ac_tool_prefix}as; ac_word=$2
340 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
341 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
342 +if test "${ac_cv_prog_AS+set}" = set; then
343 + echo $ECHO_N "(cached) $ECHO_C" >&6
345 + if test -n "$AS"; then
346 + ac_cv_prog_AS="$AS" # Let the user override the test.
348 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
352 + test -z "$as_dir" && as_dir=.
353 + for ac_exec_ext in '' $ac_executable_extensions; do
354 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
355 + ac_cv_prog_AS="${ac_tool_prefix}as"
356 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
366 +if test -n "$AS"; then
367 + { echo "$as_me:$LINENO: result: $AS" >&5
368 +echo "${ECHO_T}$AS" >&6; }
370 + { echo "$as_me:$LINENO: result: no" >&5
371 +echo "${ECHO_T}no" >&6; }
376 +if test -z "$ac_cv_prog_AS"; then
378 + # Extract the first word of "as", so it can be a program name with args.
379 +set dummy as; ac_word=$2
380 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
381 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
382 +if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
383 + echo $ECHO_N "(cached) $ECHO_C" >&6
385 + if test -n "$ac_ct_AS"; then
386 + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
388 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
392 + test -z "$as_dir" && as_dir=.
393 + for ac_exec_ext in '' $ac_executable_extensions; do
394 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
395 + ac_cv_prog_ac_ct_AS="as"
396 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
405 +ac_ct_AS=$ac_cv_prog_ac_ct_AS
406 +if test -n "$ac_ct_AS"; then
407 + { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
408 +echo "${ECHO_T}$ac_ct_AS" >&6; }
410 + { echo "$as_me:$LINENO: result: no" >&5
411 +echo "${ECHO_T}no" >&6; }
414 + if test "x$ac_ct_AS" = x; then
417 + case $cross_compiling:$ac_tool_warned in
419 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
420 +whose name does not start with the host triplet. If you think this
421 +configuration is useful to you, please write to autoconf@gnu.org." >&5
422 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
423 +whose name does not start with the host triplet. If you think this
424 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
425 +ac_tool_warned=yes ;;
430 + AS="$ac_cv_prog_AS"
433 + if test -n "$ac_tool_prefix"; then
434 + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
435 +set dummy ${ac_tool_prefix}objdump; ac_word=$2
436 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
437 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
438 +if test "${ac_cv_prog_OBJDUMP+set}" = set; then
439 + echo $ECHO_N "(cached) $ECHO_C" >&6
441 + if test -n "$OBJDUMP"; then
442 + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
444 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
448 + test -z "$as_dir" && as_dir=.
449 + for ac_exec_ext in '' $ac_executable_extensions; do
450 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
451 + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
452 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
461 +OBJDUMP=$ac_cv_prog_OBJDUMP
462 +if test -n "$OBJDUMP"; then
463 + { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
464 +echo "${ECHO_T}$OBJDUMP" >&6; }
466 + { echo "$as_me:$LINENO: result: no" >&5
467 +echo "${ECHO_T}no" >&6; }
472 +if test -z "$ac_cv_prog_OBJDUMP"; then
473 + ac_ct_OBJDUMP=$OBJDUMP
474 + # Extract the first word of "objdump", so it can be a program name with args.
475 +set dummy objdump; ac_word=$2
476 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
477 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
478 +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
479 + echo $ECHO_N "(cached) $ECHO_C" >&6
481 + if test -n "$ac_ct_OBJDUMP"; then
482 + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
484 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
488 + test -z "$as_dir" && as_dir=.
489 + for ac_exec_ext in '' $ac_executable_extensions; do
490 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
491 + ac_cv_prog_ac_ct_OBJDUMP="objdump"
492 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
501 +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
502 +if test -n "$ac_ct_OBJDUMP"; then
503 + { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
504 +echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
506 + { echo "$as_me:$LINENO: result: no" >&5
507 +echo "${ECHO_T}no" >&6; }
510 + if test "x$ac_ct_OBJDUMP" = x; then
513 + case $cross_compiling:$ac_tool_warned in
515 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
516 +whose name does not start with the host triplet. If you think this
517 +configuration is useful to you, please write to autoconf@gnu.org." >&5
518 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
519 +whose name does not start with the host triplet. If you think this
520 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
521 +ac_tool_warned=yes ;;
523 + OBJDUMP=$ac_ct_OBJDUMP
526 + OBJDUMP="$ac_cv_prog_OBJDUMP"
533 @@ -6465,7 +6781,6 @@
536 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
538 # find the maximum length of command line arguments
539 { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
540 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
541 @@ -6780,7 +7095,7 @@
542 echo "$progname: failed program was:" >&5
543 cat conftest.$ac_ext >&5
545 - rm -f conftest* conftst*
546 + rm -rf conftest* conftst*
548 # Do not use the global_symbol_pipe unless it works.
549 if test "$pipe_works" = yes; then
550 @@ -7309,39 +7624,351 @@
551 *** may want to report the problem to your system manager and/or to
552 *** bug-libtool@gnu.org
562 - MAGIC_CMD="$lt_save_MAGIC_CMD"
573 + MAGIC_CMD="$lt_save_MAGIC_CMD"
578 +MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
579 +if test -n "$MAGIC_CMD"; then
580 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
581 +echo "${ECHO_T}$MAGIC_CMD" >&6; }
583 + { echo "$as_me:$LINENO: result: no" >&5
584 +echo "${ECHO_T}no" >&6; }
598 + rhapsody* | darwin*)
599 + if test -n "$ac_tool_prefix"; then
600 + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
601 +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
602 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
603 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
604 +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
605 + echo $ECHO_N "(cached) $ECHO_C" >&6
607 + if test -n "$DSYMUTIL"; then
608 + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
610 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
614 + test -z "$as_dir" && as_dir=.
615 + for ac_exec_ext in '' $ac_executable_extensions; do
616 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
617 + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
618 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
627 +DSYMUTIL=$ac_cv_prog_DSYMUTIL
628 +if test -n "$DSYMUTIL"; then
629 + { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
630 +echo "${ECHO_T}$DSYMUTIL" >&6; }
632 + { echo "$as_me:$LINENO: result: no" >&5
633 +echo "${ECHO_T}no" >&6; }
638 +if test -z "$ac_cv_prog_DSYMUTIL"; then
639 + ac_ct_DSYMUTIL=$DSYMUTIL
640 + # Extract the first word of "dsymutil", so it can be a program name with args.
641 +set dummy dsymutil; ac_word=$2
642 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
643 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
644 +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
645 + echo $ECHO_N "(cached) $ECHO_C" >&6
647 + if test -n "$ac_ct_DSYMUTIL"; then
648 + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
650 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
654 + test -z "$as_dir" && as_dir=.
655 + for ac_exec_ext in '' $ac_executable_extensions; do
656 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
657 + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
658 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
667 +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
668 +if test -n "$ac_ct_DSYMUTIL"; then
669 + { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
670 +echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
672 + { echo "$as_me:$LINENO: result: no" >&5
673 +echo "${ECHO_T}no" >&6; }
676 + if test "x$ac_ct_DSYMUTIL" = x; then
679 + case $cross_compiling:$ac_tool_warned in
681 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
682 +whose name does not start with the host triplet. If you think this
683 +configuration is useful to you, please write to autoconf@gnu.org." >&5
684 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
685 +whose name does not start with the host triplet. If you think this
686 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
687 +ac_tool_warned=yes ;;
689 + DSYMUTIL=$ac_ct_DSYMUTIL
692 + DSYMUTIL="$ac_cv_prog_DSYMUTIL"
695 + if test -n "$ac_tool_prefix"; then
696 + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
697 +set dummy ${ac_tool_prefix}nmedit; ac_word=$2
698 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
699 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
700 +if test "${ac_cv_prog_NMEDIT+set}" = set; then
701 + echo $ECHO_N "(cached) $ECHO_C" >&6
703 + if test -n "$NMEDIT"; then
704 + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
706 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
710 + test -z "$as_dir" && as_dir=.
711 + for ac_exec_ext in '' $ac_executable_extensions; do
712 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
713 + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
714 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
723 +NMEDIT=$ac_cv_prog_NMEDIT
724 +if test -n "$NMEDIT"; then
725 + { echo "$as_me:$LINENO: result: $NMEDIT" >&5
726 +echo "${ECHO_T}$NMEDIT" >&6; }
728 + { echo "$as_me:$LINENO: result: no" >&5
729 +echo "${ECHO_T}no" >&6; }
734 +if test -z "$ac_cv_prog_NMEDIT"; then
735 + ac_ct_NMEDIT=$NMEDIT
736 + # Extract the first word of "nmedit", so it can be a program name with args.
737 +set dummy nmedit; ac_word=$2
738 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
739 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
740 +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
741 + echo $ECHO_N "(cached) $ECHO_C" >&6
743 + if test -n "$ac_ct_NMEDIT"; then
744 + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
746 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
750 + test -z "$as_dir" && as_dir=.
751 + for ac_exec_ext in '' $ac_executable_extensions; do
752 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
753 + ac_cv_prog_ac_ct_NMEDIT="nmedit"
754 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
761 -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
762 -if test -n "$MAGIC_CMD"; then
763 - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
764 -echo "${ECHO_T}$MAGIC_CMD" >&6; }
767 +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
768 +if test -n "$ac_ct_NMEDIT"; then
769 + { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
770 +echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
772 { echo "$as_me:$LINENO: result: no" >&5
773 echo "${ECHO_T}no" >&6; }
776 + if test "x$ac_ct_NMEDIT" = x; then
780 + case $cross_compiling:$ac_tool_warned in
782 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
783 +whose name does not start with the host triplet. If you think this
784 +configuration is useful to you, please write to autoconf@gnu.org." >&5
785 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
786 +whose name does not start with the host triplet. If you think this
787 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
788 +ac_tool_warned=yes ;;
790 + NMEDIT=$ac_ct_NMEDIT
793 + NMEDIT="$ac_cv_prog_NMEDIT"
799 + { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
800 +echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
801 +if test "${lt_cv_apple_cc_single_mod+set}" = set; then
802 + echo $ECHO_N "(cached) $ECHO_C" >&6
804 + lt_cv_apple_cc_single_mod=no
805 + if test -z "${LT_MULTI_MODULE}"; then
806 + # By default we will add the -single_module flag. You can override
807 + # by either setting the environment variable LT_MULTI_MODULE
808 + # non-empty at configure time, or by adding -multi_module to the
810 + echo "int foo(void){return 1;}" > conftest.c
811 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
812 + -dynamiclib ${wl}-single_module conftest.c
813 + if test -f libconftest.dylib; then
814 + lt_cv_apple_cc_single_mod=yes
815 + rm -rf libconftest.dylib*
820 +{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
821 +echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
822 + { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
823 +echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
824 +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
825 + echo $ECHO_N "(cached) $ECHO_C" >&6
827 + lt_cv_ld_exported_symbols_list=no
828 + save_LDFLAGS=$LDFLAGS
829 + echo "_main" > conftest.sym
830 + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
831 + cat >conftest.$ac_ext <<_ACEOF
834 +cat confdefs.h >>conftest.$ac_ext
835 +cat >>conftest.$ac_ext <<_ACEOF
836 +/* end confdefs.h. */
846 +rm -f conftest.$ac_objext conftest$ac_exeext
847 +if { (ac_try="$ac_link"
849 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
850 + *) ac_try_echo=$ac_try;;
852 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
853 + (eval "$ac_link") 2>conftest.er1
855 + grep -v '^ *+' conftest.er1 >conftest.err
857 + cat conftest.err >&5
858 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
859 + (exit $ac_status); } && {
860 + test -z "$ac_c_werror_flag" ||
861 + test ! -s conftest.err
862 + } && test -s conftest$ac_exeext &&
863 + $as_test_x conftest$ac_exeext; then
864 + lt_cv_ld_exported_symbols_list=yes
866 + echo "$as_me: failed program was:" >&5
867 +sed 's/^/| /' conftest.$ac_ext >&5
869 + lt_cv_ld_exported_symbols_list=no
872 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
873 + conftest$ac_exeext conftest.$ac_ext
874 + LDFLAGS="$save_LDFLAGS"
877 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
878 +echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
880 + rhapsody* | darwin1.[0123])
881 + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
883 + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
885 + # if running on 10.5 or later, the deployment target defaults
886 + # to the OS version, if on x86, and 10.4, the deployment
887 + # target defaults to 10.4. Don't you love it?
888 + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
889 + 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
890 + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
892 + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
894 + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
898 + if test "$lt_cv_apple_cc_single_mod" = "yes"; then
899 + _lt_dar_single_mod='$single_module'
901 + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
902 + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
904 + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
906 + if test "$DSYMUTIL" != ":"; then
907 + _lt_dsymutil="~$DSYMUTIL \$lib || :"
917 +enable_win32_dll=yes
919 # Check whether --enable-libtool-lock was given.
920 if test "${enable_libtool_lock+set}" = set; then
921 @@ -7360,6 +7987,67 @@
923 test -z "$pic_mode" && pic_mode=default
925 +# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
927 +# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
928 +# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
929 +# calls AC_LIBTOOL_CONFIG and creates libtool.
931 +{ echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5
932 +echo $ECHO_N "checking for correct ltmain.sh version... $ECHO_C" >&6; }
933 +if test "x$ltmain" = "x" ; then
934 + { echo "$as_me:$LINENO: result: no" >&5
935 +echo "${ECHO_T}no" >&6; }
936 + { { echo "$as_me:$LINENO: error:
938 +*** [Gentoo] sanity check failed! ***
939 +*** \$ltmain is not defined, please check the patch for consistency! ***
941 +echo "$as_me: error:
943 +*** [Gentoo] sanity check failed! ***
944 +*** \$ltmain is not defined, please check the patch for consistency! ***
946 + { (exit 1); exit 1; }; }
948 +gentoo_lt_version="1.5.26"
949 +gentoo_ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' "$ltmain"`
950 +if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
951 + { echo "$as_me:$LINENO: result: no" >&5
952 +echo "${ECHO_T}no" >&6; }
953 + { { echo "$as_me:$LINENO: error:
955 +*** [Gentoo] sanity check failed! ***
956 +*** libtool.m4 and ltmain.sh have a version mismatch! ***
957 +*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
961 + libtoolize --copy --force
963 +if appropriate, please contact the maintainer of this
964 +package (or your distribution) for help.
966 +echo "$as_me: error:
968 +*** [Gentoo] sanity check failed! ***
969 +*** libtool.m4 and ltmain.sh have a version mismatch! ***
970 +*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
974 + libtoolize --copy --force
976 +if appropriate, please contact the maintainer of this
977 +package (or your distribution) for help.
979 + { (exit 1); exit 1; }; }
981 + { echo "$as_me:$LINENO: result: yes" >&5
982 +echo "${ECHO_T}yes" >&6; }
986 # Use C for the default configuration in the libtool script
989 @@ -7405,7 +8093,7 @@
990 echo "$lt_simple_link_test_code" >conftest.$ac_ext
991 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
992 _lt_linker_boilerplate=`cat conftest.err`
998 @@ -7433,11 +8121,11 @@
999 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1000 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1001 -e 's:$: $lt_compiler_flag:'`
1002 - (eval echo "\"\$as_me:7436: $lt_compile\"" >&5)
1003 + (eval echo "\"\$as_me:8124: $lt_compile\"" >&5)
1004 (eval "$lt_compile" 2>conftest.err)
1006 cat conftest.err >&5
1007 - echo "$as_me:7440: \$? = $ac_status" >&5
1008 + echo "$as_me:8128: \$? = $ac_status" >&5
1009 if (exit $ac_status) && test -s "$ac_outfile"; then
1010 # The compiler can only warn and ignore the option if not recognized
1011 # So say no if there are warnings other than the usual output.
1012 @@ -7707,10 +8395,10 @@
1014 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
1015 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
1016 -if test "${lt_prog_compiler_pic_works+set}" = set; then
1017 +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
1018 echo $ECHO_N "(cached) $ECHO_C" >&6
1020 - lt_prog_compiler_pic_works=no
1021 + lt_cv_prog_compiler_pic_works=no
1022 ac_outfile=conftest.$ac_objext
1023 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1024 lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
1025 @@ -7723,27 +8411,27 @@
1026 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1027 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1028 -e 's:$: $lt_compiler_flag:'`
1029 - (eval echo "\"\$as_me:7726: $lt_compile\"" >&5)
1030 + (eval echo "\"\$as_me:8414: $lt_compile\"" >&5)
1031 (eval "$lt_compile" 2>conftest.err)
1033 cat conftest.err >&5
1034 - echo "$as_me:7730: \$? = $ac_status" >&5
1035 + echo "$as_me:8418: \$? = $ac_status" >&5
1036 if (exit $ac_status) && test -s "$ac_outfile"; then
1037 # The compiler can only warn and ignore the option if not recognized
1038 # So say no if there are warnings other than the usual output.
1039 $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1040 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1041 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1042 - lt_prog_compiler_pic_works=yes
1043 + lt_cv_prog_compiler_pic_works=yes
1049 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
1050 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
1051 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
1052 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
1054 -if test x"$lt_prog_compiler_pic_works" = xyes; then
1055 +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
1056 case $lt_prog_compiler_pic in
1058 *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
1059 @@ -7770,10 +8458,10 @@
1060 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
1061 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
1062 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
1063 -if test "${lt_prog_compiler_static_works+set}" = set; then
1064 +if test "${lt_cv_prog_compiler_static_works+set}" = set; then
1065 echo $ECHO_N "(cached) $ECHO_C" >&6
1067 - lt_prog_compiler_static_works=no
1068 + lt_cv_prog_compiler_static_works=no
1069 save_LDFLAGS="$LDFLAGS"
1070 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
1071 echo "$lt_simple_link_test_code" > conftest.$ac_ext
1072 @@ -7786,20 +8474,20 @@
1073 $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1074 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1075 if diff conftest.exp conftest.er2 >/dev/null; then
1076 - lt_prog_compiler_static_works=yes
1077 + lt_cv_prog_compiler_static_works=yes
1080 - lt_prog_compiler_static_works=yes
1081 + lt_cv_prog_compiler_static_works=yes
1086 LDFLAGS="$save_LDFLAGS"
1089 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
1090 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
1091 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
1092 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
1094 -if test x"$lt_prog_compiler_static_works" = xyes; then
1095 +if test x"$lt_cv_prog_compiler_static_works" = xyes; then
1098 lt_prog_compiler_static=
1099 @@ -7827,11 +8515,11 @@
1100 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1101 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1102 -e 's:$: $lt_compiler_flag:'`
1103 - (eval echo "\"\$as_me:7830: $lt_compile\"" >&5)
1104 + (eval echo "\"\$as_me:8518: $lt_compile\"" >&5)
1105 (eval "$lt_compile" 2>out/conftest.err)
1107 cat out/conftest.err >&5
1108 - echo "$as_me:7834: \$? = $ac_status" >&5
1109 + echo "$as_me:8522: \$? = $ac_status" >&5
1110 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1112 # The compiler can only warn and ignore the option if not recognized
1113 @@ -7911,12 +8599,13 @@
1114 # it will be wrapped by ` (' and `)$', so one must not match beginning or
1115 # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
1116 # as well as any symbol that contains `d'.
1117 - exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
1118 + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
1119 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
1120 # platforms (ab)use it in PIC code, but their linkers get confused if
1121 # the symbol is explicitly referenced. Since portable code cannot
1122 # rely on this symbol name, it's probably fine to never include it in
1123 # preloaded symbol tables.
1124 + # Exclude shared library initialization/finalization symbols.
1125 extract_expsyms_cmds=
1126 # Just being paranoid about ensuring that cc_basename is set.
1127 for cc_temp in $compiler""; do
1128 @@ -7975,7 +8664,7 @@
1130 # See if GNU ld supports shared libraries.
1132 - aix3* | aix4* | aix5*)
1134 # On AIX/PPC, the GNU linker is very broken
1135 if test "$host_cpu" != ia64; then
1137 @@ -8194,7 +8883,7 @@
1143 if test "$host_cpu" = ia64; then
1144 # On IA64, the linker does run time linking by default, so we don't
1145 # have to do anything special.
1146 @@ -8214,7 +8903,7 @@
1147 # Test if we are trying to use run time linking or normal
1148 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
1149 # need to do runtime linking.
1150 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
1151 + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
1152 for ld_flag in $LDFLAGS; do
1153 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
1154 aix_use_runtimelinking=yes
1155 @@ -8486,11 +9175,10 @@
1156 link_all_deplibs=yes
1157 if test "$GCC" = yes ; then
1158 output_verbose_link_cmd='echo'
1159 - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
1160 - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
1161 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
1162 - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1163 - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1164 + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
1165 + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
1166 + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
1167 + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
1169 case $cc_basename in
1171 @@ -9010,7 +9698,7 @@
1172 soname_spec='${libname}${release}${shared_ext}$major'
1180 @@ -9178,7 +9866,14 @@
1184 - version_type=freebsd-$objformat
1185 + # Handle Gentoo/FreeBSD as it was Linux
1186 + case $host_vendor in
1188 + version_type=linux ;;
1190 + version_type=freebsd-$objformat ;;
1193 case $version_type in
1195 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
1196 @@ -9189,6 +9884,12 @@
1197 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
1201 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1202 + soname_spec='${libname}${release}${shared_ext}$major'
1203 + need_lib_prefix=no
1207 shlibpath_var=LD_LIBRARY_PATH
1209 @@ -9335,13 +10036,11 @@
1210 # Some rework will be needed to allow for fast_install
1211 # before this can be enabled.
1212 hardcode_into_libs=yes
1213 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
1214 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
1216 # Append ld.so.conf contents to the search path
1217 if test -f /etc/ld.so.conf; then
1218 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
1219 - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
1220 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1223 # We used to test for /lib/ld.so.1 and disable shared libraries on
1224 @@ -9534,6 +10233,21 @@
1225 echo "${ECHO_T}$dynamic_linker" >&6; }
1226 test "$dynamic_linker" = no && can_build_shared=no
1228 +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
1229 + echo $ECHO_N "(cached) $ECHO_C" >&6
1231 + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
1234 +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
1235 +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
1236 + echo $ECHO_N "(cached) $ECHO_C" >&6
1238 + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
1241 +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
1243 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
1244 if test "$GCC" = yes; then
1245 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
1246 @@ -9853,7 +10567,7 @@
1247 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
1248 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
1249 if test $ac_cv_lib_dld_shl_load = yes; then
1250 - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
1251 + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
1253 { echo "$as_me:$LINENO: checking for dlopen" >&5
1254 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
1255 @@ -10129,7 +10843,7 @@
1256 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
1257 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
1258 if test $ac_cv_lib_dld_dld_link = yes; then
1259 - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
1260 + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
1264 @@ -10178,7 +10892,7 @@
1265 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1266 lt_status=$lt_dlunknown
1267 cat > conftest.$ac_ext <<EOF
1268 -#line 10181 "configure"
1269 +#line 10895 "configure"
1270 #include "confdefs.h"
1273 @@ -10278,7 +10992,7 @@
1274 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1275 lt_status=$lt_dlunknown
1276 cat > conftest.$ac_ext <<EOF
1277 -#line 10281 "configure"
1278 +#line 10995 "configure"
1279 #include "confdefs.h"
1282 @@ -10405,7 +11119,7 @@
1288 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
1289 test "$enable_shared" = yes && enable_static=no
1291 @@ -10461,6 +11175,7 @@
1294 compiler_lib_search_path \
1295 + compiler_lib_search_dirs \
1297 archive_expsym_cmds \
1299 @@ -10521,7 +11236,7 @@
1300 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
1301 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1303 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
1304 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
1305 # Free Software Foundation, Inc.
1307 # This file is part of GNU Libtool:
1308 @@ -10757,6 +11472,10 @@
1310 postdeps=$lt_postdeps
1312 +# The directories searched by this compiler when creating a shared
1314 +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
1316 # The library search path used internally by the compiler when linking
1318 compiler_lib_search_path=$lt_compiler_lib_search_path
1319 @@ -11005,6 +11724,7 @@
1322 compiler_lib_search_path_CXX=
1323 +compiler_lib_search_dirs_CXX=
1325 # Source file extension for C++ test sources.
1327 @@ -11042,7 +11762,7 @@
1328 echo "$lt_simple_link_test_code" >conftest.$ac_ext
1329 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1330 _lt_linker_boilerplate=`cat conftest.err`
1335 # Allow CC to be a program name with arguments.
1336 @@ -11249,7 +11969,7 @@
1337 # FIXME: insert proper C++ library support
1342 if test "$host_cpu" = ia64; then
1343 # On IA64, the linker does run time linking by default, so we don't
1344 # have to do anything special.
1345 @@ -11262,7 +11982,7 @@
1346 # Test if we are trying to use run time linking or normal
1347 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
1348 # need to do runtime linking.
1349 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
1350 + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
1351 for ld_flag in $LDFLAGS; do
1354 @@ -11520,51 +12240,23 @@
1357 darwin* | rhapsody*)
1359 - rhapsody* | darwin1.[012])
1360 - allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
1362 - *) # Darwin 1.3 on
1363 - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
1364 - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
1366 - case ${MACOSX_DEPLOYMENT_TARGET} in
1368 - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
1371 - allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
1377 archive_cmds_need_lc_CXX=no
1378 hardcode_direct_CXX=no
1379 hardcode_automatic_CXX=yes
1380 hardcode_shlibpath_var_CXX=unsupported
1381 whole_archive_flag_spec_CXX=''
1382 link_all_deplibs_CXX=yes
1384 - if test "$GXX" = yes ; then
1385 - lt_int_apple_cc_single_mod=no
1386 + allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
1387 + if test "$GXX" = yes ; then
1388 output_verbose_link_cmd='echo'
1389 - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
1390 - lt_int_apple_cc_single_mod=yes
1391 + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
1392 + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
1393 + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
1394 + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
1395 + if test "$lt_cv_apple_cc_single_mod" != "yes"; then
1396 + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
1397 + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
1399 - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
1400 - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
1402 - archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
1404 - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
1405 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
1406 - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
1407 - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1409 - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1411 - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1413 case $cc_basename in
1415 @@ -11815,7 +12507,7 @@
1416 export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
1417 whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
1421 # Portland Group C++ compiler
1422 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
1423 archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
1424 @@ -12222,7 +12914,6 @@
1429 cat > conftest.$ac_ext <<EOF
1432 @@ -12324,6 +13015,11 @@
1434 $rm -f confest.$objext
1436 +compiler_lib_search_dirs_CXX=
1437 +if test -n "$compiler_lib_search_path_CXX"; then
1438 + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
1441 # PORTME: override above test on systems where it is broken
1444 @@ -12379,7 +13075,6 @@
1449 case " $postdeps_CXX " in
1450 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
1452 @@ -12455,7 +13150,7 @@
1458 # All AIX code is PIC.
1459 if test "$host_cpu" = ia64; then
1460 # AIX 5 now supports IA64 processor
1461 @@ -12551,7 +13246,7 @@
1462 lt_prog_compiler_pic_CXX='-KPIC'
1463 lt_prog_compiler_static_CXX='-static'
1467 # Portland Group C++ compiler.
1468 lt_prog_compiler_wl_CXX='-Wl,'
1469 lt_prog_compiler_pic_CXX='-fpic'
1470 @@ -12682,10 +13377,10 @@
1472 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
1473 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
1474 -if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
1475 +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
1476 echo $ECHO_N "(cached) $ECHO_C" >&6
1478 - lt_prog_compiler_pic_works_CXX=no
1479 + lt_cv_prog_compiler_pic_works_CXX=no
1480 ac_outfile=conftest.$ac_objext
1481 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1482 lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
1483 @@ -12698,27 +13393,27 @@
1484 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1485 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1486 -e 's:$: $lt_compiler_flag:'`
1487 - (eval echo "\"\$as_me:12701: $lt_compile\"" >&5)
1488 + (eval echo "\"\$as_me:13396: $lt_compile\"" >&5)
1489 (eval "$lt_compile" 2>conftest.err)
1491 cat conftest.err >&5
1492 - echo "$as_me:12705: \$? = $ac_status" >&5
1493 + echo "$as_me:13400: \$? = $ac_status" >&5
1494 if (exit $ac_status) && test -s "$ac_outfile"; then
1495 # The compiler can only warn and ignore the option if not recognized
1496 # So say no if there are warnings other than the usual output.
1497 $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1498 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1499 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1500 - lt_prog_compiler_pic_works_CXX=yes
1501 + lt_cv_prog_compiler_pic_works_CXX=yes
1507 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
1508 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
1509 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
1510 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
1512 -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
1513 +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
1514 case $lt_prog_compiler_pic_CXX in
1516 *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
1517 @@ -12745,10 +13440,10 @@
1518 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
1519 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
1520 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
1521 -if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
1522 +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
1523 echo $ECHO_N "(cached) $ECHO_C" >&6
1525 - lt_prog_compiler_static_works_CXX=no
1526 + lt_cv_prog_compiler_static_works_CXX=no
1527 save_LDFLAGS="$LDFLAGS"
1528 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
1529 echo "$lt_simple_link_test_code" > conftest.$ac_ext
1530 @@ -12761,20 +13456,20 @@
1531 $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1532 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1533 if diff conftest.exp conftest.er2 >/dev/null; then
1534 - lt_prog_compiler_static_works_CXX=yes
1535 + lt_cv_prog_compiler_static_works_CXX=yes
1538 - lt_prog_compiler_static_works_CXX=yes
1539 + lt_cv_prog_compiler_static_works_CXX=yes
1544 LDFLAGS="$save_LDFLAGS"
1547 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
1548 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
1549 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
1550 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
1552 -if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
1553 +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
1556 lt_prog_compiler_static_CXX=
1557 @@ -12802,11 +13497,11 @@
1558 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1559 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1560 -e 's:$: $lt_compiler_flag:'`
1561 - (eval echo "\"\$as_me:12805: $lt_compile\"" >&5)
1562 + (eval echo "\"\$as_me:13500: $lt_compile\"" >&5)
1563 (eval "$lt_compile" 2>out/conftest.err)
1565 cat out/conftest.err >&5
1566 - echo "$as_me:12809: \$? = $ac_status" >&5
1567 + echo "$as_me:13504: \$? = $ac_status" >&5
1568 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1570 # The compiler can only warn and ignore the option if not recognized
1571 @@ -12859,7 +13554,7 @@
1573 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
1577 # If we're using GNU nm, then we don't want the "-C" option.
1578 # -C means demangle to AIX nm, but means don't demangle with GNU nm
1579 if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
1580 @@ -12878,6 +13573,7 @@
1581 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
1584 + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
1586 { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
1587 echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
1588 @@ -12979,7 +13675,7 @@
1589 soname_spec='${libname}${release}${shared_ext}$major'
1597 @@ -13146,7 +13842,14 @@
1601 - version_type=freebsd-$objformat
1602 + # Handle Gentoo/FreeBSD as it was Linux
1603 + case $host_vendor in
1605 + version_type=linux ;;
1607 + version_type=freebsd-$objformat ;;
1610 case $version_type in
1612 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
1613 @@ -13157,6 +13860,12 @@
1614 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
1618 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1619 + soname_spec='${libname}${release}${shared_ext}$major'
1620 + need_lib_prefix=no
1624 shlibpath_var=LD_LIBRARY_PATH
1626 @@ -13303,13 +14012,11 @@
1627 # Some rework will be needed to allow for fast_install
1628 # before this can be enabled.
1629 hardcode_into_libs=yes
1630 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
1631 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
1633 # Append ld.so.conf contents to the search path
1634 if test -f /etc/ld.so.conf; then
1635 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
1636 - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
1637 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1640 # We used to test for /lib/ld.so.1 and disable shared libraries on
1641 @@ -13502,6 +14209,21 @@
1642 echo "${ECHO_T}$dynamic_linker" >&6; }
1643 test "$dynamic_linker" = no && can_build_shared=no
1645 +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
1646 + echo $ECHO_N "(cached) $ECHO_C" >&6
1648 + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
1651 +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
1652 +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
1653 + echo $ECHO_N "(cached) $ECHO_C" >&6
1655 + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
1658 +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
1660 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
1661 if test "$GCC" = yes; then
1662 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
1663 @@ -13585,6 +14307,7 @@
1666 compiler_lib_search_path_CXX \
1667 + compiler_lib_search_dirs_CXX \
1669 archive_expsym_cmds_CXX \
1670 postinstall_cmds_CXX \
1671 @@ -13833,6 +14556,10 @@
1673 postdeps=$lt_postdeps_CXX
1675 +# The directories searched by this compiler when creating a shared
1677 +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
1679 # The library search path used internally by the compiler when linking
1681 compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
1682 @@ -14047,7 +14774,7 @@
1683 echo "$lt_simple_link_test_code" >conftest.$ac_ext
1684 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1685 _lt_linker_boilerplate=`cat conftest.err`
1690 # Allow CC to be a program name with arguments.
1691 @@ -14085,7 +14812,7 @@
1692 postinstall_cmds='$RANLIB $lib'
1697 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
1698 test "$enable_shared" = yes && enable_static=no
1700 @@ -14350,10 +15077,10 @@
1702 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
1703 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
1704 -if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
1705 +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
1706 echo $ECHO_N "(cached) $ECHO_C" >&6
1708 - lt_prog_compiler_pic_works_F77=no
1709 + lt_cv_prog_compiler_pic_works_F77=no
1710 ac_outfile=conftest.$ac_objext
1711 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
1712 lt_compiler_flag="$lt_prog_compiler_pic_F77"
1713 @@ -14366,27 +15093,27 @@
1714 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1715 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1716 -e 's:$: $lt_compiler_flag:'`
1717 - (eval echo "\"\$as_me:14369: $lt_compile\"" >&5)
1718 + (eval echo "\"\$as_me:15096: $lt_compile\"" >&5)
1719 (eval "$lt_compile" 2>conftest.err)
1721 cat conftest.err >&5
1722 - echo "$as_me:14373: \$? = $ac_status" >&5
1723 + echo "$as_me:15100: \$? = $ac_status" >&5
1724 if (exit $ac_status) && test -s "$ac_outfile"; then
1725 # The compiler can only warn and ignore the option if not recognized
1726 # So say no if there are warnings other than the usual output.
1727 $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
1728 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1729 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
1730 - lt_prog_compiler_pic_works_F77=yes
1731 + lt_cv_prog_compiler_pic_works_F77=yes
1737 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
1738 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
1739 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
1740 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
1742 -if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
1743 +if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
1744 case $lt_prog_compiler_pic_F77 in
1746 *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
1747 @@ -14413,10 +15140,10 @@
1748 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
1749 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
1750 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
1751 -if test "${lt_prog_compiler_static_works_F77+set}" = set; then
1752 +if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
1753 echo $ECHO_N "(cached) $ECHO_C" >&6
1755 - lt_prog_compiler_static_works_F77=no
1756 + lt_cv_prog_compiler_static_works_F77=no
1757 save_LDFLAGS="$LDFLAGS"
1758 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
1759 echo "$lt_simple_link_test_code" > conftest.$ac_ext
1760 @@ -14429,20 +15156,20 @@
1761 $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
1762 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
1763 if diff conftest.exp conftest.er2 >/dev/null; then
1764 - lt_prog_compiler_static_works_F77=yes
1765 + lt_cv_prog_compiler_static_works_F77=yes
1768 - lt_prog_compiler_static_works_F77=yes
1769 + lt_cv_prog_compiler_static_works_F77=yes
1774 LDFLAGS="$save_LDFLAGS"
1777 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
1778 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
1779 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
1780 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
1782 -if test x"$lt_prog_compiler_static_works_F77" = xyes; then
1783 +if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
1786 lt_prog_compiler_static_F77=
1787 @@ -14470,11 +15197,11 @@
1788 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1789 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1790 -e 's:$: $lt_compiler_flag:'`
1791 - (eval echo "\"\$as_me:14473: $lt_compile\"" >&5)
1792 + (eval echo "\"\$as_me:15200: $lt_compile\"" >&5)
1793 (eval "$lt_compile" 2>out/conftest.err)
1795 cat out/conftest.err >&5
1796 - echo "$as_me:14477: \$? = $ac_status" >&5
1797 + echo "$as_me:15204: \$? = $ac_status" >&5
1798 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1800 # The compiler can only warn and ignore the option if not recognized
1801 @@ -14554,12 +15281,13 @@
1802 # it will be wrapped by ` (' and `)$', so one must not match beginning or
1803 # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
1804 # as well as any symbol that contains `d'.
1805 - exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
1806 + exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
1807 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
1808 # platforms (ab)use it in PIC code, but their linkers get confused if
1809 # the symbol is explicitly referenced. Since portable code cannot
1810 # rely on this symbol name, it's probably fine to never include it in
1811 # preloaded symbol tables.
1812 + # Exclude shared library initialization/finalization symbols.
1813 extract_expsyms_cmds=
1814 # Just being paranoid about ensuring that cc_basename is set.
1815 for cc_temp in $compiler""; do
1816 @@ -14618,7 +15346,7 @@
1818 # See if GNU ld supports shared libraries.
1820 - aix3* | aix4* | aix5*)
1822 # On AIX/PPC, the GNU linker is very broken
1823 if test "$host_cpu" != ia64; then
1825 @@ -14837,7 +15565,7 @@
1831 if test "$host_cpu" = ia64; then
1832 # On IA64, the linker does run time linking by default, so we don't
1833 # have to do anything special.
1834 @@ -14857,7 +15585,7 @@
1835 # Test if we are trying to use run time linking or normal
1836 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
1837 # need to do runtime linking.
1838 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
1839 + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
1840 for ld_flag in $LDFLAGS; do
1841 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
1842 aix_use_runtimelinking=yes
1843 @@ -15109,11 +15837,10 @@
1844 link_all_deplibs_F77=yes
1845 if test "$GCC" = yes ; then
1846 output_verbose_link_cmd='echo'
1847 - archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
1848 - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
1849 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
1850 - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1851 - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
1852 + archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
1853 + module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
1854 + archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
1855 + module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
1857 case $cc_basename in
1859 @@ -15582,7 +16309,7 @@
1860 soname_spec='${libname}${release}${shared_ext}$major'
1868 @@ -15749,7 +16476,14 @@
1872 - version_type=freebsd-$objformat
1873 + # Handle Gentoo/FreeBSD as it was Linux
1874 + case $host_vendor in
1876 + version_type=linux ;;
1878 + version_type=freebsd-$objformat ;;
1881 case $version_type in
1883 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
1884 @@ -15760,6 +16494,12 @@
1885 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
1889 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
1890 + soname_spec='${libname}${release}${shared_ext}$major'
1891 + need_lib_prefix=no
1895 shlibpath_var=LD_LIBRARY_PATH
1897 @@ -15906,13 +16646,11 @@
1898 # Some rework will be needed to allow for fast_install
1899 # before this can be enabled.
1900 hardcode_into_libs=yes
1901 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
1902 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
1904 # Append ld.so.conf contents to the search path
1905 if test -f /etc/ld.so.conf; then
1906 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
1907 - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
1908 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1911 # We used to test for /lib/ld.so.1 and disable shared libraries on
1912 @@ -16105,6 +16843,21 @@
1913 echo "${ECHO_T}$dynamic_linker" >&6; }
1914 test "$dynamic_linker" = no && can_build_shared=no
1916 +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
1917 + echo $ECHO_N "(cached) $ECHO_C" >&6
1919 + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
1922 +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
1923 +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
1924 + echo $ECHO_N "(cached) $ECHO_C" >&6
1926 + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
1929 +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
1931 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
1932 if test "$GCC" = yes; then
1933 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
1934 @@ -16188,6 +16941,7 @@
1937 compiler_lib_search_path_F77 \
1938 + compiler_lib_search_dirs_F77 \
1940 archive_expsym_cmds_F77 \
1941 postinstall_cmds_F77 \
1942 @@ -16436,6 +17190,10 @@
1944 postdeps=$lt_postdeps_F77
1946 +# The directories searched by this compiler when creating a shared
1948 +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
1950 # The library search path used internally by the compiler when linking
1952 compiler_lib_search_path=$lt_compiler_lib_search_path_F77
1953 @@ -16610,7 +17368,7 @@
1954 echo "$lt_simple_link_test_code" >conftest.$ac_ext
1955 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
1956 _lt_linker_boilerplate=`cat conftest.err`
1961 # Allow CC to be a program name with arguments.
1962 @@ -16659,11 +17417,11 @@
1963 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1964 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1965 -e 's:$: $lt_compiler_flag:'`
1966 - (eval echo "\"\$as_me:16662: $lt_compile\"" >&5)
1967 + (eval echo "\"\$as_me:17420: $lt_compile\"" >&5)
1968 (eval "$lt_compile" 2>conftest.err)
1970 cat conftest.err >&5
1971 - echo "$as_me:16666: \$? = $ac_status" >&5
1972 + echo "$as_me:17424: \$? = $ac_status" >&5
1973 if (exit $ac_status) && test -s "$ac_outfile"; then
1974 # The compiler can only warn and ignore the option if not recognized
1975 # So say no if there are warnings other than the usual output.
1976 @@ -16723,7 +17481,7 @@
1977 # built for inclusion in a dll (and should export symbols for example).
1978 # Although the cygwin gcc ignores -fPIC, still need this for old-style
1979 # (--disable-auto-import) libraries
1980 - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
1984 darwin* | rhapsody*)
1985 @@ -16793,7 +17551,7 @@
1986 mingw* | cygwin* | pw32* | os2*)
1987 # This hack is so that the source file can tell whether it is being
1988 # built for inclusion in a dll (and should export symbols for example).
1989 - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
1993 hpux9* | hpux10* | hpux11*)
1994 @@ -16933,10 +17691,10 @@
1996 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
1997 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
1998 -if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
1999 +if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
2000 echo $ECHO_N "(cached) $ECHO_C" >&6
2002 - lt_prog_compiler_pic_works_GCJ=no
2003 + lt_cv_prog_compiler_pic_works_GCJ=no
2004 ac_outfile=conftest.$ac_objext
2005 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
2006 lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
2007 @@ -16949,27 +17707,27 @@
2008 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2009 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2010 -e 's:$: $lt_compiler_flag:'`
2011 - (eval echo "\"\$as_me:16952: $lt_compile\"" >&5)
2012 + (eval echo "\"\$as_me:17710: $lt_compile\"" >&5)
2013 (eval "$lt_compile" 2>conftest.err)
2015 cat conftest.err >&5
2016 - echo "$as_me:16956: \$? = $ac_status" >&5
2017 + echo "$as_me:17714: \$? = $ac_status" >&5
2018 if (exit $ac_status) && test -s "$ac_outfile"; then
2019 # The compiler can only warn and ignore the option if not recognized
2020 # So say no if there are warnings other than the usual output.
2021 $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
2022 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
2023 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
2024 - lt_prog_compiler_pic_works_GCJ=yes
2025 + lt_cv_prog_compiler_pic_works_GCJ=yes
2031 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
2032 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
2033 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
2034 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
2036 -if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
2037 +if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
2038 case $lt_prog_compiler_pic_GCJ in
2040 *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
2041 @@ -16996,10 +17754,10 @@
2042 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
2043 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
2044 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
2045 -if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
2046 +if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
2047 echo $ECHO_N "(cached) $ECHO_C" >&6
2049 - lt_prog_compiler_static_works_GCJ=no
2050 + lt_cv_prog_compiler_static_works_GCJ=no
2051 save_LDFLAGS="$LDFLAGS"
2052 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
2053 echo "$lt_simple_link_test_code" > conftest.$ac_ext
2054 @@ -17012,20 +17770,20 @@
2055 $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
2056 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
2057 if diff conftest.exp conftest.er2 >/dev/null; then
2058 - lt_prog_compiler_static_works_GCJ=yes
2059 + lt_cv_prog_compiler_static_works_GCJ=yes
2062 - lt_prog_compiler_static_works_GCJ=yes
2063 + lt_cv_prog_compiler_static_works_GCJ=yes
2068 LDFLAGS="$save_LDFLAGS"
2071 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
2072 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
2073 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
2074 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
2076 -if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
2077 +if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
2080 lt_prog_compiler_static_GCJ=
2081 @@ -17053,11 +17811,11 @@
2082 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2083 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2084 -e 's:$: $lt_compiler_flag:'`
2085 - (eval echo "\"\$as_me:17056: $lt_compile\"" >&5)
2086 + (eval echo "\"\$as_me:17814: $lt_compile\"" >&5)
2087 (eval "$lt_compile" 2>out/conftest.err)
2089 cat out/conftest.err >&5
2090 - echo "$as_me:17060: \$? = $ac_status" >&5
2091 + echo "$as_me:17818: \$? = $ac_status" >&5
2092 if (exit $ac_status) && test -s out/conftest2.$ac_objext
2094 # The compiler can only warn and ignore the option if not recognized
2095 @@ -17137,12 +17895,13 @@
2096 # it will be wrapped by ` (' and `)$', so one must not match beginning or
2097 # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
2098 # as well as any symbol that contains `d'.
2099 - exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
2100 + exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
2101 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
2102 # platforms (ab)use it in PIC code, but their linkers get confused if
2103 # the symbol is explicitly referenced. Since portable code cannot
2104 # rely on this symbol name, it's probably fine to never include it in
2105 # preloaded symbol tables.
2106 + # Exclude shared library initialization/finalization symbols.
2107 extract_expsyms_cmds=
2108 # Just being paranoid about ensuring that cc_basename is set.
2109 for cc_temp in $compiler""; do
2110 @@ -17201,7 +17960,7 @@
2112 # See if GNU ld supports shared libraries.
2114 - aix3* | aix4* | aix5*)
2116 # On AIX/PPC, the GNU linker is very broken
2117 if test "$host_cpu" != ia64; then
2119 @@ -17420,7 +18179,7 @@
2125 if test "$host_cpu" = ia64; then
2126 # On IA64, the linker does run time linking by default, so we don't
2127 # have to do anything special.
2128 @@ -17440,7 +18199,7 @@
2129 # Test if we are trying to use run time linking or normal
2130 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
2131 # need to do runtime linking.
2132 - case $host_os in aix4.[23]|aix4.[23].*|aix5*)
2133 + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
2134 for ld_flag in $LDFLAGS; do
2135 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
2136 aix_use_runtimelinking=yes
2137 @@ -17712,11 +18471,10 @@
2138 link_all_deplibs_GCJ=yes
2139 if test "$GCC" = yes ; then
2140 output_verbose_link_cmd='echo'
2141 - archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2142 - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
2143 - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
2144 - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2145 - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2146 + archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
2147 + module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
2148 + archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
2149 + module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
2151 case $cc_basename in
2153 @@ -18185,7 +18943,7 @@
2154 soname_spec='${libname}${release}${shared_ext}$major'
2162 @@ -18352,7 +19110,14 @@
2166 - version_type=freebsd-$objformat
2167 + # Handle Gentoo/FreeBSD as it was Linux
2168 + case $host_vendor in
2170 + version_type=linux ;;
2172 + version_type=freebsd-$objformat ;;
2175 case $version_type in
2177 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
2178 @@ -18363,6 +19128,12 @@
2179 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
2183 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2184 + soname_spec='${libname}${release}${shared_ext}$major'
2185 + need_lib_prefix=no
2189 shlibpath_var=LD_LIBRARY_PATH
2191 @@ -18509,13 +19280,11 @@
2192 # Some rework will be needed to allow for fast_install
2193 # before this can be enabled.
2194 hardcode_into_libs=yes
2195 - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
2196 - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
2198 # Append ld.so.conf contents to the search path
2199 if test -f /etc/ld.so.conf; then
2200 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
2201 - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
2202 + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
2205 # We used to test for /lib/ld.so.1 and disable shared libraries on
2206 @@ -18708,6 +19477,21 @@
2207 echo "${ECHO_T}$dynamic_linker" >&6; }
2208 test "$dynamic_linker" = no && can_build_shared=no
2210 +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
2211 + echo $ECHO_N "(cached) $ECHO_C" >&6
2213 + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
2216 +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
2217 +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
2218 + echo $ECHO_N "(cached) $ECHO_C" >&6
2220 + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
2223 +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
2225 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
2226 if test "$GCC" = yes; then
2227 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
2228 @@ -18791,6 +19575,7 @@
2231 compiler_lib_search_path_GCJ \
2232 + compiler_lib_search_dirs_GCJ \
2234 archive_expsym_cmds_GCJ \
2235 postinstall_cmds_GCJ \
2236 @@ -19039,6 +19824,10 @@
2238 postdeps=$lt_postdeps_GCJ
2240 +# The directories searched by this compiler when creating a shared
2242 +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
2244 # The library search path used internally by the compiler when linking
2246 compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
2247 @@ -19212,7 +20001,7 @@
2248 echo "$lt_simple_link_test_code" >conftest.$ac_ext
2249 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
2250 _lt_linker_boilerplate=`cat conftest.err`
2255 # Allow CC to be a program name with arguments.
2256 @@ -19272,6 +20061,7 @@
2259 compiler_lib_search_path_RC \
2260 + compiler_lib_search_dirs_RC \
2262 archive_expsym_cmds_RC \
2263 postinstall_cmds_RC \
2264 @@ -19520,6 +20310,10 @@
2266 postdeps=$lt_postdeps_RC
2268 +# The directories searched by this compiler when creating a shared
2270 +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
2272 # The library search path used internally by the compiler when linking
2274 compiler_lib_search_path=$lt_compiler_lib_search_path_RC
2275 @@ -23659,11 +24453,11 @@
2276 CCASDEPMODE!$CCASDEPMODE$ac_delim
2277 am__fastdepCCAS_TRUE!$am__fastdepCCAS_TRUE$ac_delim
2278 am__fastdepCCAS_FALSE!$am__fastdepCCAS_FALSE$ac_delim
2279 +LIBFFI_DLL!$LIBFFI_DLL$ac_delim
2280 +LIBFFI_LDFLAGS!$LIBFFI_LDFLAGS$ac_delim
2283 EGREP!$EGREP$ac_delim
2284 -LN_S!$LN_S$ac_delim
2285 -ECHO!$ECHO$ac_delim
2288 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
2289 @@ -23705,8 +24499,15 @@
2291 for ac_last_try in false false false false false :; do
2292 cat >conf$$subs.sed <<_ACEOF
2293 +LN_S!$LN_S$ac_delim
2294 +ECHO!$ECHO$ac_delim
2296 RANLIB!$RANLIB$ac_delim
2297 +DSYMUTIL!$DSYMUTIL$ac_delim
2298 +NMEDIT!$NMEDIT$ac_delim
2299 +DLLTOOL!$DLLTOOL$ac_delim
2301 +OBJDUMP!$OBJDUMP$ac_delim
2304 CXXFLAGS!$CXXFLAGS$ac_delim
2305 @@ -23783,7 +24584,7 @@
2306 LTLIBOBJS!$LTLIBOBJS$ac_delim
2309 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
2310 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
2312 elif $ac_last_try; then
2313 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
2314 @@ -24184,21 +24985,22 @@
2317 # Compute $ac_file's index in $config_headers.
2320 for _am_header in $config_headers :; do
2322 - $ac_file | $ac_file:* )
2323 + $_am_arg | $_am_arg:* )
2326 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
2329 -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
2330 -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2331 - X$ac_file : 'X\(//\)[^/]' \| \
2332 - X$ac_file : 'X\(//\)$' \| \
2333 - X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
2335 +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
2336 +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2337 + X"$_am_arg" : 'X\(//\)[^/]' \| \
2338 + X"$_am_arg" : 'X\(//\)$' \| \
2339 + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
2341 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
2344 @@ -24261,7 +25063,7 @@
2345 # each Makefile.in and add a new line on top of each file to say so.
2346 # Grep'ing the whole file is not good either: AIX grep has a line
2347 # limit of 2048, but all sed's we know have understand at least 4000.
2348 - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
2349 + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
2350 dirpart=`$as_dirname -- "$mf" ||
2351 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2352 X"$mf" : 'X\(//\)[^/]' \| \
2353 diff -Nur libffi-3.0.6/ltmain.sh build/ltmain.sh
2354 --- libffi-3.0.6/ltmain.sh 2008-01-29 12:28:14.000000000 +0000
2355 +++ build/ltmain.sh 2009-01-23 17:56:34.000000000 +0000
2357 # NOTE: Changing this file will not affect anything until you rerun configure.
2359 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
2360 -# 2007 Free Software Foundation, Inc.
2361 +# 2007, 2008 Free Software Foundation, Inc.
2362 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
2364 # This program is free software; you can redistribute it and/or modify
2370 -TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
2372 +TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
2374 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
2375 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
2376 @@ -113,15 +113,21 @@
2377 # These must not be set unconditionally because not all systems understand
2378 # e.g. LANG=C (notably SCO).
2379 # We save the old values to restore during execute mode.
2380 -for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
2382 +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
2384 eval "if test \"\${$lt_var+set}\" = set; then
2385 save_$lt_var=\$$lt_var
2386 + lt_env=\"$lt_var=\$$lt_var \$lt_env\"
2392 +if test -n "$lt_env"; then
2393 + lt_env="env $lt_env"
2396 # Make sure IFS has a sensible default
2399 @@ -275,7 +281,21 @@
2401 CC_quoted="$CC_quoted $arg"
2403 + # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
2404 + trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
2405 + # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
2406 + extendcc=${host}-${CC}
2407 + # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc
2408 + # (Gentoo-specific hack because we always export $CHOST)
2409 + mungedcc=${CHOST-${host}}-${trimedcc}
2411 + "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
2412 + "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
2415 + "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
2416 + "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
2417 + "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
2418 " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
2419 # The compiler in the base compile command matches
2420 # the one in the tagged configuration.
2423 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
2425 -Copyright (C) 2007 Free Software Foundation, Inc.
2426 +Copyright (C) 2008 Free Software Foundation, Inc.
2427 This is free software; see the source for copying conditions. There is NO
2428 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
2432 *.java) xform=java ;;
2437 libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
2439 # Lock this critical section if it is needed
2440 # We use this script file to make the link, it avoids creating a new file
2441 if test "$need_locks" = yes; then
2442 - until $run ln "$progpath" "$lockfile" 2>/dev/null; do
2443 + until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
2444 $show "Waiting for $lockfile to be removed"
2448 $run $rm "$lobj" "$output_obj"
2451 - if $run eval "$command"; then :
2452 + if $run eval $lt_env "$command"; then :
2454 test -n "$output_obj" && $run $rm $removelist
2456 @@ -1028,7 +1049,7 @@
2457 command="$command$suppress_output"
2458 $run $rm "$obj" "$output_obj"
2460 - if $run eval "$command"; then :
2461 + if $run eval $lt_env "$command"; then :
2463 $run $rm $removelist
2465 @@ -1161,6 +1182,7 @@
2469 + single_module="${wl}-single_module"
2471 func_infer_tag $base_compile
2473 @@ -1646,6 +1668,11 @@
2478 + single_module="${wl}-multi_module"
2485 @@ -2149,7 +2176,12 @@
2488 name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
2489 - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
2490 + if test "$linkmode" = lib; then
2491 + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
2493 + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
2495 + for searchdir in $searchdirs; do
2496 for search_ext in .la $std_shrext .so .a; do
2497 # Search the libtool library
2498 lib="$searchdir/lib${name}${search_ext}"
2499 @@ -2945,12 +2977,18 @@
2500 # we do not want to link against static libs,
2501 # but need to link against shared
2502 eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
2503 + eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
2504 if test -n "$deplibrary_names" ; then
2505 for tmp in $deplibrary_names ; do
2508 - if test -f "$path/$depdepl" ; then
2509 + if test -f "$deplibdir/$depdepl" ; then
2510 + depdepl="$deplibdir/$depdepl"
2511 + elif test -f "$path/$depdepl" ; then
2512 depdepl="$path/$depdepl"
2514 + # Can't find it, oh well...
2517 # do not add paths which are already there
2518 case " $newlib_search_path " in
2519 @@ -3098,9 +3136,10 @@
2523 - if test -n "$deplibs"; then
2524 - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
2526 + case " $deplibs" in
2528 + $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
2531 if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
2532 $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
2533 @@ -4237,9 +4276,10 @@
2537 - if test -n "$deplibs"; then
2538 - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
2540 + case " $deplibs" in
2542 + $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
2545 if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
2546 $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
2547 @@ -5442,6 +5482,11 @@
2549 if test \"\$libtool_execute_magic\" != \"$magic\"; then
2550 # Run the actual program with our arguments.
2552 + # Make sure env LD_LIBRARY_PATH does not mess us up
2553 + if test -n \"\${LD_LIBRARY_PATH+set}\"; then
2554 + export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
2558 # Backslashes separate directories on plain windows
2559 @@ -6478,7 +6523,7 @@
2562 # Restore saved environment variables
2563 - for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
2564 + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
2566 eval "if test \"\${save_$lt_var+set}\" = set; then
2567 $lt_var=\$save_$lt_var; export $lt_var