diff options
author | <totakura@in.tum.de> | 2013-01-04 12:13:59 +0000 |
---|---|---|
committer | <totakura@in.tum.de> | 2013-01-04 12:13:59 +0000 |
commit | 3876564302e541a09cebd6dc6eb8a228cfeeddde (patch) | |
tree | 7f37e0c78282cbfc7f47d512748bb522a1a28152 | |
parent | 7a1ccb2be146ffe984163c6a3d6043552dc89954 (diff) | |
download | gnunet-ext-3876564302e541a09cebd6dc6eb8a228cfeeddde.tar.gz gnunet-ext-3876564302e541a09cebd6dc6eb8a228cfeeddde.zip |
follow autoconf naming convention for variables.
See: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Preset-Output-Variables.html#Preset-Output-Variables
-rw-r--r-- | configure.ac | 19 | ||||
-rw-r--r-- | m4/libtool.m4 | 2234 | ||||
-rw-r--r-- | m4/ltoptions.m4 | 32 | ||||
-rw-r--r-- | m4/ltversion.m4 | 12 | ||||
-rw-r--r-- | m4/lt~obsolete.m4 | 12 | ||||
-rw-r--r-- | src/ext/Makefile.am | 21 |
6 files changed, 853 insertions, 1477 deletions
diff --git a/configure.ac b/configure.ac index ee6024a..016e244 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -119,12 +119,10 @@ AC_CHECK_HEADERS([errno.h stdio.h unistd.h locale.h sys/stat.h sys/types.h langi | |||
119 | # test for GNUnet core | 119 | # test for GNUnet core |
120 | gnunet=0 | 120 | gnunet=0 |
121 | lookin=${prefix} | 121 | lookin=${prefix} |
122 | backup_LIBS="$LIBS" | 122 | backup_LDFLAGS="$LDFLAGS" |
123 | backup_CFLAGS="$CFLAGS " | ||
124 | backup_CPPFLAGS="$CPPFLAGS" | 123 | backup_CPPFLAGS="$CPPFLAGS" |
125 | GNUNET_CFLAGS="" | 124 | GNUNET_LDFLAGS="" |
126 | GNUNET_CPPFLAGS="" | 125 | GNUNET_CPPFLAGS="" |
127 | GNUNET_LIBS="" | ||
128 | AC_MSG_CHECKING(for GNUnet core) | 126 | AC_MSG_CHECKING(for GNUnet core) |
129 | AC_ARG_WITH(gnunet, | 127 | AC_ARG_WITH(gnunet, |
130 | [ --with-gnunet=PFX Base of GNUnet installation], | 128 | [ --with-gnunet=PFX Base of GNUnet installation], |
@@ -150,11 +148,9 @@ AC_ARG_WITH(gnunet, | |||
150 | if test "x$gnunet" == "x0" -a ! "x$lookin" == "x" | 148 | if test "x$gnunet" == "x0" -a ! "x$lookin" == "x" |
151 | then | 149 | then |
152 | AC_MSG_CHECKING(for GNUnet util library in $lookin) | 150 | AC_MSG_CHECKING(for GNUnet util library in $lookin) |
153 | GNUNET_LIBS="-L${lookin}/lib" | 151 | GNUNET_LDFLAGS="-L${lookin}/lib" |
154 | GNUNET_CFLAGS="-I${lookin}/include" | ||
155 | GNUNET_CPPFLAGS="-I${lookin}/include" | 152 | GNUNET_CPPFLAGS="-I${lookin}/include" |
156 | LIBS="$GNUNET_LIBS $backup_LIBS" | 153 | LDFLAGS="$GNUNET_LDFLAGS $backup_LDFLAGS" |
157 | CFLAGS="$GNUNET_CFLAGS $backup_CFLAGS" | ||
158 | CPPFLAGS="$GNUNET_CPPFLAGS $backup_CPPFLAGS" | 154 | CPPFLAGS="$GNUNET_CPPFLAGS $backup_CPPFLAGS" |
159 | AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h], | 155 | AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h], |
160 | AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_], | 156 | AC_CHECK_LIB([gnunetutil], [GNUNET_xfree_], |
@@ -171,10 +167,9 @@ then | |||
171 | AC_MSG_ERROR([gnunet-ext requires GNUnet]) | 167 | AC_MSG_ERROR([gnunet-ext requires GNUnet]) |
172 | fi | 168 | fi |
173 | 169 | ||
174 | AC_SUBST(GNUNET_CFLAGS) | 170 | AC_SUBST(GNUNET_CPPFLAGS) |
175 | AC_SUBST(GNUNET_LIBS) | 171 | AC_SUBST(GNUNET_LDFLAGS) |
176 | LIBS="$backup_LIBS" | 172 | LDFLAGS="$backup_LDFLAGS" |
177 | CFLAGS="$backup_CFLAGS" | ||
178 | CPPFLAGS="$backup_CPPFLAGS" | 173 | CPPFLAGS="$backup_CPPFLAGS" |
179 | 174 | ||
180 | AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing read-only architecture-independent data]) | 175 | AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory for installing read-only architecture-independent data]) |
diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 534d1cc..a3fee53 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 | |||
@@ -1,8 +1,7 @@ | |||
1 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | 1 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
2 | # | 2 | # |
3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 3 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
4 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software | 4 | # 2006, 2007, 2008 Free Software Foundation, Inc. |
5 | # Foundation, Inc. | ||
6 | # Written by Gordon Matzigkeit, 1996 | 5 | # Written by Gordon Matzigkeit, 1996 |
7 | # | 6 | # |
8 | # This file is free software; the Free Software Foundation gives | 7 | # This file is free software; the Free Software Foundation gives |
@@ -11,8 +10,7 @@ | |||
11 | 10 | ||
12 | m4_define([_LT_COPYING], [dnl | 11 | m4_define([_LT_COPYING], [dnl |
13 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, | 12 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
14 | # 2006, 2007, 2008, 2009, 2010, 2011 Free Software | 13 | # 2006, 2007, 2008 Free Software Foundation, Inc. |
15 | # Foundation, Inc. | ||
16 | # Written by Gordon Matzigkeit, 1996 | 14 | # Written by Gordon Matzigkeit, 1996 |
17 | # | 15 | # |
18 | # This file is part of GNU Libtool. | 16 | # This file is part of GNU Libtool. |
@@ -39,7 +37,7 @@ m4_define([_LT_COPYING], [dnl | |||
39 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 37 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
40 | ]) | 38 | ]) |
41 | 39 | ||
42 | # serial 57 LT_INIT | 40 | # serial 56 LT_INIT |
43 | 41 | ||
44 | 42 | ||
45 | # LT_PREREQ(VERSION) | 43 | # LT_PREREQ(VERSION) |
@@ -68,7 +66,6 @@ esac | |||
68 | # ------------------ | 66 | # ------------------ |
69 | AC_DEFUN([LT_INIT], | 67 | AC_DEFUN([LT_INIT], |
70 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT | 68 | [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT |
71 | AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl | ||
72 | AC_BEFORE([$0], [LT_LANG])dnl | 69 | AC_BEFORE([$0], [LT_LANG])dnl |
73 | AC_BEFORE([$0], [LT_OUTPUT])dnl | 70 | AC_BEFORE([$0], [LT_OUTPUT])dnl |
74 | AC_BEFORE([$0], [LTDL_INIT])dnl | 71 | AC_BEFORE([$0], [LTDL_INIT])dnl |
@@ -85,8 +82,6 @@ AC_REQUIRE([LTVERSION_VERSION])dnl | |||
85 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl | 82 | AC_REQUIRE([LTOBSOLETE_VERSION])dnl |
86 | m4_require([_LT_PROG_LTMAIN])dnl | 83 | m4_require([_LT_PROG_LTMAIN])dnl |
87 | 84 | ||
88 | _LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) | ||
89 | |||
90 | dnl Parse OPTIONS | 85 | dnl Parse OPTIONS |
91 | _LT_SET_OPTIONS([$0], [$1]) | 86 | _LT_SET_OPTIONS([$0], [$1]) |
92 | 87 | ||
@@ -123,7 +118,7 @@ m4_defun([_LT_CC_BASENAME], | |||
123 | *) break;; | 118 | *) break;; |
124 | esac | 119 | esac |
125 | done | 120 | done |
126 | cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` | 121 | cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
127 | ]) | 122 | ]) |
128 | 123 | ||
129 | 124 | ||
@@ -143,11 +138,6 @@ m4_defun([_LT_FILEUTILS_DEFAULTS], | |||
143 | m4_defun([_LT_SETUP], | 138 | m4_defun([_LT_SETUP], |
144 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 139 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
145 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl | 140 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
146 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl | ||
147 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl | ||
148 | |||
149 | _LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl | ||
150 | dnl | ||
151 | _LT_DECL([], [host_alias], [0], [The host system])dnl | 141 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
152 | _LT_DECL([], [host], [0])dnl | 142 | _LT_DECL([], [host], [0])dnl |
153 | _LT_DECL([], [host_os], [0])dnl | 143 | _LT_DECL([], [host_os], [0])dnl |
@@ -170,13 +160,10 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl | |||
170 | dnl | 160 | dnl |
171 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 161 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
172 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | 162 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl |
173 | m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl | ||
174 | m4_require([_LT_CMD_RELOAD])dnl | 163 | m4_require([_LT_CMD_RELOAD])dnl |
175 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl | 164 | m4_require([_LT_CHECK_MAGIC_METHOD])dnl |
176 | m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl | ||
177 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl | 165 | m4_require([_LT_CMD_OLD_ARCHIVE])dnl |
178 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl | 166 | m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl |
179 | m4_require([_LT_WITH_SYSROOT])dnl | ||
180 | 167 | ||
181 | _LT_CONFIG_LIBTOOL_INIT([ | 168 | _LT_CONFIG_LIBTOOL_INIT([ |
182 | # See if we are running on zsh, and set the options which allow our | 169 | # See if we are running on zsh, and set the options which allow our |
@@ -192,6 +179,7 @@ fi | |||
192 | _LT_CHECK_OBJDIR | 179 | _LT_CHECK_OBJDIR |
193 | 180 | ||
194 | m4_require([_LT_TAG_COMPILER])dnl | 181 | m4_require([_LT_TAG_COMPILER])dnl |
182 | _LT_PROG_ECHO_BACKSLASH | ||
195 | 183 | ||
196 | case $host_os in | 184 | case $host_os in |
197 | aix3*) | 185 | aix3*) |
@@ -205,6 +193,23 @@ aix3*) | |||
205 | ;; | 193 | ;; |
206 | esac | 194 | esac |
207 | 195 | ||
196 | # Sed substitution that helps us do robust quoting. It backslashifies | ||
197 | # metacharacters that are still active within double-quoted strings. | ||
198 | sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' | ||
199 | |||
200 | # Same as above, but do not quote variable references. | ||
201 | double_quote_subst='s/\([["`\\]]\)/\\\1/g' | ||
202 | |||
203 | # Sed substitution to delay expansion of an escaped shell variable in a | ||
204 | # double_quote_subst'ed string. | ||
205 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' | ||
206 | |||
207 | # Sed substitution to delay expansion of an escaped single quote. | ||
208 | delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' | ||
209 | |||
210 | # Sed substitution to avoid accidental globbing in evaled expressions | ||
211 | no_glob_subst='s/\*/\\\*/g' | ||
212 | |||
208 | # Global variables: | 213 | # Global variables: |
209 | ofile=libtool | 214 | ofile=libtool |
210 | can_build_shared=yes | 215 | can_build_shared=yes |
@@ -245,28 +250,6 @@ _LT_CONFIG_COMMANDS | |||
245 | ])# _LT_SETUP | 250 | ])# _LT_SETUP |
246 | 251 | ||
247 | 252 | ||
248 | # _LT_PREPARE_SED_QUOTE_VARS | ||
249 | # -------------------------- | ||
250 | # Define a few sed substitution that help us do robust quoting. | ||
251 | m4_defun([_LT_PREPARE_SED_QUOTE_VARS], | ||
252 | [# Backslashify metacharacters that are still active within | ||
253 | # double-quoted strings. | ||
254 | sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' | ||
255 | |||
256 | # Same as above, but do not quote variable references. | ||
257 | double_quote_subst='s/\([["`\\]]\)/\\\1/g' | ||
258 | |||
259 | # Sed substitution to delay expansion of an escaped shell variable in a | ||
260 | # double_quote_subst'ed string. | ||
261 | delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' | ||
262 | |||
263 | # Sed substitution to delay expansion of an escaped single quote. | ||
264 | delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' | ||
265 | |||
266 | # Sed substitution to avoid accidental globbing in evaled expressions | ||
267 | no_glob_subst='s/\*/\\\*/g' | ||
268 | ]) | ||
269 | |||
270 | # _LT_PROG_LTMAIN | 253 | # _LT_PROG_LTMAIN |
271 | # --------------- | 254 | # --------------- |
272 | # Note that this code is called both from `configure', and `config.status' | 255 | # Note that this code is called both from `configure', and `config.status' |
@@ -425,7 +408,7 @@ m4_define([_lt_decl_all_varnames], | |||
425 | # declaration there will have the same value as in `configure'. VARNAME | 408 | # declaration there will have the same value as in `configure'. VARNAME |
426 | # must have a single quote delimited value for this to work. | 409 | # must have a single quote delimited value for this to work. |
427 | m4_define([_LT_CONFIG_STATUS_DECLARE], | 410 | m4_define([_LT_CONFIG_STATUS_DECLARE], |
428 | [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) | 411 | [$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) |
429 | 412 | ||
430 | 413 | ||
431 | # _LT_CONFIG_STATUS_DECLARATIONS | 414 | # _LT_CONFIG_STATUS_DECLARATIONS |
@@ -435,7 +418,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE], | |||
435 | # embedded single quotes properly. In configure, this macro expands | 418 | # embedded single quotes properly. In configure, this macro expands |
436 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: | 419 | # each variable declared with _LT_DECL (and _LT_TAGDECL) into: |
437 | # | 420 | # |
438 | # <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' | 421 | # <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' |
439 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], | 422 | m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], |
440 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), | 423 | [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), |
441 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) | 424 | [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) |
@@ -534,20 +517,12 @@ LTCC='$LTCC' | |||
534 | LTCFLAGS='$LTCFLAGS' | 517 | LTCFLAGS='$LTCFLAGS' |
535 | compiler='$compiler_DEFAULT' | 518 | compiler='$compiler_DEFAULT' |
536 | 519 | ||
537 | # A function that is used when there is no print builtin or printf. | ||
538 | func_fallback_echo () | ||
539 | { | ||
540 | eval 'cat <<_LTECHO_EOF | ||
541 | \$[]1 | ||
542 | _LTECHO_EOF' | ||
543 | } | ||
544 | |||
545 | # Quote evaled strings. | 520 | # Quote evaled strings. |
546 | for var in lt_decl_all_varnames([[ \ | 521 | for var in lt_decl_all_varnames([[ \ |
547 | ]], lt_decl_quote_varnames); do | 522 | ]], lt_decl_quote_varnames); do |
548 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | 523 | case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
549 | *[[\\\\\\\`\\"\\\$]]*) | 524 | *[[\\\\\\\`\\"\\\$]]*) |
550 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" | 525 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" |
551 | ;; | 526 | ;; |
552 | *) | 527 | *) |
553 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 528 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
@@ -558,9 +533,9 @@ done | |||
558 | # Double-quote double-evaled strings. | 533 | # Double-quote double-evaled strings. |
559 | for var in lt_decl_all_varnames([[ \ | 534 | for var in lt_decl_all_varnames([[ \ |
560 | ]], lt_decl_dquote_varnames); do | 535 | ]], lt_decl_dquote_varnames); do |
561 | case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in | 536 | case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in |
562 | *[[\\\\\\\`\\"\\\$]]*) | 537 | *[[\\\\\\\`\\"\\\$]]*) |
563 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" | 538 | eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" |
564 | ;; | 539 | ;; |
565 | *) | 540 | *) |
566 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" | 541 | eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" |
@@ -568,38 +543,16 @@ for var in lt_decl_all_varnames([[ \ | |||
568 | esac | 543 | esac |
569 | done | 544 | done |
570 | 545 | ||
546 | # Fix-up fallback echo if it was mangled by the above quoting rules. | ||
547 | case \$lt_ECHO in | ||
548 | *'\\\[$]0 --fallback-echo"')dnl " | ||
549 | lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` | ||
550 | ;; | ||
551 | esac | ||
552 | |||
571 | _LT_OUTPUT_LIBTOOL_INIT | 553 | _LT_OUTPUT_LIBTOOL_INIT |
572 | ]) | 554 | ]) |
573 | 555 | ||
574 | # _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) | ||
575 | # ------------------------------------ | ||
576 | # Generate a child script FILE with all initialization necessary to | ||
577 | # reuse the environment learned by the parent script, and make the | ||
578 | # file executable. If COMMENT is supplied, it is inserted after the | ||
579 | # `#!' sequence but before initialization text begins. After this | ||
580 | # macro, additional text can be appended to FILE to form the body of | ||
581 | # the child script. The macro ends with non-zero status if the | ||
582 | # file could not be fully written (such as if the disk is full). | ||
583 | m4_ifdef([AS_INIT_GENERATED], | ||
584 | [m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], | ||
585 | [m4_defun([_LT_GENERATED_FILE_INIT], | ||
586 | [m4_require([AS_PREPARE])]dnl | ||
587 | [m4_pushdef([AS_MESSAGE_LOG_FD])]dnl | ||
588 | [lt_write_fail=0 | ||
589 | cat >$1 <<_ASEOF || lt_write_fail=1 | ||
590 | #! $SHELL | ||
591 | # Generated by $as_me. | ||
592 | $2 | ||
593 | SHELL=\${CONFIG_SHELL-$SHELL} | ||
594 | export SHELL | ||
595 | _ASEOF | ||
596 | cat >>$1 <<\_ASEOF || lt_write_fail=1 | ||
597 | AS_SHELL_SANITIZE | ||
598 | _AS_PREPARE | ||
599 | exec AS_MESSAGE_FD>&1 | ||
600 | _ASEOF | ||
601 | test $lt_write_fail = 0 && chmod +x $1[]dnl | ||
602 | m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT | ||
603 | 556 | ||
604 | # LT_OUTPUT | 557 | # LT_OUTPUT |
605 | # --------- | 558 | # --------- |
@@ -609,11 +562,20 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT | |||
609 | AC_DEFUN([LT_OUTPUT], | 562 | AC_DEFUN([LT_OUTPUT], |
610 | [: ${CONFIG_LT=./config.lt} | 563 | [: ${CONFIG_LT=./config.lt} |
611 | AC_MSG_NOTICE([creating $CONFIG_LT]) | 564 | AC_MSG_NOTICE([creating $CONFIG_LT]) |
612 | _LT_GENERATED_FILE_INIT(["$CONFIG_LT"], | 565 | cat >"$CONFIG_LT" <<_LTEOF |
613 | [# Run this file to recreate a libtool stub with the current configuration.]) | 566 | #! $SHELL |
567 | # Generated by $as_me. | ||
568 | # Run this file to recreate a libtool stub with the current configuration. | ||
614 | 569 | ||
615 | cat >>"$CONFIG_LT" <<\_LTEOF | ||
616 | lt_cl_silent=false | 570 | lt_cl_silent=false |
571 | SHELL=\${CONFIG_SHELL-$SHELL} | ||
572 | _LTEOF | ||
573 | |||
574 | cat >>"$CONFIG_LT" <<\_LTEOF | ||
575 | AS_SHELL_SANITIZE | ||
576 | _AS_PREPARE | ||
577 | |||
578 | exec AS_MESSAGE_FD>&1 | ||
617 | exec AS_MESSAGE_LOG_FD>>config.log | 579 | exec AS_MESSAGE_LOG_FD>>config.log |
618 | { | 580 | { |
619 | echo | 581 | echo |
@@ -639,7 +601,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl | |||
639 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) | 601 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
640 | configured by $[0], generated by m4_PACKAGE_STRING. | 602 | configured by $[0], generated by m4_PACKAGE_STRING. |
641 | 603 | ||
642 | Copyright (C) 2011 Free Software Foundation, Inc. | 604 | Copyright (C) 2008 Free Software Foundation, Inc. |
643 | This config.lt script is free software; the Free Software Foundation | 605 | This config.lt script is free software; the Free Software Foundation |
644 | gives unlimited permision to copy, distribute and modify it." | 606 | gives unlimited permision to copy, distribute and modify it." |
645 | 607 | ||
@@ -684,13 +646,15 @@ chmod +x "$CONFIG_LT" | |||
684 | # appending to config.log, which fails on DOS, as config.log is still kept | 646 | # appending to config.log, which fails on DOS, as config.log is still kept |
685 | # open by configure. Here we exec the FD to /dev/null, effectively closing | 647 | # open by configure. Here we exec the FD to /dev/null, effectively closing |
686 | # config.log, so it can be properly (re)opened and appended to by config.lt. | 648 | # config.log, so it can be properly (re)opened and appended to by config.lt. |
687 | lt_cl_success=: | 649 | if test "$no_create" != yes; then |
688 | test "$silent" = yes && | 650 | lt_cl_success=: |
689 | lt_config_lt_args="$lt_config_lt_args --quiet" | 651 | test "$silent" = yes && |
690 | exec AS_MESSAGE_LOG_FD>/dev/null | 652 | lt_config_lt_args="$lt_config_lt_args --quiet" |
691 | $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false | 653 | exec AS_MESSAGE_LOG_FD>/dev/null |
692 | exec AS_MESSAGE_LOG_FD>>config.log | 654 | $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false |
693 | $lt_cl_success || AS_EXIT(1) | 655 | exec AS_MESSAGE_LOG_FD>>config.log |
656 | $lt_cl_success || AS_EXIT(1) | ||
657 | fi | ||
694 | ])# LT_OUTPUT | 658 | ])# LT_OUTPUT |
695 | 659 | ||
696 | 660 | ||
@@ -753,12 +717,15 @@ _LT_EOF | |||
753 | # if finds mixed CR/LF and LF-only lines. Since sed operates in | 717 | # if finds mixed CR/LF and LF-only lines. Since sed operates in |
754 | # text mode, it properly converts lines to CR/LF. This bash problem | 718 | # text mode, it properly converts lines to CR/LF. This bash problem |
755 | # is reportedly fixed, but why not run on old versions too? | 719 | # is reportedly fixed, but why not run on old versions too? |
756 | sed '$q' "$ltmain" >> "$cfgfile" \ | 720 | sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ |
757 | || (rm -f "$cfgfile"; exit 1) | 721 | || (rm -f "$cfgfile"; exit 1) |
722 | |||
723 | _LT_PROG_XSI_SHELLFNS | ||
758 | 724 | ||
759 | _LT_PROG_REPLACE_SHELLFNS | 725 | sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ |
726 | || (rm -f "$cfgfile"; exit 1) | ||
760 | 727 | ||
761 | mv -f "$cfgfile" "$ofile" || | 728 | mv -f "$cfgfile" "$ofile" || |
762 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") | 729 | (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") |
763 | chmod +x "$ofile" | 730 | chmod +x "$ofile" |
764 | ], | 731 | ], |
@@ -803,7 +770,6 @@ AC_DEFUN([LT_LANG], | |||
803 | m4_case([$1], | 770 | m4_case([$1], |
804 | [C], [_LT_LANG(C)], | 771 | [C], [_LT_LANG(C)], |
805 | [C++], [_LT_LANG(CXX)], | 772 | [C++], [_LT_LANG(CXX)], |
806 | [Go], [_LT_LANG(GO)], | ||
807 | [Java], [_LT_LANG(GCJ)], | 773 | [Java], [_LT_LANG(GCJ)], |
808 | [Fortran 77], [_LT_LANG(F77)], | 774 | [Fortran 77], [_LT_LANG(F77)], |
809 | [Fortran], [_LT_LANG(FC)], | 775 | [Fortran], [_LT_LANG(FC)], |
@@ -825,31 +791,6 @@ m4_defun([_LT_LANG], | |||
825 | ])# _LT_LANG | 791 | ])# _LT_LANG |
826 | 792 | ||
827 | 793 | ||
828 | m4_ifndef([AC_PROG_GO], [ | ||
829 | ############################################################ | ||
830 | # NOTE: This macro has been submitted for inclusion into # | ||
831 | # GNU Autoconf as AC_PROG_GO. When it is available in # | ||
832 | # a released version of Autoconf we should remove this # | ||
833 | # macro and use it instead. # | ||
834 | ############################################################ | ||
835 | m4_defun([AC_PROG_GO], | ||
836 | [AC_LANG_PUSH(Go)dnl | ||
837 | AC_ARG_VAR([GOC], [Go compiler command])dnl | ||
838 | AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl | ||
839 | _AC_ARG_VAR_LDFLAGS()dnl | ||
840 | AC_CHECK_TOOL(GOC, gccgo) | ||
841 | if test -z "$GOC"; then | ||
842 | if test -n "$ac_tool_prefix"; then | ||
843 | AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) | ||
844 | fi | ||
845 | fi | ||
846 | if test -z "$GOC"; then | ||
847 | AC_CHECK_PROG(GOC, gccgo, gccgo, false) | ||
848 | fi | ||
849 | ])#m4_defun | ||
850 | ])#m4_ifndef | ||
851 | |||
852 | |||
853 | # _LT_LANG_DEFAULT_CONFIG | 794 | # _LT_LANG_DEFAULT_CONFIG |
854 | # ----------------------- | 795 | # ----------------------- |
855 | m4_defun([_LT_LANG_DEFAULT_CONFIG], | 796 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
@@ -880,10 +821,6 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], | |||
880 | m4_ifdef([LT_PROG_GCJ], | 821 | m4_ifdef([LT_PROG_GCJ], |
881 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) | 822 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
882 | 823 | ||
883 | AC_PROVIDE_IFELSE([AC_PROG_GO], | ||
884 | [LT_LANG(GO)], | ||
885 | [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) | ||
886 | |||
887 | AC_PROVIDE_IFELSE([LT_PROG_RC], | 824 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
888 | [LT_LANG(RC)], | 825 | [LT_LANG(RC)], |
889 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) | 826 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
@@ -894,13 +831,11 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) | |||
894 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) | 831 | AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) |
895 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) | 832 | AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) |
896 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) | 833 | AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) |
897 | AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) | ||
898 | dnl aclocal-1.4 backwards compatibility: | 834 | dnl aclocal-1.4 backwards compatibility: |
899 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) | 835 | dnl AC_DEFUN([AC_LIBTOOL_CXX], []) |
900 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) | 836 | dnl AC_DEFUN([AC_LIBTOOL_F77], []) |
901 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) | 837 | dnl AC_DEFUN([AC_LIBTOOL_FC], []) |
902 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) | 838 | dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) |
903 | dnl AC_DEFUN([AC_LIBTOOL_RC], []) | ||
904 | 839 | ||
905 | 840 | ||
906 | # _LT_TAG_COMPILER | 841 | # _LT_TAG_COMPILER |
@@ -986,13 +921,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ | |||
986 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | 921 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
987 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err | 922 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
988 | _lt_result=$? | 923 | _lt_result=$? |
989 | # If there is a non-empty error log, and "single_module" | 924 | if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
990 | # appears in it, assume the flag caused a linker warning | ||
991 | if test -s conftest.err && $GREP single_module conftest.err; then | ||
992 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
993 | # Otherwise, if the output was created with a 0 exit code from | ||
994 | # the compiler, it worked. | ||
995 | elif test -f libconftest.dylib && test $_lt_result -eq 0; then | ||
996 | lt_cv_apple_cc_single_mod=yes | 925 | lt_cv_apple_cc_single_mod=yes |
997 | else | 926 | else |
998 | cat conftest.err >&AS_MESSAGE_LOG_FD | 927 | cat conftest.err >&AS_MESSAGE_LOG_FD |
@@ -1000,7 +929,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ | |||
1000 | rm -rf libconftest.dylib* | 929 | rm -rf libconftest.dylib* |
1001 | rm -f conftest.* | 930 | rm -f conftest.* |
1002 | fi]) | 931 | fi]) |
1003 | |||
1004 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], | 932 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
1005 | [lt_cv_ld_exported_symbols_list], | 933 | [lt_cv_ld_exported_symbols_list], |
1006 | [lt_cv_ld_exported_symbols_list=no | 934 | [lt_cv_ld_exported_symbols_list=no |
@@ -1012,34 +940,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ | |||
1012 | [lt_cv_ld_exported_symbols_list=no]) | 940 | [lt_cv_ld_exported_symbols_list=no]) |
1013 | LDFLAGS="$save_LDFLAGS" | 941 | LDFLAGS="$save_LDFLAGS" |
1014 | ]) | 942 | ]) |
1015 | |||
1016 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], | ||
1017 | [lt_cv_ld_force_load=no | ||
1018 | cat > conftest.c << _LT_EOF | ||
1019 | int forced_loaded() { return 2;} | ||
1020 | _LT_EOF | ||
1021 | echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD | ||
1022 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD | ||
1023 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD | ||
1024 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD | ||
1025 | echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD | ||
1026 | $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD | ||
1027 | cat > conftest.c << _LT_EOF | ||
1028 | int main() { return 0;} | ||
1029 | _LT_EOF | ||
1030 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD | ||
1031 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err | ||
1032 | _lt_result=$? | ||
1033 | if test -s conftest.err && $GREP force_load conftest.err; then | ||
1034 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
1035 | elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then | ||
1036 | lt_cv_ld_force_load=yes | ||
1037 | else | ||
1038 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
1039 | fi | ||
1040 | rm -f conftest.err libconftest.a conftest conftest.c | ||
1041 | rm -rf conftest.dSYM | ||
1042 | ]) | ||
1043 | case $host_os in | 943 | case $host_os in |
1044 | rhapsody* | darwin1.[[012]]) | 944 | rhapsody* | darwin1.[[012]]) |
1045 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; | 945 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
@@ -1067,7 +967,7 @@ _LT_EOF | |||
1067 | else | 967 | else |
1068 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' | 968 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
1069 | fi | 969 | fi |
1070 | if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then | 970 | if test "$DSYMUTIL" != ":"; then |
1071 | _lt_dsymutil='~$DSYMUTIL $lib || :' | 971 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
1072 | else | 972 | else |
1073 | _lt_dsymutil= | 973 | _lt_dsymutil= |
@@ -1077,8 +977,8 @@ _LT_EOF | |||
1077 | ]) | 977 | ]) |
1078 | 978 | ||
1079 | 979 | ||
1080 | # _LT_DARWIN_LINKER_FEATURES([TAG]) | 980 | # _LT_DARWIN_LINKER_FEATURES |
1081 | # --------------------------------- | 981 | # -------------------------- |
1082 | # Checks for linker and compiler features on darwin | 982 | # Checks for linker and compiler features on darwin |
1083 | m4_defun([_LT_DARWIN_LINKER_FEATURES], | 983 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
1084 | [ | 984 | [ |
@@ -1087,13 +987,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], | |||
1087 | _LT_TAGVAR(hardcode_direct, $1)=no | 987 | _LT_TAGVAR(hardcode_direct, $1)=no |
1088 | _LT_TAGVAR(hardcode_automatic, $1)=yes | 988 | _LT_TAGVAR(hardcode_automatic, $1)=yes |
1089 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 989 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1090 | if test "$lt_cv_ld_force_load" = "yes"; then | 990 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
1091 | _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' | ||
1092 | m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], | ||
1093 | [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) | ||
1094 | else | ||
1095 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' | ||
1096 | fi | ||
1097 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 991 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
1098 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" | 992 | _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" |
1099 | case $cc_basename in | 993 | case $cc_basename in |
@@ -1101,7 +995,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], | |||
1101 | *) _lt_dar_can_shared=$GCC ;; | 995 | *) _lt_dar_can_shared=$GCC ;; |
1102 | esac | 996 | esac |
1103 | if test "$_lt_dar_can_shared" = "yes"; then | 997 | if test "$_lt_dar_can_shared" = "yes"; then |
1104 | output_verbose_link_cmd=func_echo_all | 998 | output_verbose_link_cmd=echo |
1105 | _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" | 999 | _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
1106 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | 1000 | _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
1107 | _LT_TAGVAR(archive_expsym_cmds, $1)="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}" | 1001 | _LT_TAGVAR(archive_expsym_cmds, $1)="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}" |
@@ -1117,141 +1011,202 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], | |||
1117 | fi | 1011 | fi |
1118 | ]) | 1012 | ]) |
1119 | 1013 | ||
1120 | # _LT_SYS_MODULE_PATH_AIX([TAGNAME]) | 1014 | # _LT_SYS_MODULE_PATH_AIX |
1121 | # ---------------------------------- | 1015 | # ----------------------- |
1122 | # Links a minimal program and checks the executable | 1016 | # Links a minimal program and checks the executable |
1123 | # for the system default hardcoded library path. In most cases, | 1017 | # for the system default hardcoded library path. In most cases, |
1124 | # this is /usr/lib:/lib, but when the MPI compilers are used | 1018 | # this is /usr/lib:/lib, but when the MPI compilers are used |
1125 | # the location of the communication and MPI libs are included too. | 1019 | # the location of the communication and MPI libs are included too. |
1126 | # If we don't find anything, use the default library path according | 1020 | # If we don't find anything, use the default library path according |
1127 | # to the aix ld manual. | 1021 | # to the aix ld manual. |
1128 | # Store the results from the different compilers for each TAGNAME. | ||
1129 | # Allow to override them for all tags through lt_cv_aix_libpath. | ||
1130 | m4_defun([_LT_SYS_MODULE_PATH_AIX], | 1022 | m4_defun([_LT_SYS_MODULE_PATH_AIX], |
1131 | [m4_require([_LT_DECL_SED])dnl | 1023 | [m4_require([_LT_DECL_SED])dnl |
1132 | if test "${lt_cv_aix_libpath+set}" = set; then | 1024 | AC_LINK_IFELSE(AC_LANG_PROGRAM,[ |
1133 | aix_libpath=$lt_cv_aix_libpath | 1025 | lt_aix_libpath_sed=' |
1134 | else | 1026 | /Import File Strings/,/^$/ { |
1135 | AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], | 1027 | /^0/ { |
1136 | [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ | 1028 | s/^0 *\(.*\)$/\1/ |
1137 | lt_aix_libpath_sed='[ | 1029 | p |
1138 | /Import File Strings/,/^$/ { | 1030 | } |
1139 | /^0/ { | 1031 | }' |
1140 | s/^0 *\([^ ]*\) *$/\1/ | 1032 | aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
1141 | p | 1033 | # Check for a 64-bit object if we didn't find anything. |
1142 | } | 1034 | if test -z "$aix_libpath"; then |
1143 | }]' | 1035 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
1144 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | 1036 | fi],[]) |
1145 | # Check for a 64-bit object if we didn't find anything. | 1037 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
1146 | if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then | ||
1147 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | ||
1148 | fi],[]) | ||
1149 | if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then | ||
1150 | _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" | ||
1151 | fi | ||
1152 | ]) | ||
1153 | aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) | ||
1154 | fi | ||
1155 | ])# _LT_SYS_MODULE_PATH_AIX | 1038 | ])# _LT_SYS_MODULE_PATH_AIX |
1156 | 1039 | ||
1157 | 1040 | ||
1158 | # _LT_SHELL_INIT(ARG) | 1041 | # _LT_SHELL_INIT(ARG) |
1159 | # ------------------- | 1042 | # ------------------- |
1160 | m4_define([_LT_SHELL_INIT], | 1043 | m4_define([_LT_SHELL_INIT], |
1161 | [m4_divert_text([M4SH-INIT], [$1 | 1044 | [ifdef([AC_DIVERSION_NOTICE], |
1162 | ])])# _LT_SHELL_INIT | 1045 | [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], |
1163 | 1046 | [AC_DIVERT_PUSH(NOTICE)]) | |
1047 | $1 | ||
1048 | AC_DIVERT_POP | ||
1049 | ])# _LT_SHELL_INIT | ||
1164 | 1050 | ||
1165 | 1051 | ||
1166 | # _LT_PROG_ECHO_BACKSLASH | 1052 | # _LT_PROG_ECHO_BACKSLASH |
1167 | # ----------------------- | 1053 | # ----------------------- |
1168 | # Find how we can fake an echo command that does not interpret backslash. | 1054 | # Add some code to the start of the generated configure script which |
1169 | # In particular, with Autoconf 2.60 or later we add some code to the start | 1055 | # will find an echo command which doesn't interpret backslashes. |
1170 | # of the generated configure script which will find a shell with a builtin | ||
1171 | # printf (which we can use as an echo command). | ||
1172 | m4_defun([_LT_PROG_ECHO_BACKSLASH], | 1056 | m4_defun([_LT_PROG_ECHO_BACKSLASH], |
1173 | [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' | 1057 | [_LT_SHELL_INIT([ |
1174 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO | 1058 | # Check that we are running under the correct shell. |
1175 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 1059 | SHELL=${CONFIG_SHELL-/bin/sh} |
1176 | 1060 | ||
1177 | AC_MSG_CHECKING([how to print strings]) | 1061 | case X$lt_ECHO in |
1178 | # Test print first, because it will be a builtin if present. | 1062 | X*--fallback-echo) |
1179 | if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ | 1063 | # Remove one level of quotation (which was required for Make). |
1180 | test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then | 1064 | ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` |
1181 | ECHO='print -r --' | 1065 | ;; |
1182 | elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then | 1066 | esac |
1183 | ECHO='printf %s\n' | 1067 | |
1068 | ECHO=${lt_ECHO-echo} | ||
1069 | if test "X[$]1" = X--no-reexec; then | ||
1070 | # Discard the --no-reexec flag, and continue. | ||
1071 | shift | ||
1072 | elif test "X[$]1" = X--fallback-echo; then | ||
1073 | # Avoid inline document here, it may be left over | ||
1074 | : | ||
1075 | elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then | ||
1076 | # Yippee, $ECHO works! | ||
1077 | : | ||
1184 | else | 1078 | else |
1185 | # Use this function as a fallback that always works. | 1079 | # Restart under the correct shell. |
1186 | func_fallback_echo () | 1080 | exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} |
1187 | { | ||
1188 | eval 'cat <<_LTECHO_EOF | ||
1189 | $[]1 | ||
1190 | _LTECHO_EOF' | ||
1191 | } | ||
1192 | ECHO='func_fallback_echo' | ||
1193 | fi | 1081 | fi |
1194 | 1082 | ||
1195 | # func_echo_all arg... | 1083 | if test "X[$]1" = X--fallback-echo; then |
1196 | # Invoke $ECHO with all args, space-separated. | 1084 | # used as fallback echo |
1197 | func_echo_all () | 1085 | shift |
1198 | { | 1086 | cat <<_LT_EOF |
1199 | $ECHO "$*" | 1087 | [$]* |
1200 | } | 1088 | _LT_EOF |
1089 | exit 0 | ||
1090 | fi | ||
1201 | 1091 | ||
1202 | case "$ECHO" in | 1092 | # The HP-UX ksh and POSIX shell print the target directory to stdout |
1203 | printf*) AC_MSG_RESULT([printf]) ;; | 1093 | # if CDPATH is set. |
1204 | print*) AC_MSG_RESULT([print -r]) ;; | 1094 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1205 | *) AC_MSG_RESULT([cat]) ;; | ||
1206 | esac | ||
1207 | 1095 | ||
1208 | m4_ifdef([_AS_DETECT_SUGGESTED], | 1096 | if test -z "$lt_ECHO"; then |
1209 | [_AS_DETECT_SUGGESTED([ | 1097 | if test "X${echo_test_string+set}" != Xset; then |
1210 | test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( | 1098 | # find a string as large as possible, as long as the shell can cope with it |
1211 | ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' | 1099 | for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do |
1212 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO | 1100 | # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
1213 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO | 1101 | if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
1214 | PATH=/empty FPATH=/empty; export PATH FPATH | 1102 | { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
1215 | test "X`printf %s $ECHO`" = "X$ECHO" \ | 1103 | then |
1216 | || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) | 1104 | break |
1105 | fi | ||
1106 | done | ||
1107 | fi | ||
1217 | 1108 | ||
1218 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) | 1109 | if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
1219 | _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) | 1110 | echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
1220 | ])# _LT_PROG_ECHO_BACKSLASH | 1111 | test "X$echo_testing_string" = "X$echo_test_string"; then |
1112 | : | ||
1113 | else | ||
1114 | # The Solaris, AIX, and Digital Unix default echo programs unquote | ||
1115 | # backslashes. This makes it impossible to quote backslashes using | ||
1116 | # echo "$something" | sed 's/\\/\\\\/g' | ||
1117 | # | ||
1118 | # So, first we look for a working echo in the user's PATH. | ||
1221 | 1119 | ||
1120 | lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR | ||
1121 | for dir in $PATH /usr/ucb; do | ||
1122 | IFS="$lt_save_ifs" | ||
1123 | if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && | ||
1124 | test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && | ||
1125 | echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && | ||
1126 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1127 | ECHO="$dir/echo" | ||
1128 | break | ||
1129 | fi | ||
1130 | done | ||
1131 | IFS="$lt_save_ifs" | ||
1222 | 1132 | ||
1223 | # _LT_WITH_SYSROOT | 1133 | if test "X$ECHO" = Xecho; then |
1224 | # ---------------- | 1134 | # We didn't find a better echo, so look for alternatives. |
1225 | AC_DEFUN([_LT_WITH_SYSROOT], | 1135 | if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
1226 | [AC_MSG_CHECKING([for sysroot]) | 1136 | echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
1227 | AC_ARG_WITH([sysroot], | 1137 | test "X$echo_testing_string" = "X$echo_test_string"; then |
1228 | [ --with-sysroot[=DIR] Search for dependent libraries within DIR | 1138 | # This shell has a builtin print -r that does the trick. |
1229 | (or the compiler's sysroot if not specified).], | 1139 | ECHO='print -r' |
1230 | [], [with_sysroot=no]) | 1140 | elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
1231 | 1141 | test "X$CONFIG_SHELL" != X/bin/ksh; then | |
1232 | dnl lt_sysroot will always be passed unquoted. We quote it here | 1142 | # If we have ksh, try running configure again with it. |
1233 | dnl in case the user passed a directory name. | 1143 | ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
1234 | lt_sysroot= | 1144 | export ORIGINAL_CONFIG_SHELL |
1235 | case ${with_sysroot} in #( | 1145 | CONFIG_SHELL=/bin/ksh |
1236 | yes) | 1146 | export CONFIG_SHELL |
1237 | if test "$GCC" = yes; then | 1147 | exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} |
1238 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` | 1148 | else |
1239 | fi | 1149 | # Try using printf. |
1240 | ;; #( | 1150 | ECHO='printf %s\n' |
1241 | /*) | 1151 | if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
1242 | lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` | 1152 | echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
1243 | ;; #( | 1153 | test "X$echo_testing_string" = "X$echo_test_string"; then |
1244 | no|'') | 1154 | # Cool, printf works |
1245 | ;; #( | 1155 | : |
1246 | *) | 1156 | elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && |
1247 | AC_MSG_RESULT([${with_sysroot}]) | 1157 | test "X$echo_testing_string" = 'X\t' && |
1248 | AC_MSG_ERROR([The sysroot must be an absolute path.]) | 1158 | echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
1249 | ;; | 1159 | test "X$echo_testing_string" = "X$echo_test_string"; then |
1250 | esac | 1160 | CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
1161 | export CONFIG_SHELL | ||
1162 | SHELL="$CONFIG_SHELL" | ||
1163 | export SHELL | ||
1164 | ECHO="$CONFIG_SHELL [$]0 --fallback-echo" | ||
1165 | elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && | ||
1166 | test "X$echo_testing_string" = 'X\t' && | ||
1167 | echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && | ||
1168 | test "X$echo_testing_string" = "X$echo_test_string"; then | ||
1169 | ECHO="$CONFIG_SHELL [$]0 --fallback-echo" | ||
1170 | else | ||
1171 | # maybe with a smaller string... | ||
1172 | prev=: | ||
1173 | |||
1174 | for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do | ||
1175 | if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null | ||
1176 | then | ||
1177 | break | ||
1178 | fi | ||
1179 | prev="$cmd" | ||
1180 | done | ||
1181 | |||
1182 | if test "$prev" != 'sed 50q "[$]0"'; then | ||
1183 | echo_test_string=`eval $prev` | ||
1184 | export echo_test_string | ||
1185 | exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} | ||
1186 | else | ||
1187 | # Oops. We lost completely, so just stick with echo. | ||
1188 | ECHO=echo | ||
1189 | fi | ||
1190 | fi | ||
1191 | fi | ||
1192 | fi | ||
1193 | fi | ||
1194 | fi | ||
1195 | |||
1196 | # Copy echo and quote the copy suitably for passing to libtool from | ||
1197 | # the Makefile, instead of quoting the original, which is used later. | ||
1198 | lt_ECHO=$ECHO | ||
1199 | if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then | ||
1200 | lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" | ||
1201 | fi | ||
1202 | |||
1203 | AC_SUBST(lt_ECHO) | ||
1204 | ]) | ||
1205 | _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) | ||
1206 | _LT_DECL([], [ECHO], [1], | ||
1207 | [An echo program that does not interpret backslashes]) | ||
1208 | ])# _LT_PROG_ECHO_BACKSLASH | ||
1251 | 1209 | ||
1252 | AC_MSG_RESULT([${lt_sysroot:-no}]) | ||
1253 | _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl | ||
1254 | [dependent libraries, and in which our libraries should be installed.])]) | ||
1255 | 1210 | ||
1256 | # _LT_ENABLE_LOCK | 1211 | # _LT_ENABLE_LOCK |
1257 | # --------------- | 1212 | # --------------- |
@@ -1281,7 +1236,7 @@ ia64-*-hpux*) | |||
1281 | ;; | 1236 | ;; |
1282 | *-*-irix6*) | 1237 | *-*-irix6*) |
1283 | # Find out which ABI we are using. | 1238 | # Find out which ABI we are using. |
1284 | echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext | 1239 | echo '[#]line __oline__ "configure"' > conftest.$ac_ext |
1285 | if AC_TRY_EVAL(ac_compile); then | 1240 | if AC_TRY_EVAL(ac_compile); then |
1286 | if test "$lt_cv_prog_gnu_ld" = yes; then | 1241 | if test "$lt_cv_prog_gnu_ld" = yes; then |
1287 | case `/usr/bin/file conftest.$ac_objext` in | 1242 | case `/usr/bin/file conftest.$ac_objext` in |
@@ -1374,27 +1329,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) | |||
1374 | CFLAGS="$SAVE_CFLAGS" | 1329 | CFLAGS="$SAVE_CFLAGS" |
1375 | fi | 1330 | fi |
1376 | ;; | 1331 | ;; |
1377 | *-*solaris*) | 1332 | sparc*-*solaris*) |
1378 | # Find out which ABI we are using. | 1333 | # Find out which ABI we are using. |
1379 | echo 'int i;' > conftest.$ac_ext | 1334 | echo 'int i;' > conftest.$ac_ext |
1380 | if AC_TRY_EVAL(ac_compile); then | 1335 | if AC_TRY_EVAL(ac_compile); then |
1381 | case `/usr/bin/file conftest.o` in | 1336 | case `/usr/bin/file conftest.o` in |
1382 | *64-bit*) | 1337 | *64-bit*) |
1383 | case $lt_cv_prog_gnu_ld in | 1338 | case $lt_cv_prog_gnu_ld in |
1384 | yes*) | 1339 | yes*) LD="${LD-ld} -m elf64_sparc" ;; |
1385 | case $host in | ||
1386 | i?86-*-solaris*) | ||
1387 | LD="${LD-ld} -m elf_x86_64" | ||
1388 | ;; | ||
1389 | sparc*-*-solaris*) | ||
1390 | LD="${LD-ld} -m elf64_sparc" | ||
1391 | ;; | ||
1392 | esac | ||
1393 | # GNU ld 2.21 introduced _sol2 emulations. Use them if available. | ||
1394 | if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then | ||
1395 | LD="${LD-ld}_sol2" | ||
1396 | fi | ||
1397 | ;; | ||
1398 | *) | 1340 | *) |
1399 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | 1341 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
1400 | LD="${LD-ld} -64" | 1342 | LD="${LD-ld} -64" |
@@ -1412,47 +1354,14 @@ need_locks="$enable_libtool_lock" | |||
1412 | ])# _LT_ENABLE_LOCK | 1354 | ])# _LT_ENABLE_LOCK |
1413 | 1355 | ||
1414 | 1356 | ||
1415 | # _LT_PROG_AR | ||
1416 | # ----------- | ||
1417 | m4_defun([_LT_PROG_AR], | ||
1418 | [AC_CHECK_TOOLS(AR, [ar], false) | ||
1419 | : ${AR=ar} | ||
1420 | : ${AR_FLAGS=cru} | ||
1421 | _LT_DECL([], [AR], [1], [The archiver]) | ||
1422 | _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) | ||
1423 | |||
1424 | AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], | ||
1425 | [lt_cv_ar_at_file=no | ||
1426 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM], | ||
1427 | [echo conftest.$ac_objext > conftest.lst | ||
1428 | lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' | ||
1429 | AC_TRY_EVAL([lt_ar_try]) | ||
1430 | if test "$ac_status" -eq 0; then | ||
1431 | # Ensure the archiver fails upon bogus file names. | ||
1432 | rm -f conftest.$ac_objext libconftest.a | ||
1433 | AC_TRY_EVAL([lt_ar_try]) | ||
1434 | if test "$ac_status" -ne 0; then | ||
1435 | lt_cv_ar_at_file=@ | ||
1436 | fi | ||
1437 | fi | ||
1438 | rm -f conftest.* libconftest.a | ||
1439 | ]) | ||
1440 | ]) | ||
1441 | |||
1442 | if test "x$lt_cv_ar_at_file" = xno; then | ||
1443 | archiver_list_spec= | ||
1444 | else | ||
1445 | archiver_list_spec=$lt_cv_ar_at_file | ||
1446 | fi | ||
1447 | _LT_DECL([], [archiver_list_spec], [1], | ||
1448 | [How to feed a file listing to the archiver]) | ||
1449 | ])# _LT_PROG_AR | ||
1450 | |||
1451 | |||
1452 | # _LT_CMD_OLD_ARCHIVE | 1357 | # _LT_CMD_OLD_ARCHIVE |
1453 | # ------------------- | 1358 | # ------------------- |
1454 | m4_defun([_LT_CMD_OLD_ARCHIVE], | 1359 | m4_defun([_LT_CMD_OLD_ARCHIVE], |
1455 | [_LT_PROG_AR | 1360 | [AC_CHECK_TOOL(AR, ar, false) |
1361 | test -z "$AR" && AR=ar | ||
1362 | test -z "$AR_FLAGS" && AR_FLAGS=cru | ||
1363 | _LT_DECL([], [AR], [1], [The archiver]) | ||
1364 | _LT_DECL([], [AR_FLAGS], [1]) | ||
1456 | 1365 | ||
1457 | AC_CHECK_TOOL(STRIP, strip, :) | 1366 | AC_CHECK_TOOL(STRIP, strip, :) |
1458 | test -z "$STRIP" && STRIP=: | 1367 | test -z "$STRIP" && STRIP=: |
@@ -1471,27 +1380,18 @@ old_postuninstall_cmds= | |||
1471 | if test -n "$RANLIB"; then | 1380 | if test -n "$RANLIB"; then |
1472 | case $host_os in | 1381 | case $host_os in |
1473 | openbsd*) | 1382 | openbsd*) |
1474 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" | 1383 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
1475 | ;; | 1384 | ;; |
1476 | *) | 1385 | *) |
1477 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" | 1386 | old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
1478 | ;; | 1387 | ;; |
1479 | esac | 1388 | esac |
1480 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" | 1389 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
1481 | fi | 1390 | fi |
1482 | |||
1483 | case $host_os in | ||
1484 | darwin*) | ||
1485 | lock_old_archive_extraction=yes ;; | ||
1486 | *) | ||
1487 | lock_old_archive_extraction=no ;; | ||
1488 | esac | ||
1489 | _LT_DECL([], [old_postinstall_cmds], [2]) | 1391 | _LT_DECL([], [old_postinstall_cmds], [2]) |
1490 | _LT_DECL([], [old_postuninstall_cmds], [2]) | 1392 | _LT_DECL([], [old_postuninstall_cmds], [2]) |
1491 | _LT_TAGDECL([], [old_archive_cmds], [2], | 1393 | _LT_TAGDECL([], [old_archive_cmds], [2], |
1492 | [Commands used to build an old-style archive]) | 1394 | [Commands used to build an old-style archive]) |
1493 | _LT_DECL([], [lock_old_archive_extraction], [0], | ||
1494 | [Whether to use a lock for old archive extraction]) | ||
1495 | ])# _LT_CMD_OLD_ARCHIVE | 1395 | ])# _LT_CMD_OLD_ARCHIVE |
1496 | 1396 | ||
1497 | 1397 | ||
@@ -1516,15 +1416,15 @@ AC_CACHE_CHECK([$1], [$2], | |||
1516 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 1416 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1517 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ | 1417 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
1518 | -e 's:$: $lt_compiler_flag:'` | 1418 | -e 's:$: $lt_compiler_flag:'` |
1519 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) | 1419 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
1520 | (eval "$lt_compile" 2>conftest.err) | 1420 | (eval "$lt_compile" 2>conftest.err) |
1521 | ac_status=$? | 1421 | ac_status=$? |
1522 | cat conftest.err >&AS_MESSAGE_LOG_FD | 1422 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1523 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | 1423 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
1524 | if (exit $ac_status) && test -s "$ac_outfile"; then | 1424 | if (exit $ac_status) && test -s "$ac_outfile"; then |
1525 | # The compiler can only warn and ignore the option if not recognized | 1425 | # The compiler can only warn and ignore the option if not recognized |
1526 | # So say no if there are warnings other than the usual output. | 1426 | # So say no if there are warnings other than the usual output. |
1527 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp | 1427 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
1528 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | 1428 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
1529 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then | 1429 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
1530 | $2=yes | 1430 | $2=yes |
@@ -1564,7 +1464,7 @@ AC_CACHE_CHECK([$1], [$2], | |||
1564 | if test -s conftest.err; then | 1464 | if test -s conftest.err; then |
1565 | # Append any errors to the config.log. | 1465 | # Append any errors to the config.log. |
1566 | cat conftest.err 1>&AS_MESSAGE_LOG_FD | 1466 | cat conftest.err 1>&AS_MESSAGE_LOG_FD |
1567 | $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp | 1467 | $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
1568 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | 1468 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
1569 | if diff conftest.exp conftest.er2 >/dev/null; then | 1469 | if diff conftest.exp conftest.er2 >/dev/null; then |
1570 | $2=yes | 1470 | $2=yes |
@@ -1627,11 +1527,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl | |||
1627 | lt_cv_sys_max_cmd_len=8192; | 1527 | lt_cv_sys_max_cmd_len=8192; |
1628 | ;; | 1528 | ;; |
1629 | 1529 | ||
1630 | mint*) | ||
1631 | # On MiNT this can take a long time and run out of memory. | ||
1632 | lt_cv_sys_max_cmd_len=8192; | ||
1633 | ;; | ||
1634 | |||
1635 | amigaos*) | 1530 | amigaos*) |
1636 | # On AmigaOS with pdksh, this test takes hours, literally. | 1531 | # On AmigaOS with pdksh, this test takes hours, literally. |
1637 | # So we just punt and use a minimum line length of 8192. | 1532 | # So we just punt and use a minimum line length of 8192. |
@@ -1657,11 +1552,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl | |||
1657 | lt_cv_sys_max_cmd_len=196608 | 1552 | lt_cv_sys_max_cmd_len=196608 |
1658 | ;; | 1553 | ;; |
1659 | 1554 | ||
1660 | os2*) | ||
1661 | # The test takes a long time on OS/2. | ||
1662 | lt_cv_sys_max_cmd_len=8192 | ||
1663 | ;; | ||
1664 | |||
1665 | osf*) | 1555 | osf*) |
1666 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure | 1556 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
1667 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not | 1557 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
@@ -1701,8 +1591,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl | |||
1701 | # If test is not a shell built-in, we'll probably end up computing a | 1591 | # If test is not a shell built-in, we'll probably end up computing a |
1702 | # maximum length that is only half of the actual maximum length, but | 1592 | # maximum length that is only half of the actual maximum length, but |
1703 | # we can't tell. | 1593 | # we can't tell. |
1704 | while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ | 1594 | while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
1705 | = "X$teststring$teststring"; } >/dev/null 2>&1 && | 1595 | = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
1706 | test $i != 17 # 1/2 MB should be enough | 1596 | test $i != 17 # 1/2 MB should be enough |
1707 | do | 1597 | do |
1708 | i=`expr $i + 1` | 1598 | i=`expr $i + 1` |
@@ -1753,7 +1643,7 @@ else | |||
1753 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 1643 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1754 | lt_status=$lt_dlunknown | 1644 | lt_status=$lt_dlunknown |
1755 | cat > conftest.$ac_ext <<_LT_EOF | 1645 | cat > conftest.$ac_ext <<_LT_EOF |
1756 | [#line $LINENO "configure" | 1646 | [#line __oline__ "configure" |
1757 | #include "confdefs.h" | 1647 | #include "confdefs.h" |
1758 | 1648 | ||
1759 | #if HAVE_DLFCN_H | 1649 | #if HAVE_DLFCN_H |
@@ -1794,13 +1684,7 @@ else | |||
1794 | # endif | 1684 | # endif |
1795 | #endif | 1685 | #endif |
1796 | 1686 | ||
1797 | /* When -fvisbility=hidden is used, assume the code has been annotated | 1687 | void fnord() { int i=42;} |
1798 | correspondingly for the symbols needed. */ | ||
1799 | #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) | ||
1800 | int fnord () __attribute__((visibility("default"))); | ||
1801 | #endif | ||
1802 | |||
1803 | int fnord () { return 42; } | ||
1804 | int main () | 1688 | int main () |
1805 | { | 1689 | { |
1806 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 1690 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
@@ -1809,11 +1693,7 @@ int main () | |||
1809 | if (self) | 1693 | if (self) |
1810 | { | 1694 | { |
1811 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; | 1695 | if (dlsym (self,"fnord")) status = $lt_dlno_uscore; |
1812 | else | 1696 | else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; |
1813 | { | ||
1814 | if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; | ||
1815 | else puts (dlerror ()); | ||
1816 | } | ||
1817 | /* dlclose (self); */ | 1697 | /* dlclose (self); */ |
1818 | } | 1698 | } |
1819 | else | 1699 | else |
@@ -1989,16 +1869,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], | |||
1989 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 1869 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1990 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ | 1870 | -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ |
1991 | -e 's:$: $lt_compiler_flag:'` | 1871 | -e 's:$: $lt_compiler_flag:'` |
1992 | (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) | 1872 | (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) |
1993 | (eval "$lt_compile" 2>out/conftest.err) | 1873 | (eval "$lt_compile" 2>out/conftest.err) |
1994 | ac_status=$? | 1874 | ac_status=$? |
1995 | cat out/conftest.err >&AS_MESSAGE_LOG_FD | 1875 | cat out/conftest.err >&AS_MESSAGE_LOG_FD |
1996 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | 1876 | echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
1997 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 1877 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1998 | then | 1878 | then |
1999 | # The compiler can only warn and ignore the option if not recognized | 1879 | # The compiler can only warn and ignore the option if not recognized |
2000 | # So say no if there are warnings | 1880 | # So say no if there are warnings |
2001 | $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp | 1881 | $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
2002 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 | 1882 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
2003 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then | 1883 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
2004 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes | 1884 | _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes |
@@ -2157,7 +2037,6 @@ m4_require([_LT_DECL_EGREP])dnl | |||
2157 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 2037 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2158 | m4_require([_LT_DECL_OBJDUMP])dnl | 2038 | m4_require([_LT_DECL_OBJDUMP])dnl |
2159 | m4_require([_LT_DECL_SED])dnl | 2039 | m4_require([_LT_DECL_SED])dnl |
2160 | m4_require([_LT_CHECK_SHELL_FEATURES])dnl | ||
2161 | AC_MSG_CHECKING([dynamic linker characteristics]) | 2040 | AC_MSG_CHECKING([dynamic linker characteristics]) |
2162 | m4_if([$1], | 2041 | m4_if([$1], |
2163 | [], [ | 2042 | [], [ |
@@ -2166,23 +2045,16 @@ if test "$GCC" = yes; then | |||
2166 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; | 2045 | darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; |
2167 | *) lt_awk_arg="/^libraries:/" ;; | 2046 | *) lt_awk_arg="/^libraries:/" ;; |
2168 | esac | 2047 | esac |
2169 | case $host_os in | 2048 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
2170 | mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; | 2049 | if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then |
2171 | *) lt_sed_strip_eq="s,=/,/,g" ;; | ||
2172 | esac | ||
2173 | lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` | ||
2174 | case $lt_search_path_spec in | ||
2175 | *\;*) | ||
2176 | # if the path contains ";" then we assume it to be the separator | 2050 | # if the path contains ";" then we assume it to be the separator |
2177 | # otherwise default to the standard path separator (i.e. ":") - it is | 2051 | # otherwise default to the standard path separator (i.e. ":") - it is |
2178 | # assumed that no part of a normal pathname contains ";" but that should | 2052 | # assumed that no part of a normal pathname contains ";" but that should |
2179 | # okay in the real world where ";" in dirpaths is itself problematic. | 2053 | # okay in the real world where ";" in dirpaths is itself problematic. |
2180 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` | 2054 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` |
2181 | ;; | 2055 | else |
2182 | *) | 2056 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
2183 | lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` | 2057 | fi |
2184 | ;; | ||
2185 | esac | ||
2186 | # Ok, now we have the path, separated by spaces, we can step through it | 2058 | # Ok, now we have the path, separated by spaces, we can step through it |
2187 | # and add multilib dir if necessary. | 2059 | # and add multilib dir if necessary. |
2188 | lt_tmp_lt_search_path_spec= | 2060 | lt_tmp_lt_search_path_spec= |
@@ -2195,7 +2067,7 @@ if test "$GCC" = yes; then | |||
2195 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" | 2067 | lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" |
2196 | fi | 2068 | fi |
2197 | done | 2069 | done |
2198 | lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' | 2070 | lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' |
2199 | BEGIN {RS=" "; FS="/|\n";} { | 2071 | BEGIN {RS=" "; FS="/|\n";} { |
2200 | lt_foo=""; | 2072 | lt_foo=""; |
2201 | lt_count=0; | 2073 | lt_count=0; |
@@ -2215,13 +2087,7 @@ BEGIN {RS=" "; FS="/|\n";} { | |||
2215 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } | 2087 | if (lt_foo != "") { lt_freq[[lt_foo]]++; } |
2216 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } | 2088 | if (lt_freq[[lt_foo]] == 1) { print lt_foo; } |
2217 | }'` | 2089 | }'` |
2218 | # AWK program above erroneously prepends '/' to C:/dos/paths | 2090 | sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` |
2219 | # for these hosts. | ||
2220 | case $host_os in | ||
2221 | mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ | ||
2222 | $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; | ||
2223 | esac | ||
2224 | sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` | ||
2225 | else | 2091 | else |
2226 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | 2092 | sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" |
2227 | fi]) | 2093 | fi]) |
@@ -2247,7 +2113,7 @@ need_version=unknown | |||
2247 | 2113 | ||
2248 | case $host_os in | 2114 | case $host_os in |
2249 | aix3*) | 2115 | aix3*) |
2250 | version_type=linux # correct to gnu/linux during the next big refactor | 2116 | version_type=linux |
2251 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' | 2117 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
2252 | shlibpath_var=LIBPATH | 2118 | shlibpath_var=LIBPATH |
2253 | 2119 | ||
@@ -2256,7 +2122,7 @@ aix3*) | |||
2256 | ;; | 2122 | ;; |
2257 | 2123 | ||
2258 | aix[[4-9]]*) | 2124 | aix[[4-9]]*) |
2259 | version_type=linux # correct to gnu/linux during the next big refactor | 2125 | version_type=linux |
2260 | need_lib_prefix=no | 2126 | need_lib_prefix=no |
2261 | need_version=no | 2127 | need_version=no |
2262 | hardcode_into_libs=yes | 2128 | hardcode_into_libs=yes |
@@ -2309,7 +2175,7 @@ amigaos*) | |||
2309 | m68k) | 2175 | m68k) |
2310 | library_names_spec='$libname.ixlibrary $libname.a' | 2176 | library_names_spec='$libname.ixlibrary $libname.a' |
2311 | # Create ${libname}_ixlibrary.a entries in /sys/libs. | 2177 | # Create ${libname}_ixlibrary.a entries in /sys/libs. |
2312 | finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' | 2178 | finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' |
2313 | ;; | 2179 | ;; |
2314 | esac | 2180 | esac |
2315 | ;; | 2181 | ;; |
@@ -2321,7 +2187,7 @@ beos*) | |||
2321 | ;; | 2187 | ;; |
2322 | 2188 | ||
2323 | bsdi[[45]]*) | 2189 | bsdi[[45]]*) |
2324 | version_type=linux # correct to gnu/linux during the next big refactor | 2190 | version_type=linux |
2325 | need_version=no | 2191 | need_version=no |
2326 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2192 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2327 | soname_spec='${libname}${release}${shared_ext}$major' | 2193 | soname_spec='${libname}${release}${shared_ext}$major' |
@@ -2340,9 +2206,8 @@ cygwin* | mingw* | pw32* | cegcc*) | |||
2340 | need_version=no | 2206 | need_version=no |
2341 | need_lib_prefix=no | 2207 | need_lib_prefix=no |
2342 | 2208 | ||
2343 | case $GCC,$cc_basename in | 2209 | case $GCC,$host_os in |
2344 | yes,*) | 2210 | yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) |
2345 | # gcc | ||
2346 | library_names_spec='$libname.dll.a' | 2211 | library_names_spec='$libname.dll.a' |
2347 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | 2212 | # DLL is installed to $(libdir)/../bin by postinstall_cmds |
2348 | postinstall_cmds='base_file=`basename \${file}`~ | 2213 | postinstall_cmds='base_file=`basename \${file}`~ |
@@ -2363,83 +2228,36 @@ cygwin* | mingw* | pw32* | cegcc*) | |||
2363 | cygwin*) | 2228 | cygwin*) |
2364 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' | 2229 | # Cygwin DLLs use 'cyg' prefix rather than 'lib' |
2365 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 2230 | soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2366 | m4_if([$1], [],[ | 2231 | sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" |
2367 | sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) | ||
2368 | ;; | 2232 | ;; |
2369 | mingw* | cegcc*) | 2233 | mingw* | cegcc*) |
2370 | # MinGW DLLs use traditional 'lib' prefix | 2234 | # MinGW DLLs use traditional 'lib' prefix |
2371 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | 2235 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' |
2372 | ;; | 2236 | sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
2373 | pw32*) | ||
2374 | # pw32 DLLs use 'pw' prefix rather than 'lib' | ||
2375 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | ||
2376 | ;; | ||
2377 | esac | ||
2378 | dynamic_linker='Win32 ld.exe' | ||
2379 | ;; | ||
2380 | |||
2381 | *,cl*) | ||
2382 | # Native MSVC | ||
2383 | libname_spec='$name' | ||
2384 | soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | ||
2385 | library_names_spec='${libname}.dll.lib' | ||
2386 | |||
2387 | case $build_os in | ||
2388 | mingw*) | ||
2389 | sys_lib_search_path_spec= | ||
2390 | lt_save_ifs=$IFS | ||
2391 | IFS=';' | ||
2392 | for lt_path in $LIB | ||
2393 | do | ||
2394 | IFS=$lt_save_ifs | ||
2395 | # Let DOS variable expansion print the short 8.3 style file name. | ||
2396 | lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` | ||
2397 | sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" | ||
2398 | done | ||
2399 | IFS=$lt_save_ifs | ||
2400 | # Convert to MSYS style. | ||
2401 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` | ||
2402 | ;; | ||
2403 | cygwin*) | ||
2404 | # Convert to unix form, then to dos form, then back to unix form | ||
2405 | # but this time dos style (no spaces!) so that the unix form looks | ||
2406 | # like /cygdrive/c/PROGRA~1:/cygdr... | ||
2407 | sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` | ||
2408 | sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` | ||
2409 | sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | ||
2410 | ;; | ||
2411 | *) | ||
2412 | sys_lib_search_path_spec="$LIB" | ||
2413 | if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then | 2237 | if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then |
2414 | # It is most probably a Windows format PATH. | 2238 | # It is most probably a Windows format PATH printed by |
2239 | # mingw gcc, but we are running on Cygwin. Gcc prints its search | ||
2240 | # path with ; separators, and with drive letters. We can handle the | ||
2241 | # drive letters (cygwin fileutils understands them), so leave them, | ||
2242 | # especially as we might pass files found there to a mingw objdump, | ||
2243 | # which wouldn't understand a cygwinified path. Ahh. | ||
2415 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | 2244 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` |
2416 | else | 2245 | else |
2417 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | 2246 | sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
2418 | fi | 2247 | fi |
2419 | # FIXME: find the short name or the path components, as spaces are | 2248 | ;; |
2420 | # common. (e.g. "Program Files" -> "PROGRA~1") | 2249 | pw32*) |
2250 | # pw32 DLLs use 'pw' prefix rather than 'lib' | ||
2251 | library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' | ||
2421 | ;; | 2252 | ;; |
2422 | esac | 2253 | esac |
2423 | |||
2424 | # DLL is installed to $(libdir)/../bin by postinstall_cmds | ||
2425 | postinstall_cmds='base_file=`basename \${file}`~ | ||
2426 | dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ | ||
2427 | dldir=$destdir/`dirname \$dlpath`~ | ||
2428 | test -d \$dldir || mkdir -p \$dldir~ | ||
2429 | $install_prog $dir/$dlname \$dldir/$dlname' | ||
2430 | postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ | ||
2431 | dlpath=$dir/\$dldll~ | ||
2432 | $RM \$dlpath' | ||
2433 | shlibpath_overrides_runpath=yes | ||
2434 | dynamic_linker='Win32 link.exe' | ||
2435 | ;; | 2254 | ;; |
2436 | 2255 | ||
2437 | *) | 2256 | *) |
2438 | # Assume MSVC wrapper | ||
2439 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' | 2257 | library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' |
2440 | dynamic_linker='Win32 ld.exe' | ||
2441 | ;; | 2258 | ;; |
2442 | esac | 2259 | esac |
2260 | dynamic_linker='Win32 ld.exe' | ||
2443 | # FIXME: first we should search . and the directory the executable is in | 2261 | # FIXME: first we should search . and the directory the executable is in |
2444 | shlibpath_var=PATH | 2262 | shlibpath_var=PATH |
2445 | ;; | 2263 | ;; |
@@ -2460,7 +2278,7 @@ m4_if([$1], [],[ | |||
2460 | ;; | 2278 | ;; |
2461 | 2279 | ||
2462 | dgux*) | 2280 | dgux*) |
2463 | version_type=linux # correct to gnu/linux during the next big refactor | 2281 | version_type=linux |
2464 | need_lib_prefix=no | 2282 | need_lib_prefix=no |
2465 | need_version=no | 2283 | need_version=no |
2466 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' | 2284 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
@@ -2468,6 +2286,10 @@ dgux*) | |||
2468 | shlibpath_var=LD_LIBRARY_PATH | 2286 | shlibpath_var=LD_LIBRARY_PATH |
2469 | ;; | 2287 | ;; |
2470 | 2288 | ||
2289 | freebsd1*) | ||
2290 | dynamic_linker=no | ||
2291 | ;; | ||
2292 | |||
2471 | freebsd* | dragonfly*) | 2293 | freebsd* | dragonfly*) |
2472 | # DragonFly does not have aout. When/if they implement a new | 2294 | # DragonFly does not have aout. When/if they implement a new |
2473 | # versioning mechanism, adjust this. | 2295 | # versioning mechanism, adjust this. |
@@ -2475,7 +2297,7 @@ freebsd* | dragonfly*) | |||
2475 | objformat=`/usr/bin/objformat` | 2297 | objformat=`/usr/bin/objformat` |
2476 | else | 2298 | else |
2477 | case $host_os in | 2299 | case $host_os in |
2478 | freebsd[[23]].*) objformat=aout ;; | 2300 | freebsd[[123]]*) objformat=aout ;; |
2479 | *) objformat=elf ;; | 2301 | *) objformat=elf ;; |
2480 | esac | 2302 | esac |
2481 | fi | 2303 | fi |
@@ -2493,7 +2315,7 @@ freebsd* | dragonfly*) | |||
2493 | esac | 2315 | esac |
2494 | shlibpath_var=LD_LIBRARY_PATH | 2316 | shlibpath_var=LD_LIBRARY_PATH |
2495 | case $host_os in | 2317 | case $host_os in |
2496 | freebsd2.*) | 2318 | freebsd2*) |
2497 | shlibpath_overrides_runpath=yes | 2319 | shlibpath_overrides_runpath=yes |
2498 | ;; | 2320 | ;; |
2499 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) | 2321 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
@@ -2512,16 +2334,13 @@ freebsd* | dragonfly*) | |||
2512 | esac | 2334 | esac |
2513 | ;; | 2335 | ;; |
2514 | 2336 | ||
2515 | haiku*) | 2337 | gnu*) |
2516 | version_type=linux # correct to gnu/linux during the next big refactor | 2338 | version_type=linux |
2517 | need_lib_prefix=no | 2339 | need_lib_prefix=no |
2518 | need_version=no | 2340 | need_version=no |
2519 | dynamic_linker="$host_os runtime_loader" | ||
2520 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' | 2341 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
2521 | soname_spec='${libname}${release}${shared_ext}$major' | 2342 | soname_spec='${libname}${release}${shared_ext}$major' |
2522 | shlibpath_var=LIBRARY_PATH | 2343 | shlibpath_var=LD_LIBRARY_PATH |
2523 | shlibpath_overrides_runpath=yes | ||
2524 | sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' | ||
2525 | hardcode_into_libs=yes | 2344 | hardcode_into_libs=yes |
2526 | ;; | 2345 | ;; |
2527 | 2346 | ||
@@ -2567,14 +2386,12 @@ hpux9* | hpux10* | hpux11*) | |||
2567 | soname_spec='${libname}${release}${shared_ext}$major' | 2386 | soname_spec='${libname}${release}${shared_ext}$major' |
2568 | ;; | 2387 | ;; |
2569 | esac | 2388 | esac |
2570 | # HP-UX runs *really* slowly unless shared libraries are mode 555, ... | 2389 | # HP-UX runs *really* slowly unless shared libraries are mode 555. |
2571 | postinstall_cmds='chmod 555 $lib' | 2390 | postinstall_cmds='chmod 555 $lib' |
2572 | # or fails outright, so override atomically: | ||
2573 | install_override_mode=555 | ||
2574 | ;; | 2391 | ;; |
2575 | 2392 | ||
2576 | interix[[3-9]]*) | 2393 | interix[[3-9]]*) |
2577 | version_type=linux # correct to gnu/linux during the next big refactor | 2394 | version_type=linux |
2578 | need_lib_prefix=no | 2395 | need_lib_prefix=no |
2579 | need_version=no | 2396 | need_version=no |
2580 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | 2397 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
@@ -2590,7 +2407,7 @@ irix5* | irix6* | nonstopux*) | |||
2590 | nonstopux*) version_type=nonstopux ;; | 2407 | nonstopux*) version_type=nonstopux ;; |
2591 | *) | 2408 | *) |
2592 | if test "$lt_cv_prog_gnu_ld" = yes; then | 2409 | if test "$lt_cv_prog_gnu_ld" = yes; then |
2593 | version_type=linux # correct to gnu/linux during the next big refactor | 2410 | version_type=linux |
2594 | else | 2411 | else |
2595 | version_type=irix | 2412 | version_type=irix |
2596 | fi ;; | 2413 | fi ;; |
@@ -2627,9 +2444,9 @@ linux*oldld* | linux*aout* | linux*coff*) | |||
2627 | dynamic_linker=no | 2444 | dynamic_linker=no |
2628 | ;; | 2445 | ;; |
2629 | 2446 | ||
2630 | # This must be glibc/ELF. | 2447 | # This must be Linux ELF. |
2631 | linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | 2448 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2632 | version_type=linux # correct to gnu/linux during the next big refactor | 2449 | version_type=linux |
2633 | need_lib_prefix=no | 2450 | need_lib_prefix=no |
2634 | need_version=no | 2451 | need_version=no |
2635 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2452 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
@@ -2637,21 +2454,16 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
2637 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' | 2454 | finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' |
2638 | shlibpath_var=LD_LIBRARY_PATH | 2455 | shlibpath_var=LD_LIBRARY_PATH |
2639 | shlibpath_overrides_runpath=no | 2456 | shlibpath_overrides_runpath=no |
2640 | |||
2641 | # Some binutils ld are patched to set DT_RUNPATH | 2457 | # Some binutils ld are patched to set DT_RUNPATH |
2642 | AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], | 2458 | save_LDFLAGS=$LDFLAGS |
2643 | [lt_cv_shlibpath_overrides_runpath=no | 2459 | save_libdir=$libdir |
2644 | save_LDFLAGS=$LDFLAGS | 2460 | eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ |
2645 | save_libdir=$libdir | 2461 | LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" |
2646 | eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ | 2462 | AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], |
2647 | LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" | 2463 | [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], |
2648 | AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], | 2464 | [shlibpath_overrides_runpath=yes])]) |
2649 | [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], | 2465 | LDFLAGS=$save_LDFLAGS |
2650 | [lt_cv_shlibpath_overrides_runpath=yes])]) | 2466 | libdir=$save_libdir |
2651 | LDFLAGS=$save_LDFLAGS | ||
2652 | libdir=$save_libdir | ||
2653 | ]) | ||
2654 | shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath | ||
2655 | 2467 | ||
2656 | # This implies no fast_install, which is unacceptable. | 2468 | # This implies no fast_install, which is unacceptable. |
2657 | # Some rework will be needed to allow for fast_install | 2469 | # Some rework will be needed to allow for fast_install |
@@ -2660,7 +2472,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | |||
2660 | 2472 | ||
2661 | # Append ld.so.conf contents to the search path | 2473 | # Append ld.so.conf contents to the search path |
2662 | if test -f /etc/ld.so.conf; then | 2474 | if test -f /etc/ld.so.conf; then |
2663 | 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;s/"//g;/^$/d' | tr '\n' ' '` | 2475 | 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' ' '` |
2664 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | 2476 | sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" |
2665 | fi | 2477 | fi |
2666 | 2478 | ||
@@ -2704,7 +2516,7 @@ netbsd*) | |||
2704 | ;; | 2516 | ;; |
2705 | 2517 | ||
2706 | newsos6) | 2518 | newsos6) |
2707 | version_type=linux # correct to gnu/linux during the next big refactor | 2519 | version_type=linux |
2708 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2520 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2709 | shlibpath_var=LD_LIBRARY_PATH | 2521 | shlibpath_var=LD_LIBRARY_PATH |
2710 | shlibpath_overrides_runpath=yes | 2522 | shlibpath_overrides_runpath=yes |
@@ -2773,7 +2585,7 @@ rdos*) | |||
2773 | ;; | 2585 | ;; |
2774 | 2586 | ||
2775 | solaris*) | 2587 | solaris*) |
2776 | version_type=linux # correct to gnu/linux during the next big refactor | 2588 | version_type=linux |
2777 | need_lib_prefix=no | 2589 | need_lib_prefix=no |
2778 | need_version=no | 2590 | need_version=no |
2779 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2591 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
@@ -2798,7 +2610,7 @@ sunos4*) | |||
2798 | ;; | 2610 | ;; |
2799 | 2611 | ||
2800 | sysv4 | sysv4.3*) | 2612 | sysv4 | sysv4.3*) |
2801 | version_type=linux # correct to gnu/linux during the next big refactor | 2613 | version_type=linux |
2802 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2614 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2803 | soname_spec='${libname}${release}${shared_ext}$major' | 2615 | soname_spec='${libname}${release}${shared_ext}$major' |
2804 | shlibpath_var=LD_LIBRARY_PATH | 2616 | shlibpath_var=LD_LIBRARY_PATH |
@@ -2822,7 +2634,7 @@ sysv4 | sysv4.3*) | |||
2822 | 2634 | ||
2823 | sysv4*MP*) | 2635 | sysv4*MP*) |
2824 | if test -d /usr/nec ;then | 2636 | if test -d /usr/nec ;then |
2825 | version_type=linux # correct to gnu/linux during the next big refactor | 2637 | version_type=linux |
2826 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' | 2638 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
2827 | soname_spec='$libname${shared_ext}.$major' | 2639 | soname_spec='$libname${shared_ext}.$major' |
2828 | shlibpath_var=LD_LIBRARY_PATH | 2640 | shlibpath_var=LD_LIBRARY_PATH |
@@ -2853,7 +2665,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) | |||
2853 | 2665 | ||
2854 | tpf*) | 2666 | tpf*) |
2855 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. | 2667 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
2856 | version_type=linux # correct to gnu/linux during the next big refactor | 2668 | version_type=linux |
2857 | need_lib_prefix=no | 2669 | need_lib_prefix=no |
2858 | need_version=no | 2670 | need_version=no |
2859 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2671 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
@@ -2863,7 +2675,7 @@ tpf*) | |||
2863 | ;; | 2675 | ;; |
2864 | 2676 | ||
2865 | uts4*) | 2677 | uts4*) |
2866 | version_type=linux # correct to gnu/linux during the next big refactor | 2678 | version_type=linux |
2867 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2679 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2868 | soname_spec='${libname}${release}${shared_ext}$major' | 2680 | soname_spec='${libname}${release}${shared_ext}$major' |
2869 | shlibpath_var=LD_LIBRARY_PATH | 2681 | shlibpath_var=LD_LIBRARY_PATH |
@@ -2905,8 +2717,6 @@ _LT_DECL([], [library_names_spec], [1], | |||
2905 | The last name is the one that the linker finds with -lNAME]]) | 2717 | The last name is the one that the linker finds with -lNAME]]) |
2906 | _LT_DECL([], [soname_spec], [1], | 2718 | _LT_DECL([], [soname_spec], [1], |
2907 | [[The coded name of the library, if different from the real name]]) | 2719 | [[The coded name of the library, if different from the real name]]) |
2908 | _LT_DECL([], [install_override_mode], [1], | ||
2909 | [Permission mode override for installation of shared libraries]) | ||
2910 | _LT_DECL([], [postinstall_cmds], [2], | 2720 | _LT_DECL([], [postinstall_cmds], [2], |
2911 | [Command to use after installation of a shared archive]) | 2721 | [Command to use after installation of a shared archive]) |
2912 | _LT_DECL([], [postuninstall_cmds], [2], | 2722 | _LT_DECL([], [postuninstall_cmds], [2], |
@@ -3019,7 +2829,6 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl | |||
3019 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl | 2829 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl |
3020 | m4_require([_LT_DECL_SED])dnl | 2830 | m4_require([_LT_DECL_SED])dnl |
3021 | m4_require([_LT_DECL_EGREP])dnl | 2831 | m4_require([_LT_DECL_EGREP])dnl |
3022 | m4_require([_LT_PROG_ECHO_BACKSLASH])dnl | ||
3023 | 2832 | ||
3024 | AC_ARG_WITH([gnu-ld], | 2833 | AC_ARG_WITH([gnu-ld], |
3025 | [AS_HELP_STRING([--with-gnu-ld], | 2834 | [AS_HELP_STRING([--with-gnu-ld], |
@@ -3141,11 +2950,6 @@ case $reload_flag in | |||
3141 | esac | 2950 | esac |
3142 | reload_cmds='$LD$reload_flag -o $output$reload_objs' | 2951 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
3143 | case $host_os in | 2952 | case $host_os in |
3144 | cygwin* | mingw* | pw32* | cegcc*) | ||
3145 | if test "$GCC" != yes; then | ||
3146 | reload_cmds=false | ||
3147 | fi | ||
3148 | ;; | ||
3149 | darwin*) | 2953 | darwin*) |
3150 | if test "$GCC" = yes; then | 2954 | if test "$GCC" = yes; then |
3151 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' | 2955 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
@@ -3154,8 +2958,8 @@ case $host_os in | |||
3154 | fi | 2958 | fi |
3155 | ;; | 2959 | ;; |
3156 | esac | 2960 | esac |
3157 | _LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl | 2961 | _LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl |
3158 | _LT_TAGDECL([], [reload_cmds], [2])dnl | 2962 | _LT_DECL([], [reload_cmds], [2])dnl |
3159 | ])# _LT_CMD_RELOAD | 2963 | ])# _LT_CMD_RELOAD |
3160 | 2964 | ||
3161 | 2965 | ||
@@ -3207,18 +3011,16 @@ mingw* | pw32*) | |||
3207 | # Base MSYS/MinGW do not provide the 'file' command needed by | 3011 | # Base MSYS/MinGW do not provide the 'file' command needed by |
3208 | # func_win32_libid shell function, so use a weaker test based on 'objdump', | 3012 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
3209 | # unless we find 'file', for example because we are cross-compiling. | 3013 | # unless we find 'file', for example because we are cross-compiling. |
3210 | # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. | 3014 | if ( file / ) >/dev/null 2>&1; then |
3211 | if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then | ||
3212 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | 3015 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
3213 | lt_cv_file_magic_cmd='func_win32_libid' | 3016 | lt_cv_file_magic_cmd='func_win32_libid' |
3214 | else | 3017 | else |
3215 | # Keep this pattern in sync with the one in func_win32_libid. | 3018 | lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
3216 | lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' | ||
3217 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 3019 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
3218 | fi | 3020 | fi |
3219 | ;; | 3021 | ;; |
3220 | 3022 | ||
3221 | cegcc*) | 3023 | cegcc) |
3222 | # use the weaker test based on 'objdump'. See mingw*. | 3024 | # use the weaker test based on 'objdump'. See mingw*. |
3223 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' | 3025 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
3224 | lt_cv_file_magic_cmd='$OBJDUMP -f' | 3026 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
@@ -3244,7 +3046,7 @@ freebsd* | dragonfly*) | |||
3244 | fi | 3046 | fi |
3245 | ;; | 3047 | ;; |
3246 | 3048 | ||
3247 | haiku*) | 3049 | gnu*) |
3248 | lt_cv_deplibs_check_method=pass_all | 3050 | lt_cv_deplibs_check_method=pass_all |
3249 | ;; | 3051 | ;; |
3250 | 3052 | ||
@@ -3256,11 +3058,11 @@ hpux10.20* | hpux11*) | |||
3256 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so | 3058 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
3257 | ;; | 3059 | ;; |
3258 | hppa*64*) | 3060 | hppa*64*) |
3259 | [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] | 3061 | [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] |
3260 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl | 3062 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
3261 | ;; | 3063 | ;; |
3262 | *) | 3064 | *) |
3263 | lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' | 3065 | lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' |
3264 | lt_cv_file_magic_test_file=/usr/lib/libc.sl | 3066 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
3265 | ;; | 3067 | ;; |
3266 | esac | 3068 | esac |
@@ -3281,8 +3083,8 @@ irix5* | irix6* | nonstopux*) | |||
3281 | lt_cv_deplibs_check_method=pass_all | 3083 | lt_cv_deplibs_check_method=pass_all |
3282 | ;; | 3084 | ;; |
3283 | 3085 | ||
3284 | # This must be glibc/ELF. | 3086 | # This must be Linux ELF. |
3285 | linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | 3087 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
3286 | lt_cv_deplibs_check_method=pass_all | 3088 | lt_cv_deplibs_check_method=pass_all |
3287 | ;; | 3089 | ;; |
3288 | 3090 | ||
@@ -3360,21 +3162,6 @@ tpf*) | |||
3360 | ;; | 3162 | ;; |
3361 | esac | 3163 | esac |
3362 | ]) | 3164 | ]) |
3363 | |||
3364 | file_magic_glob= | ||
3365 | want_nocaseglob=no | ||
3366 | if test "$build" = "$host"; then | ||
3367 | case $host_os in | ||
3368 | mingw* | pw32*) | ||
3369 | if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then | ||
3370 | want_nocaseglob=yes | ||
3371 | else | ||
3372 | file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` | ||
3373 | fi | ||
3374 | ;; | ||
3375 | esac | ||
3376 | fi | ||
3377 | |||
3378 | file_magic_cmd=$lt_cv_file_magic_cmd | 3165 | file_magic_cmd=$lt_cv_file_magic_cmd |
3379 | deplibs_check_method=$lt_cv_deplibs_check_method | 3166 | deplibs_check_method=$lt_cv_deplibs_check_method |
3380 | test -z "$deplibs_check_method" && deplibs_check_method=unknown | 3167 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
@@ -3382,11 +3169,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown | |||
3382 | _LT_DECL([], [deplibs_check_method], [1], | 3169 | _LT_DECL([], [deplibs_check_method], [1], |
3383 | [Method to check whether dependent libraries are shared objects]) | 3170 | [Method to check whether dependent libraries are shared objects]) |
3384 | _LT_DECL([], [file_magic_cmd], [1], | 3171 | _LT_DECL([], [file_magic_cmd], [1], |
3385 | [Command to use when deplibs_check_method = "file_magic"]) | 3172 | [Command to use when deplibs_check_method == "file_magic"]) |
3386 | _LT_DECL([], [file_magic_glob], [1], | ||
3387 | [How to find potential files when deplibs_check_method = "file_magic"]) | ||
3388 | _LT_DECL([], [want_nocaseglob], [1], | ||
3389 | [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) | ||
3390 | ])# _LT_CHECK_MAGIC_METHOD | 3173 | ])# _LT_CHECK_MAGIC_METHOD |
3391 | 3174 | ||
3392 | 3175 | ||
@@ -3443,19 +3226,7 @@ if test "$lt_cv_path_NM" != "no"; then | |||
3443 | NM="$lt_cv_path_NM" | 3226 | NM="$lt_cv_path_NM" |
3444 | else | 3227 | else |
3445 | # Didn't find any BSD compatible name lister, look for dumpbin. | 3228 | # Didn't find any BSD compatible name lister, look for dumpbin. |
3446 | if test -n "$DUMPBIN"; then : | 3229 | AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) |
3447 | # Let the user override the test. | ||
3448 | else | ||
3449 | AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) | ||
3450 | case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in | ||
3451 | *COFF*) | ||
3452 | DUMPBIN="$DUMPBIN -symbols" | ||
3453 | ;; | ||
3454 | *) | ||
3455 | DUMPBIN=: | ||
3456 | ;; | ||
3457 | esac | ||
3458 | fi | ||
3459 | AC_SUBST([DUMPBIN]) | 3230 | AC_SUBST([DUMPBIN]) |
3460 | if test "$DUMPBIN" != ":"; then | 3231 | if test "$DUMPBIN" != ":"; then |
3461 | NM="$DUMPBIN" | 3232 | NM="$DUMPBIN" |
@@ -3468,13 +3239,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl | |||
3468 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], | 3239 | AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], |
3469 | [lt_cv_nm_interface="BSD nm" | 3240 | [lt_cv_nm_interface="BSD nm" |
3470 | echo "int some_variable = 0;" > conftest.$ac_ext | 3241 | echo "int some_variable = 0;" > conftest.$ac_ext |
3471 | (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) | 3242 | (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) |
3472 | (eval "$ac_compile" 2>conftest.err) | 3243 | (eval "$ac_compile" 2>conftest.err) |
3473 | cat conftest.err >&AS_MESSAGE_LOG_FD | 3244 | cat conftest.err >&AS_MESSAGE_LOG_FD |
3474 | (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) | 3245 | (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) |
3475 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) | 3246 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
3476 | cat conftest.err >&AS_MESSAGE_LOG_FD | 3247 | cat conftest.err >&AS_MESSAGE_LOG_FD |
3477 | (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) | 3248 | (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) |
3478 | cat conftest.out >&AS_MESSAGE_LOG_FD | 3249 | cat conftest.out >&AS_MESSAGE_LOG_FD |
3479 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then | 3250 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
3480 | lt_cv_nm_interface="MS dumpbin" | 3251 | lt_cv_nm_interface="MS dumpbin" |
@@ -3489,67 +3260,6 @@ dnl aclocal-1.4 backwards compatibility: | |||
3489 | dnl AC_DEFUN([AM_PROG_NM], []) | 3260 | dnl AC_DEFUN([AM_PROG_NM], []) |
3490 | dnl AC_DEFUN([AC_PROG_NM], []) | 3261 | dnl AC_DEFUN([AC_PROG_NM], []) |
3491 | 3262 | ||
3492 | # _LT_CHECK_SHAREDLIB_FROM_LINKLIB | ||
3493 | # -------------------------------- | ||
3494 | # how to determine the name of the shared library | ||
3495 | # associated with a specific link library. | ||
3496 | # -- PORTME fill in with the dynamic library characteristics | ||
3497 | m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], | ||
3498 | [m4_require([_LT_DECL_EGREP]) | ||
3499 | m4_require([_LT_DECL_OBJDUMP]) | ||
3500 | m4_require([_LT_DECL_DLLTOOL]) | ||
3501 | AC_CACHE_CHECK([how to associate runtime and link libraries], | ||
3502 | lt_cv_sharedlib_from_linklib_cmd, | ||
3503 | [lt_cv_sharedlib_from_linklib_cmd='unknown' | ||
3504 | |||
3505 | case $host_os in | ||
3506 | cygwin* | mingw* | pw32* | cegcc*) | ||
3507 | # two different shell functions defined in ltmain.sh | ||
3508 | # decide which to use based on capabilities of $DLLTOOL | ||
3509 | case `$DLLTOOL --help 2>&1` in | ||
3510 | *--identify-strict*) | ||
3511 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib | ||
3512 | ;; | ||
3513 | *) | ||
3514 | lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback | ||
3515 | ;; | ||
3516 | esac | ||
3517 | ;; | ||
3518 | *) | ||
3519 | # fallback: assume linklib IS sharedlib | ||
3520 | lt_cv_sharedlib_from_linklib_cmd="$ECHO" | ||
3521 | ;; | ||
3522 | esac | ||
3523 | ]) | ||
3524 | sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd | ||
3525 | test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO | ||
3526 | |||
3527 | _LT_DECL([], [sharedlib_from_linklib_cmd], [1], | ||
3528 | [Command to associate shared and link libraries]) | ||
3529 | ])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB | ||
3530 | |||
3531 | |||
3532 | # _LT_PATH_MANIFEST_TOOL | ||
3533 | # ---------------------- | ||
3534 | # locate the manifest tool | ||
3535 | m4_defun([_LT_PATH_MANIFEST_TOOL], | ||
3536 | [AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) | ||
3537 | test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt | ||
3538 | AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], | ||
3539 | [lt_cv_path_mainfest_tool=no | ||
3540 | echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD | ||
3541 | $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out | ||
3542 | cat conftest.err >&AS_MESSAGE_LOG_FD | ||
3543 | if $GREP 'Manifest Tool' conftest.out > /dev/null; then | ||
3544 | lt_cv_path_mainfest_tool=yes | ||
3545 | fi | ||
3546 | rm -f conftest*]) | ||
3547 | if test "x$lt_cv_path_mainfest_tool" != xyes; then | ||
3548 | MANIFEST_TOOL=: | ||
3549 | fi | ||
3550 | _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl | ||
3551 | ])# _LT_PATH_MANIFEST_TOOL | ||
3552 | |||
3553 | 3263 | ||
3554 | # LT_LIB_M | 3264 | # LT_LIB_M |
3555 | # -------- | 3265 | # -------- |
@@ -3558,7 +3268,7 @@ AC_DEFUN([LT_LIB_M], | |||
3558 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 3268 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
3559 | LIBM= | 3269 | LIBM= |
3560 | case $host in | 3270 | case $host in |
3561 | *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) | 3271 | *-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) |
3562 | # These system don't have libm, or don't need it | 3272 | # These system don't have libm, or don't need it |
3563 | ;; | 3273 | ;; |
3564 | *-ncr-sysv4.3*) | 3274 | *-ncr-sysv4.3*) |
@@ -3586,12 +3296,7 @@ m4_defun([_LT_COMPILER_NO_RTTI], | |||
3586 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= | 3296 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= |
3587 | 3297 | ||
3588 | if test "$GCC" = yes; then | 3298 | if test "$GCC" = yes; then |
3589 | case $cc_basename in | 3299 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' |
3590 | nvcc*) | ||
3591 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; | ||
3592 | *) | ||
3593 | _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; | ||
3594 | esac | ||
3595 | 3300 | ||
3596 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], | 3301 | _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], |
3597 | lt_cv_prog_compiler_rtti_exceptions, | 3302 | lt_cv_prog_compiler_rtti_exceptions, |
@@ -3608,7 +3313,6 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], | |||
3608 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], | 3313 | m4_defun([_LT_CMD_GLOBAL_SYMBOLS], |
3609 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 3314 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl |
3610 | AC_REQUIRE([AC_PROG_CC])dnl | 3315 | AC_REQUIRE([AC_PROG_CC])dnl |
3611 | AC_REQUIRE([AC_PROG_AWK])dnl | ||
3612 | AC_REQUIRE([LT_PATH_NM])dnl | 3316 | AC_REQUIRE([LT_PATH_NM])dnl |
3613 | AC_REQUIRE([LT_PATH_LD])dnl | 3317 | AC_REQUIRE([LT_PATH_LD])dnl |
3614 | m4_require([_LT_DECL_SED])dnl | 3318 | m4_require([_LT_DECL_SED])dnl |
@@ -3676,8 +3380,8 @@ esac | |||
3676 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | 3380 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
3677 | 3381 | ||
3678 | # Transform an extracted symbol line into symbol name and symbol address | 3382 | # Transform an extracted symbol line into symbol name and symbol address |
3679 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" | 3383 | lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" |
3680 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" | 3384 | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
3681 | 3385 | ||
3682 | # Handle CRLF in mingw tool chain | 3386 | # Handle CRLF in mingw tool chain |
3683 | opt_cr= | 3387 | opt_cr= |
@@ -3701,7 +3405,6 @@ for ac_symprfx in "" "_"; do | |||
3701 | # which start with @ or ?. | 3405 | # which start with @ or ?. |
3702 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ | 3406 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
3703 | " {last_section=section; section=\$ 3};"\ | 3407 | " {last_section=section; section=\$ 3};"\ |
3704 | " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ | ||
3705 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ | 3408 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
3706 | " \$ 0!~/External *\|/{next};"\ | 3409 | " \$ 0!~/External *\|/{next};"\ |
3707 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ | 3410 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
@@ -3714,7 +3417,6 @@ for ac_symprfx in "" "_"; do | |||
3714 | else | 3417 | else |
3715 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" | 3418 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
3716 | fi | 3419 | fi |
3717 | lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" | ||
3718 | 3420 | ||
3719 | # Check to see that the pipe works correctly. | 3421 | # Check to see that the pipe works correctly. |
3720 | pipe_works=no | 3422 | pipe_works=no |
@@ -3736,7 +3438,7 @@ _LT_EOF | |||
3736 | if AC_TRY_EVAL(ac_compile); then | 3438 | if AC_TRY_EVAL(ac_compile); then |
3737 | # Now try to grab the symbols. | 3439 | # Now try to grab the symbols. |
3738 | nlist=conftest.nm | 3440 | nlist=conftest.nm |
3739 | if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then | 3441 | if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then |
3740 | # Try sorting and uniquifying the output. | 3442 | # Try sorting and uniquifying the output. |
3741 | if sort "$nlist" | uniq > "$nlist"T; then | 3443 | if sort "$nlist" | uniq > "$nlist"T; then |
3742 | mv -f "$nlist"T "$nlist" | 3444 | mv -f "$nlist"T "$nlist" |
@@ -3748,18 +3450,6 @@ _LT_EOF | |||
3748 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then | 3450 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
3749 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then | 3451 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
3750 | cat <<_LT_EOF > conftest.$ac_ext | 3452 | cat <<_LT_EOF > conftest.$ac_ext |
3751 | /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ | ||
3752 | #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) | ||
3753 | /* DATA imports from DLLs on WIN32 con't be const, because runtime | ||
3754 | relocations are performed -- see ld's documentation on pseudo-relocs. */ | ||
3755 | # define LT@&t@_DLSYM_CONST | ||
3756 | #elif defined(__osf__) | ||
3757 | /* This system does not cope well with relocations in const data. */ | ||
3758 | # define LT@&t@_DLSYM_CONST | ||
3759 | #else | ||
3760 | # define LT@&t@_DLSYM_CONST const | ||
3761 | #endif | ||
3762 | |||
3763 | #ifdef __cplusplus | 3453 | #ifdef __cplusplus |
3764 | extern "C" { | 3454 | extern "C" { |
3765 | #endif | 3455 | #endif |
@@ -3771,7 +3461,7 @@ _LT_EOF | |||
3771 | cat <<_LT_EOF >> conftest.$ac_ext | 3461 | cat <<_LT_EOF >> conftest.$ac_ext |
3772 | 3462 | ||
3773 | /* The mapping between symbol names and symbols. */ | 3463 | /* The mapping between symbol names and symbols. */ |
3774 | LT@&t@_DLSYM_CONST struct { | 3464 | const struct { |
3775 | const char *name; | 3465 | const char *name; |
3776 | void *address; | 3466 | void *address; |
3777 | } | 3467 | } |
@@ -3797,15 +3487,15 @@ static const void *lt_preloaded_setup() { | |||
3797 | _LT_EOF | 3487 | _LT_EOF |
3798 | # Now try linking the two files. | 3488 | # Now try linking the two files. |
3799 | mv conftest.$ac_objext conftstm.$ac_objext | 3489 | mv conftest.$ac_objext conftstm.$ac_objext |
3800 | lt_globsym_save_LIBS=$LIBS | 3490 | lt_save_LIBS="$LIBS" |
3801 | lt_globsym_save_CFLAGS=$CFLAGS | 3491 | lt_save_CFLAGS="$CFLAGS" |
3802 | LIBS="conftstm.$ac_objext" | 3492 | LIBS="conftstm.$ac_objext" |
3803 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" | 3493 | CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" |
3804 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then | 3494 | if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then |
3805 | pipe_works=yes | 3495 | pipe_works=yes |
3806 | fi | 3496 | fi |
3807 | LIBS=$lt_globsym_save_LIBS | 3497 | LIBS="$lt_save_LIBS" |
3808 | CFLAGS=$lt_globsym_save_CFLAGS | 3498 | CFLAGS="$lt_save_CFLAGS" |
3809 | else | 3499 | else |
3810 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD | 3500 | echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD |
3811 | fi | 3501 | fi |
@@ -3838,13 +3528,6 @@ else | |||
3838 | AC_MSG_RESULT(ok) | 3528 | AC_MSG_RESULT(ok) |
3839 | fi | 3529 | fi |
3840 | 3530 | ||
3841 | # Response file support. | ||
3842 | if test "$lt_cv_nm_interface" = "MS dumpbin"; then | ||
3843 | nm_file_list_spec='@' | ||
3844 | elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then | ||
3845 | nm_file_list_spec='@' | ||
3846 | fi | ||
3847 | |||
3848 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], | 3531 | _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], |
3849 | [Take the output of nm and produce a listing of raw symbols and C names]) | 3532 | [Take the output of nm and produce a listing of raw symbols and C names]) |
3850 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], | 3533 | _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], |
@@ -3855,8 +3538,6 @@ _LT_DECL([global_symbol_to_c_name_address], | |||
3855 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], | 3538 | _LT_DECL([global_symbol_to_c_name_address_lib_prefix], |
3856 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], | 3539 | [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], |
3857 | [Transform the output of nm in a C name address pair when lib prefix is needed]) | 3540 | [Transform the output of nm in a C name address pair when lib prefix is needed]) |
3858 | _LT_DECL([], [nm_file_list_spec], [1], | ||
3859 | [Specify filename containing input files for $NM]) | ||
3860 | ]) # _LT_CMD_GLOBAL_SYMBOLS | 3541 | ]) # _LT_CMD_GLOBAL_SYMBOLS |
3861 | 3542 | ||
3862 | 3543 | ||
@@ -3868,6 +3549,7 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= | |||
3868 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 3549 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
3869 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | 3550 | _LT_TAGVAR(lt_prog_compiler_static, $1)= |
3870 | 3551 | ||
3552 | AC_MSG_CHECKING([for $compiler option to produce PIC]) | ||
3871 | m4_if([$1], [CXX], [ | 3553 | m4_if([$1], [CXX], [ |
3872 | # C++ specific cases for pic, static, wl, etc. | 3554 | # C++ specific cases for pic, static, wl, etc. |
3873 | if test "$GXX" = yes; then | 3555 | if test "$GXX" = yes; then |
@@ -3918,11 +3600,6 @@ m4_if([$1], [CXX], [ | |||
3918 | # DJGPP does not support shared libraries at all | 3600 | # DJGPP does not support shared libraries at all |
3919 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 3601 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
3920 | ;; | 3602 | ;; |
3921 | haiku*) | ||
3922 | # PIC is the default for Haiku. | ||
3923 | # The "-static" flag exists, but is broken. | ||
3924 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | ||
3925 | ;; | ||
3926 | interix[[3-9]]*) | 3603 | interix[[3-9]]*) |
3927 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. | 3604 | # Interix 3.x gcc -fpic/-fPIC options generate broken code. |
3928 | # Instead, we relocate shared libraries at runtime. | 3605 | # Instead, we relocate shared libraries at runtime. |
@@ -3972,12 +3649,6 @@ m4_if([$1], [CXX], [ | |||
3972 | ;; | 3649 | ;; |
3973 | esac | 3650 | esac |
3974 | ;; | 3651 | ;; |
3975 | mingw* | cygwin* | os2* | pw32* | cegcc*) | ||
3976 | # This hack is so that the source file can tell whether it is being | ||
3977 | # built for inclusion in a dll (and should export symbols for example). | ||
3978 | m4_if([$1], [GCJ], [], | ||
3979 | [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) | ||
3980 | ;; | ||
3981 | dgux*) | 3652 | dgux*) |
3982 | case $cc_basename in | 3653 | case $cc_basename in |
3983 | ec++*) | 3654 | ec++*) |
@@ -4034,7 +3705,7 @@ m4_if([$1], [CXX], [ | |||
4034 | ;; | 3705 | ;; |
4035 | esac | 3706 | esac |
4036 | ;; | 3707 | ;; |
4037 | linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | 3708 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4038 | case $cc_basename in | 3709 | case $cc_basename in |
4039 | KCC*) | 3710 | KCC*) |
4040 | # KAI C++ Compiler | 3711 | # KAI C++ Compiler |
@@ -4067,8 +3738,8 @@ m4_if([$1], [CXX], [ | |||
4067 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= | 3738 | _LT_TAGVAR(lt_prog_compiler_pic, $1)= |
4068 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 3739 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
4069 | ;; | 3740 | ;; |
4070 | xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) | 3741 | xlc* | xlC*) |
4071 | # IBM XL 8.0, 9.0 on PPC and BlueGene | 3742 | # IBM XL 8.0 on PPC |
4072 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 3743 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4073 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' | 3744 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
4074 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' | 3745 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
@@ -4130,7 +3801,7 @@ m4_if([$1], [CXX], [ | |||
4130 | ;; | 3801 | ;; |
4131 | solaris*) | 3802 | solaris*) |
4132 | case $cc_basename in | 3803 | case $cc_basename in |
4133 | CC* | sunCC*) | 3804 | CC*) |
4134 | # Sun C++ 4.2, 5.x and Centerline C++ | 3805 | # Sun C++ 4.2, 5.x and Centerline C++ |
4135 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 3806 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4136 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 3807 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
@@ -4234,12 +3905,6 @@ m4_if([$1], [CXX], [ | |||
4234 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' | 3905 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' |
4235 | ;; | 3906 | ;; |
4236 | 3907 | ||
4237 | haiku*) | ||
4238 | # PIC is the default for Haiku. | ||
4239 | # The "-static" flag exists, but is broken. | ||
4240 | _LT_TAGVAR(lt_prog_compiler_static, $1)= | ||
4241 | ;; | ||
4242 | |||
4243 | hpux*) | 3908 | hpux*) |
4244 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit | 3909 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
4245 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag | 3910 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
@@ -4282,15 +3947,6 @@ m4_if([$1], [CXX], [ | |||
4282 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | 3947 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
4283 | ;; | 3948 | ;; |
4284 | esac | 3949 | esac |
4285 | |||
4286 | case $cc_basename in | ||
4287 | nvcc*) # Cuda Compiler Driver 2.2 | ||
4288 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' | ||
4289 | if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then | ||
4290 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" | ||
4291 | fi | ||
4292 | ;; | ||
4293 | esac | ||
4294 | else | 3950 | else |
4295 | # PORTME Check for flag to pass linker flags through the system compiler. | 3951 | # PORTME Check for flag to pass linker flags through the system compiler. |
4296 | case $host_os in | 3952 | case $host_os in |
@@ -4333,7 +3989,7 @@ m4_if([$1], [CXX], [ | |||
4333 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 3989 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
4334 | ;; | 3990 | ;; |
4335 | 3991 | ||
4336 | linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | 3992 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4337 | case $cc_basename in | 3993 | case $cc_basename in |
4338 | # old Intel for x86_64 which still supported -KPIC. | 3994 | # old Intel for x86_64 which still supported -KPIC. |
4339 | ecc*) | 3995 | ecc*) |
@@ -4354,13 +4010,7 @@ m4_if([$1], [CXX], [ | |||
4354 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' | 4010 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' |
4355 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' | 4011 | _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' |
4356 | ;; | 4012 | ;; |
4357 | nagfor*) | 4013 | pgcc* | pgf77* | pgf90* | pgf95*) |
4358 | # NAG Fortran compiler | ||
4359 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' | ||
4360 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' | ||
4361 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
4362 | ;; | ||
4363 | pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) | ||
4364 | # Portland Group compilers (*not* the Pentium gcc compiler, | 4014 | # Portland Group compilers (*not* the Pentium gcc compiler, |
4365 | # which looks to be a dead project) | 4015 | # which looks to be a dead project) |
4366 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4016 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
@@ -4372,40 +4022,25 @@ m4_if([$1], [CXX], [ | |||
4372 | # All Alpha code is PIC. | 4022 | # All Alpha code is PIC. |
4373 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | 4023 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
4374 | ;; | 4024 | ;; |
4375 | xl* | bgxl* | bgf* | mpixl*) | 4025 | xl*) |
4376 | # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene | 4026 | # IBM XL C 8.0/Fortran 10.1 on PPC |
4377 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4027 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4378 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' | 4028 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' |
4379 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' | 4029 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' |
4380 | ;; | 4030 | ;; |
4381 | *) | 4031 | *) |
4382 | case `$CC -V 2>&1 | sed 5q` in | 4032 | case `$CC -V 2>&1 | sed 5q` in |
4383 | *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) | ||
4384 | # Sun Fortran 8.3 passes all unrecognized flags to the linker | ||
4385 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
4386 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
4387 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | ||
4388 | ;; | ||
4389 | *Sun\ F* | *Sun*Fortran*) | ||
4390 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | ||
4391 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | ||
4392 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' | ||
4393 | ;; | ||
4394 | *Sun\ C*) | 4033 | *Sun\ C*) |
4395 | # Sun C 5.9 | 4034 | # Sun C 5.9 |
4396 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4035 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4397 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4036 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4398 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4037 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
4399 | ;; | 4038 | ;; |
4400 | *Intel*\ [[CF]]*Compiler*) | 4039 | *Sun\ F*) |
4401 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 4040 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4402 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | 4041 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4403 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | ||
4404 | ;; | ||
4405 | *Portland\ Group*) | ||
4406 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
4407 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' | ||
4408 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4042 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4043 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' | ||
4409 | ;; | 4044 | ;; |
4410 | esac | 4045 | esac |
4411 | ;; | 4046 | ;; |
@@ -4437,7 +4072,7 @@ m4_if([$1], [CXX], [ | |||
4437 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4072 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4438 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | 4073 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
4439 | case $cc_basename in | 4074 | case $cc_basename in |
4440 | f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) | 4075 | f77* | f90* | f95*) |
4441 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; | 4076 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; |
4442 | *) | 4077 | *) |
4443 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; | 4078 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; |
@@ -4494,11 +4129,9 @@ case $host_os in | |||
4494 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" | 4129 | _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" |
4495 | ;; | 4130 | ;; |
4496 | esac | 4131 | esac |
4497 | 4132 | AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) | |
4498 | AC_CACHE_CHECK([for $compiler option to produce PIC], | 4133 | _LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], |
4499 | [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], | 4134 | [How to pass a linker flag through the compiler]) |
4500 | [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) | ||
4501 | _LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) | ||
4502 | 4135 | ||
4503 | # | 4136 | # |
4504 | # Check to make sure the PIC flag actually works. | 4137 | # Check to make sure the PIC flag actually works. |
@@ -4517,8 +4150,6 @@ fi | |||
4517 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], | 4150 | _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], |
4518 | [Additional compiler flags for building library objects]) | 4151 | [Additional compiler flags for building library objects]) |
4519 | 4152 | ||
4520 | _LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], | ||
4521 | [How to pass a linker flag through the compiler]) | ||
4522 | # | 4153 | # |
4523 | # Check to make sure the static flag actually works. | 4154 | # Check to make sure the static flag actually works. |
4524 | # | 4155 | # |
@@ -4539,7 +4170,6 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], | |||
4539 | m4_defun([_LT_LINKER_SHLIBS], | 4170 | m4_defun([_LT_LINKER_SHLIBS], |
4540 | [AC_REQUIRE([LT_PATH_LD])dnl | 4171 | [AC_REQUIRE([LT_PATH_LD])dnl |
4541 | AC_REQUIRE([LT_PATH_NM])dnl | 4172 | AC_REQUIRE([LT_PATH_NM])dnl |
4542 | m4_require([_LT_PATH_MANIFEST_TOOL])dnl | ||
4543 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 4173 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
4544 | m4_require([_LT_DECL_EGREP])dnl | 4174 | m4_require([_LT_DECL_EGREP])dnl |
4545 | m4_require([_LT_DECL_SED])dnl | 4175 | m4_require([_LT_DECL_SED])dnl |
@@ -4548,40 +4178,30 @@ m4_require([_LT_TAG_COMPILER])dnl | |||
4548 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) | 4178 | AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) |
4549 | m4_if([$1], [CXX], [ | 4179 | m4_if([$1], [CXX], [ |
4550 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4180 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
4551 | _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | ||
4552 | case $host_os in | 4181 | case $host_os in |
4553 | aix[[4-9]]*) | 4182 | aix[[4-9]]*) |
4554 | # If we're using GNU nm, then we don't want the "-C" option. | 4183 | # If we're using GNU nm, then we don't want the "-C" option. |
4555 | # -C means demangle to AIX nm, but means don't demangle with GNU nm | 4184 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
4556 | # Also, AIX nm treats weak defined symbols like other global defined | ||
4557 | # symbols, whereas GNU nm marks them as "W". | ||
4558 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | 4185 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
4559 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' | 4186 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4560 | else | 4187 | else |
4561 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' | 4188 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4562 | fi | 4189 | fi |
4563 | ;; | 4190 | ;; |
4564 | pw32*) | 4191 | pw32*) |
4565 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" | 4192 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
4566 | ;; | 4193 | ;; |
4567 | cygwin* | mingw* | cegcc*) | 4194 | cygwin* | mingw* | cegcc*) |
4568 | case $cc_basename in | 4195 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
4569 | cl*) | 4196 | ;; |
4570 | _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | 4197 | linux* | k*bsd*-gnu) |
4571 | ;; | ||
4572 | *) | ||
4573 | _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' | ||
4574 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | ||
4575 | ;; | ||
4576 | esac | ||
4577 | ;; | ||
4578 | linux* | k*bsd*-gnu | gnu*) | ||
4579 | _LT_TAGVAR(link_all_deplibs, $1)=no | 4198 | _LT_TAGVAR(link_all_deplibs, $1)=no |
4580 | ;; | 4199 | ;; |
4581 | *) | 4200 | *) |
4582 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | 4201 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
4583 | ;; | 4202 | ;; |
4584 | esac | 4203 | esac |
4204 | _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | ||
4585 | ], [ | 4205 | ], [ |
4586 | runpath_var= | 4206 | runpath_var= |
4587 | _LT_TAGVAR(allow_undefined_flag, $1)= | 4207 | _LT_TAGVAR(allow_undefined_flag, $1)= |
@@ -4596,6 +4216,7 @@ m4_if([$1], [CXX], [ | |||
4596 | _LT_TAGVAR(hardcode_direct, $1)=no | 4216 | _LT_TAGVAR(hardcode_direct, $1)=no |
4597 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 4217 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
4598 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 4218 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4219 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
4599 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 4220 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
4600 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 4221 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
4601 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 4222 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
@@ -4640,39 +4261,13 @@ dnl Note also adjust exclude_expsyms for C++ above. | |||
4640 | openbsd*) | 4261 | openbsd*) |
4641 | with_gnu_ld=no | 4262 | with_gnu_ld=no |
4642 | ;; | 4263 | ;; |
4643 | linux* | k*bsd*-gnu | gnu*) | 4264 | linux* | k*bsd*-gnu) |
4644 | _LT_TAGVAR(link_all_deplibs, $1)=no | 4265 | _LT_TAGVAR(link_all_deplibs, $1)=no |
4645 | ;; | 4266 | ;; |
4646 | esac | 4267 | esac |
4647 | 4268 | ||
4648 | _LT_TAGVAR(ld_shlibs, $1)=yes | 4269 | _LT_TAGVAR(ld_shlibs, $1)=yes |
4649 | |||
4650 | # On some targets, GNU ld is compatible enough with the native linker | ||
4651 | # that we're better off using the native interface for both. | ||
4652 | lt_use_gnu_ld_interface=no | ||
4653 | if test "$with_gnu_ld" = yes; then | 4270 | if test "$with_gnu_ld" = yes; then |
4654 | case $host_os in | ||
4655 | aix*) | ||
4656 | # The AIX port of GNU ld has always aspired to compatibility | ||
4657 | # with the native linker. However, as the warning in the GNU ld | ||
4658 | # block says, versions before 2.19.5* couldn't really create working | ||
4659 | # shared libraries, regardless of the interface used. | ||
4660 | case `$LD -v 2>&1` in | ||
4661 | *\ \(GNU\ Binutils\)\ 2.19.5*) ;; | ||
4662 | *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; | ||
4663 | *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; | ||
4664 | *) | ||
4665 | lt_use_gnu_ld_interface=yes | ||
4666 | ;; | ||
4667 | esac | ||
4668 | ;; | ||
4669 | *) | ||
4670 | lt_use_gnu_ld_interface=yes | ||
4671 | ;; | ||
4672 | esac | ||
4673 | fi | ||
4674 | |||
4675 | if test "$lt_use_gnu_ld_interface" = yes; then | ||
4676 | # If archive_cmds runs LD, not CC, wlarc should be empty | 4271 | # If archive_cmds runs LD, not CC, wlarc should be empty |
4677 | wlarc='${wl}' | 4272 | wlarc='${wl}' |
4678 | 4273 | ||
@@ -4706,12 +4301,11 @@ dnl Note also adjust exclude_expsyms for C++ above. | |||
4706 | _LT_TAGVAR(ld_shlibs, $1)=no | 4301 | _LT_TAGVAR(ld_shlibs, $1)=no |
4707 | cat <<_LT_EOF 1>&2 | 4302 | cat <<_LT_EOF 1>&2 |
4708 | 4303 | ||
4709 | *** Warning: the GNU linker, at least up to release 2.19, is reported | 4304 | *** Warning: the GNU linker, at least up to release 2.9.1, is reported |
4710 | *** to be unable to reliably create shared libraries on AIX. | 4305 | *** to be unable to reliably create shared libraries on AIX. |
4711 | *** Therefore, libtool is disabling shared libraries support. If you | 4306 | *** Therefore, libtool is disabling shared libraries support. If you |
4712 | *** really care for shared libraries, you may want to install binutils | 4307 | *** really care for shared libraries, you may want to modify your PATH |
4713 | *** 2.20 or above, or modify your PATH so that a non-GNU linker is found. | 4308 | *** so that a non-GNU linker is found, and then restart. |
4714 | *** You will then need to restart the configuration process. | ||
4715 | 4309 | ||
4716 | _LT_EOF | 4310 | _LT_EOF |
4717 | fi | 4311 | fi |
@@ -4747,12 +4341,10 @@ _LT_EOF | |||
4747 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | 4341 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
4748 | # as there is no search path for DLLs. | 4342 | # as there is no search path for DLLs. |
4749 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 4343 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
4750 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | ||
4751 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 4344 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
4752 | _LT_TAGVAR(always_export_symbols, $1)=no | 4345 | _LT_TAGVAR(always_export_symbols, $1)=no |
4753 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | 4346 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
4754 | _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' | 4347 | _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' |
4755 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] | ||
4756 | 4348 | ||
4757 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | 4349 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4758 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | 4350 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
@@ -4770,11 +4362,6 @@ _LT_EOF | |||
4770 | fi | 4362 | fi |
4771 | ;; | 4363 | ;; |
4772 | 4364 | ||
4773 | haiku*) | ||
4774 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
4775 | _LT_TAGVAR(link_all_deplibs, $1)=yes | ||
4776 | ;; | ||
4777 | |||
4778 | interix[[3-9]]*) | 4365 | interix[[3-9]]*) |
4779 | _LT_TAGVAR(hardcode_direct, $1)=no | 4366 | _LT_TAGVAR(hardcode_direct, $1)=no |
4780 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 4367 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
@@ -4800,16 +4387,15 @@ _LT_EOF | |||
4800 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ | 4387 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
4801 | && test "$tmp_diet" = no | 4388 | && test "$tmp_diet" = no |
4802 | then | 4389 | then |
4803 | tmp_addflag=' $pic_flag' | 4390 | tmp_addflag= |
4804 | tmp_sharedflag='-shared' | 4391 | tmp_sharedflag='-shared' |
4805 | case $cc_basename,$host_cpu in | 4392 | case $cc_basename,$host_cpu in |
4806 | pgcc*) # Portland Group C compiler | 4393 | pgcc*) # Portland Group C compiler |
4807 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' | 4394 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4808 | tmp_addflag=' $pic_flag' | 4395 | tmp_addflag=' $pic_flag' |
4809 | ;; | 4396 | ;; |
4810 | pgf77* | pgf90* | pgf95* | pgfortran*) | 4397 | pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
4811 | # Portland Group f77 and f90 compilers | 4398 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4812 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' | ||
4813 | tmp_addflag=' $pic_flag -Mnomain' ;; | 4399 | tmp_addflag=' $pic_flag -Mnomain' ;; |
4814 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 | 4400 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
4815 | tmp_addflag=' -i_dynamic' ;; | 4401 | tmp_addflag=' -i_dynamic' ;; |
@@ -4820,17 +4406,13 @@ _LT_EOF | |||
4820 | lf95*) # Lahey Fortran 8.1 | 4406 | lf95*) # Lahey Fortran 8.1 |
4821 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 4407 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
4822 | tmp_sharedflag='--shared' ;; | 4408 | tmp_sharedflag='--shared' ;; |
4823 | xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) | 4409 | xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
4824 | tmp_sharedflag='-qmkshrobj' | 4410 | tmp_sharedflag='-qmkshrobj' |
4825 | tmp_addflag= ;; | 4411 | tmp_addflag= ;; |
4826 | nvcc*) # Cuda Compiler Driver 2.2 | ||
4827 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' | ||
4828 | _LT_TAGVAR(compiler_needs_object, $1)=yes | ||
4829 | ;; | ||
4830 | esac | 4412 | esac |
4831 | case `$CC -V 2>&1 | sed 5q` in | 4413 | case `$CC -V 2>&1 | sed 5q` in |
4832 | *Sun\ C*) # Sun C 5.9 | 4414 | *Sun\ C*) # Sun C 5.9 |
4833 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' | 4415 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4834 | _LT_TAGVAR(compiler_needs_object, $1)=yes | 4416 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
4835 | tmp_sharedflag='-G' ;; | 4417 | tmp_sharedflag='-G' ;; |
4836 | *Sun\ F*) # Sun Fortran 8.3 | 4418 | *Sun\ F*) # Sun Fortran 8.3 |
@@ -4846,16 +4428,17 @@ _LT_EOF | |||
4846 | fi | 4428 | fi |
4847 | 4429 | ||
4848 | case $cc_basename in | 4430 | case $cc_basename in |
4849 | xlf* | bgf* | bgxlf* | mpixlf*) | 4431 | xlf*) |
4850 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself | 4432 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
4851 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' | 4433 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
4852 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 4434 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
4853 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' | 4435 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
4436 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' | ||
4854 | if test "x$supports_anon_versioning" = xyes; then | 4437 | if test "x$supports_anon_versioning" = xyes; then |
4855 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ | 4438 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
4856 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | 4439 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
4857 | echo "local: *; };" >> $output_objdir/$libname.ver~ | 4440 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
4858 | $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' | 4441 | $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
4859 | fi | 4442 | fi |
4860 | ;; | 4443 | ;; |
4861 | esac | 4444 | esac |
@@ -4869,8 +4452,8 @@ _LT_EOF | |||
4869 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | 4452 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4870 | wlarc= | 4453 | wlarc= |
4871 | else | 4454 | else |
4872 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4455 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4873 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | 4456 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4874 | fi | 4457 | fi |
4875 | ;; | 4458 | ;; |
4876 | 4459 | ||
@@ -4888,8 +4471,8 @@ _LT_EOF | |||
4888 | 4471 | ||
4889 | _LT_EOF | 4472 | _LT_EOF |
4890 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4473 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
4891 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4474 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4892 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | 4475 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4893 | else | 4476 | else |
4894 | _LT_TAGVAR(ld_shlibs, $1)=no | 4477 | _LT_TAGVAR(ld_shlibs, $1)=no |
4895 | fi | 4478 | fi |
@@ -4935,8 +4518,8 @@ _LT_EOF | |||
4935 | 4518 | ||
4936 | *) | 4519 | *) |
4937 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then | 4520 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
4938 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | 4521 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4939 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | 4522 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4940 | else | 4523 | else |
4941 | _LT_TAGVAR(ld_shlibs, $1)=no | 4524 | _LT_TAGVAR(ld_shlibs, $1)=no |
4942 | fi | 4525 | fi |
@@ -4976,10 +4559,8 @@ _LT_EOF | |||
4976 | else | 4559 | else |
4977 | # If we're using GNU nm, then we don't want the "-C" option. | 4560 | # If we're using GNU nm, then we don't want the "-C" option. |
4978 | # -C means demangle to AIX nm, but means don't demangle with GNU nm | 4561 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
4979 | # Also, AIX nm treats weak defined symbols like other global | ||
4980 | # defined symbols, whereas GNU nm marks them as "W". | ||
4981 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then | 4562 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
4982 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' | 4563 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4983 | else | 4564 | else |
4984 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' | 4565 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4985 | fi | 4566 | fi |
@@ -5067,9 +4648,9 @@ _LT_EOF | |||
5067 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 4648 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
5068 | # Determine the default libpath from the value encoded in an | 4649 | # Determine the default libpath from the value encoded in an |
5069 | # empty executable. | 4650 | # empty executable. |
5070 | _LT_SYS_MODULE_PATH_AIX([$1]) | 4651 | _LT_SYS_MODULE_PATH_AIX |
5071 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 4652 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
5072 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 4653 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
5073 | else | 4654 | else |
5074 | if test "$host_cpu" = ia64; then | 4655 | if test "$host_cpu" = ia64; then |
5075 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' | 4656 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
@@ -5078,19 +4659,14 @@ _LT_EOF | |||
5078 | else | 4659 | else |
5079 | # Determine the default libpath from the value encoded in an | 4660 | # Determine the default libpath from the value encoded in an |
5080 | # empty executable. | 4661 | # empty executable. |
5081 | _LT_SYS_MODULE_PATH_AIX([$1]) | 4662 | _LT_SYS_MODULE_PATH_AIX |
5082 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 4663 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
5083 | # Warning - without using the other run time loading flags, | 4664 | # Warning - without using the other run time loading flags, |
5084 | # -berok will link without error, but may produce a broken library. | 4665 | # -berok will link without error, but may produce a broken library. |
5085 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' | 4666 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
5086 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' | 4667 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
5087 | if test "$with_gnu_ld" = yes; then | 4668 | # Exported symbols can be pulled into shared objects from archives |
5088 | # We only use this code for GNU lds that support --whole-archive. | 4669 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
5089 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | ||
5090 | else | ||
5091 | # Exported symbols can be pulled into shared objects from archives | ||
5092 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | ||
5093 | fi | ||
5094 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 4670 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
5095 | # This is similar to how AIX traditionally builds its shared libraries. | 4671 | # This is similar to how AIX traditionally builds its shared libraries. |
5096 | _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' | 4672 | _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
@@ -5122,64 +4698,20 @@ _LT_EOF | |||
5122 | # Microsoft Visual C++. | 4698 | # Microsoft Visual C++. |
5123 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 4699 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
5124 | # no search path for DLLs. | 4700 | # no search path for DLLs. |
5125 | case $cc_basename in | 4701 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' |
5126 | cl*) | 4702 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
5127 | # Native MSVC | 4703 | # Tell ltmain to make .lib files, not .a files. |
5128 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | 4704 | libext=lib |
5129 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 4705 | # Tell ltmain to make .dll files, not .so files. |
5130 | _LT_TAGVAR(always_export_symbols, $1)=yes | 4706 | shrext_cmds=".dll" |
5131 | _LT_TAGVAR(file_list_spec, $1)='@' | 4707 | # FIXME: Setting linknames here is a bad hack. |
5132 | # Tell ltmain to make .lib files, not .a files. | 4708 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' |
5133 | libext=lib | 4709 | # The linker will automatically build a .lib file if we build a DLL. |
5134 | # Tell ltmain to make .dll files, not .so files. | 4710 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
5135 | shrext_cmds=".dll" | 4711 | # FIXME: Should let the user specify the lib program. |
5136 | # FIXME: Setting linknames here is a bad hack. | 4712 | _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' |
5137 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | 4713 | _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' |
5138 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | 4714 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
5139 | sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | ||
5140 | else | ||
5141 | sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | ||
5142 | fi~ | ||
5143 | $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | ||
5144 | linknames=' | ||
5145 | # The linker will not automatically build a static lib if we build a DLL. | ||
5146 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
5147 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
5148 | _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' | ||
5149 | _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' | ||
5150 | # Don't use ranlib | ||
5151 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | ||
5152 | _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ | ||
5153 | lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
5154 | case $lt_outputfile in | ||
5155 | *.exe|*.EXE) ;; | ||
5156 | *) | ||
5157 | lt_outputfile="$lt_outputfile.exe" | ||
5158 | lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
5159 | ;; | ||
5160 | esac~ | ||
5161 | if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
5162 | $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
5163 | $RM "$lt_outputfile.manifest"; | ||
5164 | fi' | ||
5165 | ;; | ||
5166 | *) | ||
5167 | # Assume MSVC wrapper | ||
5168 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | ||
5169 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
5170 | # Tell ltmain to make .lib files, not .a files. | ||
5171 | libext=lib | ||
5172 | # Tell ltmain to make .dll files, not .so files. | ||
5173 | shrext_cmds=".dll" | ||
5174 | # FIXME: Setting linknames here is a bad hack. | ||
5175 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' | ||
5176 | # The linker will automatically build a .lib file if we build a DLL. | ||
5177 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
5178 | # FIXME: Should let the user specify the lib program. | ||
5179 | _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' | ||
5180 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
5181 | ;; | ||
5182 | esac | ||
5183 | ;; | 4715 | ;; |
5184 | 4716 | ||
5185 | darwin* | rhapsody*) | 4717 | darwin* | rhapsody*) |
@@ -5192,6 +4724,10 @@ _LT_EOF | |||
5192 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 4724 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
5193 | ;; | 4725 | ;; |
5194 | 4726 | ||
4727 | freebsd1*) | ||
4728 | _LT_TAGVAR(ld_shlibs, $1)=no | ||
4729 | ;; | ||
4730 | |||
5195 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor | 4731 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
5196 | # support. Future versions do this automatically, but an explicit c++rt0.o | 4732 | # support. Future versions do this automatically, but an explicit c++rt0.o |
5197 | # does not break anything, and helps significantly (at the cost of a little | 4733 | # does not break anything, and helps significantly (at the cost of a little |
@@ -5204,7 +4740,7 @@ _LT_EOF | |||
5204 | ;; | 4740 | ;; |
5205 | 4741 | ||
5206 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. | 4742 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
5207 | freebsd2.*) | 4743 | freebsd2*) |
5208 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | 4744 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
5209 | _LT_TAGVAR(hardcode_direct, $1)=yes | 4745 | _LT_TAGVAR(hardcode_direct, $1)=yes |
5210 | _LT_TAGVAR(hardcode_minus_L, $1)=yes | 4746 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
@@ -5213,7 +4749,7 @@ _LT_EOF | |||
5213 | 4749 | ||
5214 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | 4750 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
5215 | freebsd* | dragonfly*) | 4751 | freebsd* | dragonfly*) |
5216 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | 4752 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
5217 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | 4753 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
5218 | _LT_TAGVAR(hardcode_direct, $1)=yes | 4754 | _LT_TAGVAR(hardcode_direct, $1)=yes |
5219 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no | 4755 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
@@ -5221,7 +4757,7 @@ _LT_EOF | |||
5221 | 4757 | ||
5222 | hpux9*) | 4758 | hpux9*) |
5223 | if test "$GCC" = yes; then | 4759 | if test "$GCC" = yes; then |
5224 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 4760 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
5225 | else | 4761 | else |
5226 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 4762 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
5227 | fi | 4763 | fi |
@@ -5236,13 +4772,14 @@ _LT_EOF | |||
5236 | ;; | 4772 | ;; |
5237 | 4773 | ||
5238 | hpux10*) | 4774 | hpux10*) |
5239 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 4775 | if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
5240 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 4776 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
5241 | else | 4777 | else |
5242 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' | 4778 | _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' |
5243 | fi | 4779 | fi |
5244 | if test "$with_gnu_ld" = no; then | 4780 | if test "$with_gnu_ld" = no; then |
5245 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' | 4781 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
4782 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' | ||
5246 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: | 4783 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
5247 | _LT_TAGVAR(hardcode_direct, $1)=yes | 4784 | _LT_TAGVAR(hardcode_direct, $1)=yes |
5248 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes | 4785 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
@@ -5254,16 +4791,16 @@ _LT_EOF | |||
5254 | ;; | 4791 | ;; |
5255 | 4792 | ||
5256 | hpux11*) | 4793 | hpux11*) |
5257 | if test "$GCC" = yes && test "$with_gnu_ld" = no; then | 4794 | if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
5258 | case $host_cpu in | 4795 | case $host_cpu in |
5259 | hppa*64*) | 4796 | hppa*64*) |
5260 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 4797 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
5261 | ;; | 4798 | ;; |
5262 | ia64*) | 4799 | ia64*) |
5263 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 4800 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
5264 | ;; | 4801 | ;; |
5265 | *) | 4802 | *) |
5266 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 4803 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
5267 | ;; | 4804 | ;; |
5268 | esac | 4805 | esac |
5269 | else | 4806 | else |
@@ -5275,14 +4812,7 @@ _LT_EOF | |||
5275 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 4812 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
5276 | ;; | 4813 | ;; |
5277 | *) | 4814 | *) |
5278 | m4_if($1, [], [ | 4815 | _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
5279 | # Older versions of the 11.00 compiler do not understand -b yet | ||
5280 | # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) | ||
5281 | _LT_LINKER_OPTION([if $CC understands -b], | ||
5282 | _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], | ||
5283 | [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], | ||
5284 | [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], | ||
5285 | [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) | ||
5286 | ;; | 4816 | ;; |
5287 | esac | 4817 | esac |
5288 | fi | 4818 | fi |
@@ -5310,34 +4840,19 @@ _LT_EOF | |||
5310 | 4840 | ||
5311 | irix5* | irix6* | nonstopux*) | 4841 | irix5* | irix6* | nonstopux*) |
5312 | if test "$GCC" = yes; then | 4842 | if test "$GCC" = yes; then |
5313 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | 4843 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
5314 | # Try to use the -exported_symbol ld option, if it does not | 4844 | # Try to use the -exported_symbol ld option, if it does not |
5315 | # work, assume that -exports_file does not work either and | 4845 | # work, assume that -exports_file does not work either and |
5316 | # implicitly export all symbols. | 4846 | # implicitly export all symbols. |
5317 | # This should be the same for all languages, so no per-tag cache variable. | 4847 | save_LDFLAGS="$LDFLAGS" |
5318 | AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], | 4848 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" |
5319 | [lt_cv_irix_exported_symbol], | 4849 | AC_LINK_IFELSE(int foo(void) {}, |
5320 | [save_LDFLAGS="$LDFLAGS" | 4850 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' |
5321 | LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" | 4851 | ) |
5322 | AC_LINK_IFELSE( | 4852 | LDFLAGS="$save_LDFLAGS" |
5323 | [AC_LANG_SOURCE( | ||
5324 | [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], | ||
5325 | [C++], [[int foo (void) { return 0; }]], | ||
5326 | [Fortran 77], [[ | ||
5327 | subroutine foo | ||
5328 | end]], | ||
5329 | [Fortran], [[ | ||
5330 | subroutine foo | ||
5331 | end]])])], | ||
5332 | [lt_cv_irix_exported_symbol=yes], | ||
5333 | [lt_cv_irix_exported_symbol=no]) | ||
5334 | LDFLAGS="$save_LDFLAGS"]) | ||
5335 | if test "$lt_cv_irix_exported_symbol" = yes; then | ||
5336 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' | ||
5337 | fi | ||
5338 | else | 4853 | else |
5339 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 4854 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
5340 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' | 4855 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' |
5341 | fi | 4856 | fi |
5342 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' | 4857 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
5343 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 4858 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
@@ -5399,17 +4914,17 @@ _LT_EOF | |||
5399 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 4914 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
5400 | _LT_TAGVAR(hardcode_minus_L, $1)=yes | 4915 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
5401 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 4916 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
5402 | _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' | 4917 | _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' |
5403 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' | 4918 | _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' |
5404 | ;; | 4919 | ;; |
5405 | 4920 | ||
5406 | osf3*) | 4921 | osf3*) |
5407 | if test "$GCC" = yes; then | 4922 | if test "$GCC" = yes; then |
5408 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 4923 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
5409 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | 4924 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
5410 | else | 4925 | else |
5411 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 4926 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
5412 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 4927 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
5413 | fi | 4928 | fi |
5414 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' | 4929 | _LT_TAGVAR(archive_cmds_need_lc, $1)='no' |
5415 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 4930 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
@@ -5419,13 +4934,13 @@ _LT_EOF | |||
5419 | osf4* | osf5*) # as osf3* with the addition of -msym flag | 4934 | osf4* | osf5*) # as osf3* with the addition of -msym flag |
5420 | if test "$GCC" = yes; then | 4935 | if test "$GCC" = yes; then |
5421 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 4936 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
5422 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | 4937 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
5423 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 4938 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
5424 | else | 4939 | else |
5425 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 4940 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
5426 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 4941 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
5427 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ | 4942 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ |
5428 | $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' | 4943 | $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' |
5429 | 4944 | ||
5430 | # Both c and cxx compiler support -rpath directly | 4945 | # Both c and cxx compiler support -rpath directly |
5431 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' | 4946 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
@@ -5438,9 +4953,9 @@ _LT_EOF | |||
5438 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' | 4953 | _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' |
5439 | if test "$GCC" = yes; then | 4954 | if test "$GCC" = yes; then |
5440 | wlarc='${wl}' | 4955 | wlarc='${wl}' |
5441 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 4956 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
5442 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 4957 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
5443 | $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' | 4958 | $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' |
5444 | else | 4959 | else |
5445 | case `$CC -V 2>&1` in | 4960 | case `$CC -V 2>&1` in |
5446 | *"Compilers 5.0"*) | 4961 | *"Compilers 5.0"*) |
@@ -5616,38 +5131,36 @@ x|xyes) | |||
5616 | # Test whether the compiler implicitly links with -lc since on some | 5131 | # Test whether the compiler implicitly links with -lc since on some |
5617 | # systems, -lgcc has to come before -lc. If gcc already passes -lc | 5132 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
5618 | # to ld, don't add -lc before -lgcc. | 5133 | # to ld, don't add -lc before -lgcc. |
5619 | AC_CACHE_CHECK([whether -lc should be explicitly linked in], | 5134 | AC_MSG_CHECKING([whether -lc should be explicitly linked in]) |
5620 | [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), | 5135 | $RM conftest* |
5621 | [$RM conftest* | 5136 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
5622 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext | 5137 | |
5623 | 5138 | if AC_TRY_EVAL(ac_compile) 2>conftest.err; then | |
5624 | if AC_TRY_EVAL(ac_compile) 2>conftest.err; then | 5139 | soname=conftest |
5625 | soname=conftest | 5140 | lib=conftest |
5626 | lib=conftest | 5141 | libobjs=conftest.$ac_objext |
5627 | libobjs=conftest.$ac_objext | 5142 | deplibs= |
5628 | deplibs= | 5143 | wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) |
5629 | wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) | 5144 | pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) |
5630 | pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) | 5145 | compiler_flags=-v |
5631 | compiler_flags=-v | 5146 | linker_flags=-v |
5632 | linker_flags=-v | 5147 | verstring= |
5633 | verstring= | 5148 | output_objdir=. |
5634 | output_objdir=. | 5149 | libname=conftest |
5635 | libname=conftest | 5150 | lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) |
5636 | lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) | 5151 | _LT_TAGVAR(allow_undefined_flag, $1)= |
5637 | _LT_TAGVAR(allow_undefined_flag, $1)= | 5152 | if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) |
5638 | if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) | 5153 | then |
5639 | then | 5154 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
5640 | lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no | 5155 | else |
5641 | else | 5156 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
5642 | lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 5157 | fi |
5643 | fi | 5158 | _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag |
5644 | _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag | 5159 | else |
5645 | else | 5160 | cat conftest.err 1>&5 |
5646 | cat conftest.err 1>&5 | 5161 | fi |
5647 | fi | 5162 | $RM conftest* |
5648 | $RM conftest* | 5163 | AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) |
5649 | ]) | ||
5650 | _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) | ||
5651 | ;; | 5164 | ;; |
5652 | esac | 5165 | esac |
5653 | fi | 5166 | fi |
@@ -5684,6 +5197,9 @@ _LT_TAGDECL([], [no_undefined_flag], [1], | |||
5684 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], | 5197 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
5685 | [Flag to hardcode $libdir into a binary during linking. | 5198 | [Flag to hardcode $libdir into a binary during linking. |
5686 | This must work even if $libdir does not exist]) | 5199 | This must work even if $libdir does not exist]) |
5200 | _LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], | ||
5201 | [[If ld is used when linking, flag to hardcode $libdir into a binary | ||
5202 | during linking. This must work even if $libdir does not exist]]) | ||
5687 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], | 5203 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
5688 | [Whether we need a single "-rpath" flag with a separated argument]) | 5204 | [Whether we need a single "-rpath" flag with a separated argument]) |
5689 | _LT_TAGDECL([], [hardcode_direct], [0], | 5205 | _LT_TAGDECL([], [hardcode_direct], [0], |
@@ -5709,6 +5225,8 @@ _LT_TAGDECL([], [inherit_rpath], [0], | |||
5709 | to runtime path list]) | 5225 | to runtime path list]) |
5710 | _LT_TAGDECL([], [link_all_deplibs], [0], | 5226 | _LT_TAGDECL([], [link_all_deplibs], [0], |
5711 | [Whether libtool must link a program against all its dependency libraries]) | 5227 | [Whether libtool must link a program against all its dependency libraries]) |
5228 | _LT_TAGDECL([], [fix_srcfile_path], [1], | ||
5229 | [Fix the shell variable $srcfile for the compiler]) | ||
5712 | _LT_TAGDECL([], [always_export_symbols], [0], | 5230 | _LT_TAGDECL([], [always_export_symbols], [0], |
5713 | [Set to "yes" if exported symbols are required]) | 5231 | [Set to "yes" if exported symbols are required]) |
5714 | _LT_TAGDECL([], [export_symbols_cmds], [2], | 5232 | _LT_TAGDECL([], [export_symbols_cmds], [2], |
@@ -5719,8 +5237,6 @@ _LT_TAGDECL([], [include_expsyms], [1], | |||
5719 | [Symbols that must always be exported]) | 5237 | [Symbols that must always be exported]) |
5720 | _LT_TAGDECL([], [prelink_cmds], [2], | 5238 | _LT_TAGDECL([], [prelink_cmds], [2], |
5721 | [Commands necessary for linking programs (against libraries) with templates]) | 5239 | [Commands necessary for linking programs (against libraries) with templates]) |
5722 | _LT_TAGDECL([], [postlink_cmds], [2], | ||
5723 | [Commands necessary for finishing linking programs]) | ||
5724 | _LT_TAGDECL([], [file_list_spec], [1], | 5240 | _LT_TAGDECL([], [file_list_spec], [1], |
5725 | [Specify filename containing input files]) | 5241 | [Specify filename containing input files]) |
5726 | dnl FIXME: Not yet implemented | 5242 | dnl FIXME: Not yet implemented |
@@ -5814,15 +5330,14 @@ CC="$lt_save_CC" | |||
5814 | ])# _LT_LANG_C_CONFIG | 5330 | ])# _LT_LANG_C_CONFIG |
5815 | 5331 | ||
5816 | 5332 | ||
5817 | # _LT_LANG_CXX_CONFIG([TAG]) | 5333 | # _LT_PROG_CXX |
5818 | # -------------------------- | 5334 | # ------------ |
5819 | # Ensure that the configuration variables for a C++ compiler are suitably | 5335 | # Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ |
5820 | # defined. These variables are subsequently used by _LT_CONFIG to write | 5336 | # compiler, we have our own version here. |
5821 | # the compiler configuration to `libtool'. | 5337 | m4_defun([_LT_PROG_CXX], |
5822 | m4_defun([_LT_LANG_CXX_CONFIG], | 5338 | [ |
5823 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 5339 | pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) |
5824 | m4_require([_LT_DECL_EGREP])dnl | 5340 | AC_PROG_CXX |
5825 | m4_require([_LT_PATH_MANIFEST_TOOL])dnl | ||
5826 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && | 5341 | if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
5827 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | 5342 | ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
5828 | (test "X$CXX" != "Xg++"))) ; then | 5343 | (test "X$CXX" != "Xg++"))) ; then |
@@ -5830,6 +5345,22 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" && | |||
5830 | else | 5345 | else |
5831 | _lt_caught_CXX_error=yes | 5346 | _lt_caught_CXX_error=yes |
5832 | fi | 5347 | fi |
5348 | popdef([AC_MSG_ERROR]) | ||
5349 | ])# _LT_PROG_CXX | ||
5350 | |||
5351 | dnl aclocal-1.4 backwards compatibility: | ||
5352 | dnl AC_DEFUN([_LT_PROG_CXX], []) | ||
5353 | |||
5354 | |||
5355 | # _LT_LANG_CXX_CONFIG([TAG]) | ||
5356 | # -------------------------- | ||
5357 | # Ensure that the configuration variables for a C++ compiler are suitably | ||
5358 | # defined. These variables are subsequently used by _LT_CONFIG to write | ||
5359 | # the compiler configuration to `libtool'. | ||
5360 | m4_defun([_LT_LANG_CXX_CONFIG], | ||
5361 | [AC_REQUIRE([_LT_PROG_CXX])dnl | ||
5362 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | ||
5363 | m4_require([_LT_DECL_EGREP])dnl | ||
5833 | 5364 | ||
5834 | AC_LANG_PUSH(C++) | 5365 | AC_LANG_PUSH(C++) |
5835 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 5366 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
@@ -5841,6 +5372,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= | |||
5841 | _LT_TAGVAR(hardcode_direct, $1)=no | 5372 | _LT_TAGVAR(hardcode_direct, $1)=no |
5842 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 5373 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
5843 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 5374 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
5375 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
5844 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 5376 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
5845 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 5377 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
5846 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | 5378 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
@@ -5850,8 +5382,6 @@ _LT_TAGVAR(module_cmds, $1)= | |||
5850 | _LT_TAGVAR(module_expsym_cmds, $1)= | 5382 | _LT_TAGVAR(module_expsym_cmds, $1)= |
5851 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 5383 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
5852 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 5384 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
5853 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
5854 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
5855 | _LT_TAGVAR(no_undefined_flag, $1)= | 5385 | _LT_TAGVAR(no_undefined_flag, $1)= |
5856 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 5386 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
5857 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 5387 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
@@ -5883,7 +5413,6 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
5883 | 5413 | ||
5884 | # Allow CC to be a program name with arguments. | 5414 | # Allow CC to be a program name with arguments. |
5885 | lt_save_CC=$CC | 5415 | lt_save_CC=$CC |
5886 | lt_save_CFLAGS=$CFLAGS | ||
5887 | lt_save_LD=$LD | 5416 | lt_save_LD=$LD |
5888 | lt_save_GCC=$GCC | 5417 | lt_save_GCC=$GCC |
5889 | GCC=$GXX | 5418 | GCC=$GXX |
@@ -5901,7 +5430,6 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
5901 | fi | 5430 | fi |
5902 | test -z "${LDCXX+set}" || LD=$LDCXX | 5431 | test -z "${LDCXX+set}" || LD=$LDCXX |
5903 | CC=${CXX-"c++"} | 5432 | CC=${CXX-"c++"} |
5904 | CFLAGS=$CXXFLAGS | ||
5905 | compiler=$CC | 5433 | compiler=$CC |
5906 | _LT_TAGVAR(compiler, $1)=$CC | 5434 | _LT_TAGVAR(compiler, $1)=$CC |
5907 | _LT_CC_BASENAME([$compiler]) | 5435 | _LT_CC_BASENAME([$compiler]) |
@@ -5923,8 +5451,8 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
5923 | # Check if GNU C++ uses GNU ld as the underlying linker, since the | 5451 | # Check if GNU C++ uses GNU ld as the underlying linker, since the |
5924 | # archiving commands below assume that GNU ld is being used. | 5452 | # archiving commands below assume that GNU ld is being used. |
5925 | if test "$with_gnu_ld" = yes; then | 5453 | if test "$with_gnu_ld" = yes; then |
5926 | _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' | 5454 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' |
5927 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' | 5455 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
5928 | 5456 | ||
5929 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5457 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
5930 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 5458 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
@@ -5956,7 +5484,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
5956 | # Commands to make compiler produce verbose output that lists | 5484 | # Commands to make compiler produce verbose output that lists |
5957 | # what "hidden" libraries, object files and flags are used when | 5485 | # what "hidden" libraries, object files and flags are used when |
5958 | # linking a shared library. | 5486 | # linking a shared library. |
5959 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 5487 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
5960 | 5488 | ||
5961 | else | 5489 | else |
5962 | GXX=no | 5490 | GXX=no |
@@ -6065,10 +5593,10 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6065 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' | 5593 | _LT_TAGVAR(allow_undefined_flag, $1)='-berok' |
6066 | # Determine the default libpath from the value encoded in an empty | 5594 | # Determine the default libpath from the value encoded in an empty |
6067 | # executable. | 5595 | # executable. |
6068 | _LT_SYS_MODULE_PATH_AIX([$1]) | 5596 | _LT_SYS_MODULE_PATH_AIX |
6069 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 5597 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
6070 | 5598 | ||
6071 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" | 5599 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
6072 | else | 5600 | else |
6073 | if test "$host_cpu" = ia64; then | 5601 | if test "$host_cpu" = ia64; then |
6074 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' | 5602 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' |
@@ -6077,19 +5605,14 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6077 | else | 5605 | else |
6078 | # Determine the default libpath from the value encoded in an | 5606 | # Determine the default libpath from the value encoded in an |
6079 | # empty executable. | 5607 | # empty executable. |
6080 | _LT_SYS_MODULE_PATH_AIX([$1]) | 5608 | _LT_SYS_MODULE_PATH_AIX |
6081 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" | 5609 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" |
6082 | # Warning - without using the other run time loading flags, | 5610 | # Warning - without using the other run time loading flags, |
6083 | # -berok will link without error, but may produce a broken library. | 5611 | # -berok will link without error, but may produce a broken library. |
6084 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' | 5612 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' |
6085 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' | 5613 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' |
6086 | if test "$with_gnu_ld" = yes; then | 5614 | # Exported symbols can be pulled into shared objects from archives |
6087 | # We only use this code for GNU lds that support --whole-archive. | 5615 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' |
6088 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | ||
6089 | else | ||
6090 | # Exported symbols can be pulled into shared objects from archives | ||
6091 | _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' | ||
6092 | fi | ||
6093 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes | 5616 | _LT_TAGVAR(archive_cmds_need_lc, $1)=yes |
6094 | # This is similar to how AIX traditionally builds its shared | 5617 | # This is similar to how AIX traditionally builds its shared |
6095 | # libraries. | 5618 | # libraries. |
@@ -6119,75 +5642,28 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6119 | ;; | 5642 | ;; |
6120 | 5643 | ||
6121 | cygwin* | mingw* | pw32* | cegcc*) | 5644 | cygwin* | mingw* | pw32* | cegcc*) |
6122 | case $GXX,$cc_basename in | 5645 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
6123 | ,cl* | no,cl*) | 5646 | # as there is no search path for DLLs. |
6124 | # Native MSVC | 5647 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
6125 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 5648 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported |
6126 | # no search path for DLLs. | 5649 | _LT_TAGVAR(always_export_symbols, $1)=no |
6127 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' | 5650 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
6128 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | 5651 | |
6129 | _LT_TAGVAR(always_export_symbols, $1)=yes | 5652 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
6130 | _LT_TAGVAR(file_list_spec, $1)='@' | 5653 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
6131 | # Tell ltmain to make .lib files, not .a files. | 5654 | # If the export-symbols file already is a .def file (1st line |
6132 | libext=lib | 5655 | # is EXPORTS), use it as is; otherwise, prepend... |
6133 | # Tell ltmain to make .dll files, not .so files. | 5656 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
6134 | shrext_cmds=".dll" | 5657 | cp $export_symbols $output_objdir/$soname.def; |
6135 | # FIXME: Setting linknames here is a bad hack. | 5658 | else |
6136 | _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' | 5659 | echo EXPORTS > $output_objdir/$soname.def; |
6137 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | 5660 | cat $export_symbols >> $output_objdir/$soname.def; |
6138 | $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; | 5661 | fi~ |
6139 | else | 5662 | $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
6140 | $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; | 5663 | else |
6141 | fi~ | 5664 | _LT_TAGVAR(ld_shlibs, $1)=no |
6142 | $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ | 5665 | fi |
6143 | linknames=' | 5666 | ;; |
6144 | # The linker will not automatically build a static lib if we build a DLL. | ||
6145 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' | ||
6146 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
6147 | # Don't use ranlib | ||
6148 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' | ||
6149 | _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ | ||
6150 | lt_tool_outputfile="@TOOL_OUTPUT@"~ | ||
6151 | case $lt_outputfile in | ||
6152 | *.exe|*.EXE) ;; | ||
6153 | *) | ||
6154 | lt_outputfile="$lt_outputfile.exe" | ||
6155 | lt_tool_outputfile="$lt_tool_outputfile.exe" | ||
6156 | ;; | ||
6157 | esac~ | ||
6158 | func_to_tool_file "$lt_outputfile"~ | ||
6159 | if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then | ||
6160 | $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; | ||
6161 | $RM "$lt_outputfile.manifest"; | ||
6162 | fi' | ||
6163 | ;; | ||
6164 | *) | ||
6165 | # g++ | ||
6166 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | ||
6167 | # as there is no search path for DLLs. | ||
6168 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | ||
6169 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' | ||
6170 | _LT_TAGVAR(allow_undefined_flag, $1)=unsupported | ||
6171 | _LT_TAGVAR(always_export_symbols, $1)=no | ||
6172 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | ||
6173 | |||
6174 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then | ||
6175 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
6176 | # If the export-symbols file already is a .def file (1st line | ||
6177 | # is EXPORTS), use it as is; otherwise, prepend... | ||
6178 | _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then | ||
6179 | cp $export_symbols $output_objdir/$soname.def; | ||
6180 | else | ||
6181 | echo EXPORTS > $output_objdir/$soname.def; | ||
6182 | cat $export_symbols >> $output_objdir/$soname.def; | ||
6183 | fi~ | ||
6184 | $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | ||
6185 | else | ||
6186 | _LT_TAGVAR(ld_shlibs, $1)=no | ||
6187 | fi | ||
6188 | ;; | ||
6189 | esac | ||
6190 | ;; | ||
6191 | darwin* | rhapsody*) | 5667 | darwin* | rhapsody*) |
6192 | _LT_DARWIN_LINKER_FEATURES($1) | 5668 | _LT_DARWIN_LINKER_FEATURES($1) |
6193 | ;; | 5669 | ;; |
@@ -6210,7 +5686,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6210 | esac | 5686 | esac |
6211 | ;; | 5687 | ;; |
6212 | 5688 | ||
6213 | freebsd2.*) | 5689 | freebsd[[12]]*) |
6214 | # C++ shared libraries reported to be fairly broken before | 5690 | # C++ shared libraries reported to be fairly broken before |
6215 | # switch to ELF | 5691 | # switch to ELF |
6216 | _LT_TAGVAR(ld_shlibs, $1)=no | 5692 | _LT_TAGVAR(ld_shlibs, $1)=no |
@@ -6226,9 +5702,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6226 | _LT_TAGVAR(ld_shlibs, $1)=yes | 5702 | _LT_TAGVAR(ld_shlibs, $1)=yes |
6227 | ;; | 5703 | ;; |
6228 | 5704 | ||
6229 | haiku*) | 5705 | gnu*) |
6230 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | ||
6231 | _LT_TAGVAR(link_all_deplibs, $1)=yes | ||
6232 | ;; | 5706 | ;; |
6233 | 5707 | ||
6234 | hpux9*) | 5708 | hpux9*) |
@@ -6255,11 +5729,11 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6255 | # explicitly linking system object files so we need to strip them | 5729 | # explicitly linking system object files so we need to strip them |
6256 | # from the output so that they don't get included in the library | 5730 | # from the output so that they don't get included in the library |
6257 | # dependencies. | 5731 | # dependencies. |
6258 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | 5732 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
6259 | ;; | 5733 | ;; |
6260 | *) | 5734 | *) |
6261 | if test "$GXX" = yes; then | 5735 | if test "$GXX" = yes; then |
6262 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' | 5736 | _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
6263 | else | 5737 | else |
6264 | # FIXME: insert proper C++ library support | 5738 | # FIXME: insert proper C++ library support |
6265 | _LT_TAGVAR(ld_shlibs, $1)=no | 5739 | _LT_TAGVAR(ld_shlibs, $1)=no |
@@ -6320,7 +5794,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6320 | # explicitly linking system object files so we need to strip them | 5794 | # explicitly linking system object files so we need to strip them |
6321 | # from the output so that they don't get included in the library | 5795 | # from the output so that they don't get included in the library |
6322 | # dependencies. | 5796 | # dependencies. |
6323 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | 5797 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
6324 | ;; | 5798 | ;; |
6325 | *) | 5799 | *) |
6326 | if test "$GXX" = yes; then | 5800 | if test "$GXX" = yes; then |
@@ -6330,10 +5804,10 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6330 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 5804 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
6331 | ;; | 5805 | ;; |
6332 | ia64*) | 5806 | ia64*) |
6333 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 5807 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
6334 | ;; | 5808 | ;; |
6335 | *) | 5809 | *) |
6336 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 5810 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
6337 | ;; | 5811 | ;; |
6338 | esac | 5812 | esac |
6339 | fi | 5813 | fi |
@@ -6363,7 +5837,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6363 | case $cc_basename in | 5837 | case $cc_basename in |
6364 | CC*) | 5838 | CC*) |
6365 | # SGI C++ | 5839 | # SGI C++ |
6366 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 5840 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
6367 | 5841 | ||
6368 | # Archives containing C++ object files must be created using | 5842 | # Archives containing C++ object files must be created using |
6369 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is | 5843 | # "CC -ar", where "CC" is the IRIX C++ compiler. This is |
@@ -6374,9 +5848,9 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6374 | *) | 5848 | *) |
6375 | if test "$GXX" = yes; then | 5849 | if test "$GXX" = yes; then |
6376 | if test "$with_gnu_ld" = no; then | 5850 | if test "$with_gnu_ld" = no; then |
6377 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | 5851 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
6378 | else | 5852 | else |
6379 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' | 5853 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' |
6380 | fi | 5854 | fi |
6381 | fi | 5855 | fi |
6382 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 5856 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
@@ -6387,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6387 | _LT_TAGVAR(inherit_rpath, $1)=yes | 5861 | _LT_TAGVAR(inherit_rpath, $1)=yes |
6388 | ;; | 5862 | ;; |
6389 | 5863 | ||
6390 | linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) | 5864 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
6391 | case $cc_basename in | 5865 | case $cc_basename in |
6392 | KCC*) | 5866 | KCC*) |
6393 | # Kuck and Associates, Inc. (KAI) C++ Compiler | 5867 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
@@ -6405,7 +5879,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6405 | # explicitly linking system object files so we need to strip them | 5879 | # explicitly linking system object files so we need to strip them |
6406 | # from the output so that they don't get included in the library | 5880 | # from the output so that they don't get included in the library |
6407 | # dependencies. | 5881 | # dependencies. |
6408 | output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | 5882 | output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
6409 | 5883 | ||
6410 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | 5884 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' |
6411 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 5885 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
@@ -6442,26 +5916,26 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6442 | pgCC* | pgcpp*) | 5916 | pgCC* | pgcpp*) |
6443 | # Portland Group C++ compiler | 5917 | # Portland Group C++ compiler |
6444 | case `$CC -V` in | 5918 | case `$CC -V` in |
6445 | *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) | 5919 | *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) |
6446 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ | 5920 | _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ |
6447 | rm -rf $tpldir~ | 5921 | rm -rf $tpldir~ |
6448 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ | 5922 | $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ |
6449 | compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' | 5923 | compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' |
6450 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ | 5924 | _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ |
6451 | rm -rf $tpldir~ | 5925 | rm -rf $tpldir~ |
6452 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ | 5926 | $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ |
6453 | $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ | 5927 | $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ |
6454 | $RANLIB $oldlib' | 5928 | $RANLIB $oldlib' |
6455 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ | 5929 | _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ |
6456 | rm -rf $tpldir~ | 5930 | rm -rf $tpldir~ |
6457 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | 5931 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
6458 | $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 5932 | $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
6459 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ | 5933 | _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ |
6460 | rm -rf $tpldir~ | 5934 | rm -rf $tpldir~ |
6461 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ | 5935 | $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ |
6462 | $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' | 5936 | $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' |
6463 | ;; | 5937 | ;; |
6464 | *) # Version 6 and above use weak symbols | 5938 | *) # Version 6 will use weak symbols |
6465 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | 5939 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' |
6466 | _LT_TAGVAR(archive_expsym_cmds, $1)='$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' | 5940 | _LT_TAGVAR(archive_expsym_cmds, $1)='$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' |
6467 | ;; | 5941 | ;; |
@@ -6469,7 +5943,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6469 | 5943 | ||
6470 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' | 5944 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' |
6471 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 5945 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
6472 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' | 5946 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
6473 | ;; | 5947 | ;; |
6474 | cxx*) | 5948 | cxx*) |
6475 | # Compaq C++ | 5949 | # Compaq C++ |
@@ -6488,9 +5962,9 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6488 | # explicitly linking system object files so we need to strip them | 5962 | # explicitly linking system object files so we need to strip them |
6489 | # from the output so that they don't get included in the library | 5963 | # from the output so that they don't get included in the library |
6490 | # dependencies. | 5964 | # dependencies. |
6491 | output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' | 5965 | output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
6492 | ;; | 5966 | ;; |
6493 | xl* | mpixl* | bgxl*) | 5967 | xl*) |
6494 | # IBM XL 8.0 on PPC, with GNU ld | 5968 | # IBM XL 8.0 on PPC, with GNU ld |
6495 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 5969 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
6496 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | 5970 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' |
@@ -6510,13 +5984,13 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6510 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | 5984 | _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' |
6511 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' | 5985 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' |
6512 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | 5986 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' |
6513 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' | 5987 | _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
6514 | _LT_TAGVAR(compiler_needs_object, $1)=yes | 5988 | _LT_TAGVAR(compiler_needs_object, $1)=yes |
6515 | 5989 | ||
6516 | # Not sure whether something based on | 5990 | # Not sure whether something based on |
6517 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | 5991 | # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 |
6518 | # would be better. | 5992 | # would be better. |
6519 | output_verbose_link_cmd='func_echo_all' | 5993 | output_verbose_link_cmd='echo' |
6520 | 5994 | ||
6521 | # Archives containing C++ object files must be created using | 5995 | # Archives containing C++ object files must be created using |
6522 | # "CC -xar", where "CC" is the Sun C++ compiler. This is | 5996 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
@@ -6585,7 +6059,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6585 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | 6059 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' |
6586 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | 6060 | _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' |
6587 | fi | 6061 | fi |
6588 | output_verbose_link_cmd=func_echo_all | 6062 | output_verbose_link_cmd=echo |
6589 | else | 6063 | else |
6590 | _LT_TAGVAR(ld_shlibs, $1)=no | 6064 | _LT_TAGVAR(ld_shlibs, $1)=no |
6591 | fi | 6065 | fi |
@@ -6620,15 +6094,15 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6620 | case $host in | 6094 | case $host in |
6621 | osf3*) | 6095 | osf3*) |
6622 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 6096 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
6623 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 6097 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
6624 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | 6098 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
6625 | ;; | 6099 | ;; |
6626 | *) | 6100 | *) |
6627 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' | 6101 | _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' |
6628 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' | 6102 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' |
6629 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ | 6103 | _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ |
6630 | echo "-hidden">> $lib.exp~ | 6104 | echo "-hidden">> $lib.exp~ |
6631 | $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ | 6105 | $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ |
6632 | $RM $lib.exp' | 6106 | $RM $lib.exp' |
6633 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' | 6107 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' |
6634 | ;; | 6108 | ;; |
@@ -6644,17 +6118,17 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6644 | # explicitly linking system object files so we need to strip them | 6118 | # explicitly linking system object files so we need to strip them |
6645 | # from the output so that they don't get included in the library | 6119 | # from the output so that they don't get included in the library |
6646 | # dependencies. | 6120 | # dependencies. |
6647 | output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | 6121 | output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' |
6648 | ;; | 6122 | ;; |
6649 | *) | 6123 | *) |
6650 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 6124 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
6651 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' | 6125 | _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' |
6652 | case $host in | 6126 | case $host in |
6653 | osf3*) | 6127 | osf3*) |
6654 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | 6128 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
6655 | ;; | 6129 | ;; |
6656 | *) | 6130 | *) |
6657 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' | 6131 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' |
6658 | ;; | 6132 | ;; |
6659 | esac | 6133 | esac |
6660 | 6134 | ||
@@ -6664,7 +6138,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6664 | # Commands to make compiler produce verbose output that lists | 6138 | # Commands to make compiler produce verbose output that lists |
6665 | # what "hidden" libraries, object files and flags are used when | 6139 | # what "hidden" libraries, object files and flags are used when |
6666 | # linking a shared library. | 6140 | # linking a shared library. |
6667 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 6141 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
6668 | 6142 | ||
6669 | else | 6143 | else |
6670 | # FIXME: insert proper C++ library support | 6144 | # FIXME: insert proper C++ library support |
@@ -6700,7 +6174,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6700 | 6174 | ||
6701 | solaris*) | 6175 | solaris*) |
6702 | case $cc_basename in | 6176 | case $cc_basename in |
6703 | CC* | sunCC*) | 6177 | CC*) |
6704 | # Sun C++ 4.2, 5.x and Centerline C++ | 6178 | # Sun C++ 4.2, 5.x and Centerline C++ |
6705 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes | 6179 | _LT_TAGVAR(archive_cmds_need_lc,$1)=yes |
6706 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' | 6180 | _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' |
@@ -6721,7 +6195,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6721 | esac | 6195 | esac |
6722 | _LT_TAGVAR(link_all_deplibs, $1)=yes | 6196 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
6723 | 6197 | ||
6724 | output_verbose_link_cmd='func_echo_all' | 6198 | output_verbose_link_cmd='echo' |
6725 | 6199 | ||
6726 | # Archives containing C++ object files must be created using | 6200 | # Archives containing C++ object files must be created using |
6727 | # "CC -xar", where "CC" is the Sun C++ compiler. This is | 6201 | # "CC -xar", where "CC" is the Sun C++ compiler. This is |
@@ -6741,14 +6215,14 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6741 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then | 6215 | if test "$GXX" = yes && test "$with_gnu_ld" = no; then |
6742 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' | 6216 | _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' |
6743 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then | 6217 | if $CC --version | $GREP -v '^2\.7' > /dev/null; then |
6744 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' | 6218 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' |
6745 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ | 6219 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ |
6746 | $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' | 6220 | $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' |
6747 | 6221 | ||
6748 | # Commands to make compiler produce verbose output that lists | 6222 | # Commands to make compiler produce verbose output that lists |
6749 | # what "hidden" libraries, object files and flags are used when | 6223 | # what "hidden" libraries, object files and flags are used when |
6750 | # linking a shared library. | 6224 | # linking a shared library. |
6751 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 6225 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
6752 | else | 6226 | else |
6753 | # g++ 2.7 appears to require `-G' NOT `-shared' on this | 6227 | # g++ 2.7 appears to require `-G' NOT `-shared' on this |
6754 | # platform. | 6228 | # platform. |
@@ -6759,7 +6233,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6759 | # Commands to make compiler produce verbose output that lists | 6233 | # Commands to make compiler produce verbose output that lists |
6760 | # what "hidden" libraries, object files and flags are used when | 6234 | # what "hidden" libraries, object files and flags are used when |
6761 | # linking a shared library. | 6235 | # linking a shared library. |
6762 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 6236 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' |
6763 | fi | 6237 | fi |
6764 | 6238 | ||
6765 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' | 6239 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' |
@@ -6813,10 +6287,6 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6813 | CC*) | 6287 | CC*) |
6814 | _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 6288 | _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
6815 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 6289 | _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
6816 | _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ | ||
6817 | '"$_LT_TAGVAR(old_archive_cmds, $1)" | ||
6818 | _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ | ||
6819 | '"$_LT_TAGVAR(reload_cmds, $1)" | ||
6820 | ;; | 6290 | ;; |
6821 | *) | 6291 | *) |
6822 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' | 6292 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' |
@@ -6872,7 +6342,6 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
6872 | fi # test -n "$compiler" | 6342 | fi # test -n "$compiler" |
6873 | 6343 | ||
6874 | CC=$lt_save_CC | 6344 | CC=$lt_save_CC |
6875 | CFLAGS=$lt_save_CFLAGS | ||
6876 | LDCXX=$LD | 6345 | LDCXX=$LD |
6877 | LD=$lt_save_LD | 6346 | LD=$lt_save_LD |
6878 | GCC=$lt_save_GCC | 6347 | GCC=$lt_save_GCC |
@@ -6887,29 +6356,6 @@ AC_LANG_POP | |||
6887 | ])# _LT_LANG_CXX_CONFIG | 6356 | ])# _LT_LANG_CXX_CONFIG |
6888 | 6357 | ||
6889 | 6358 | ||
6890 | # _LT_FUNC_STRIPNAME_CNF | ||
6891 | # ---------------------- | ||
6892 | # func_stripname_cnf prefix suffix name | ||
6893 | # strip PREFIX and SUFFIX off of NAME. | ||
6894 | # PREFIX and SUFFIX must not contain globbing or regex special | ||
6895 | # characters, hashes, percent signs, but SUFFIX may contain a leading | ||
6896 | # dot (in which case that matches only a dot). | ||
6897 | # | ||
6898 | # This function is identical to the (non-XSI) version of func_stripname, | ||
6899 | # except this one can be used by m4 code that may be executed by configure, | ||
6900 | # rather than the libtool script. | ||
6901 | m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl | ||
6902 | AC_REQUIRE([_LT_DECL_SED]) | ||
6903 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) | ||
6904 | func_stripname_cnf () | ||
6905 | { | ||
6906 | case ${2} in | ||
6907 | .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; | ||
6908 | *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; | ||
6909 | esac | ||
6910 | } # func_stripname_cnf | ||
6911 | ])# _LT_FUNC_STRIPNAME_CNF | ||
6912 | |||
6913 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) | 6359 | # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) |
6914 | # --------------------------------- | 6360 | # --------------------------------- |
6915 | # Figure out "hidden" library dependencies from verbose | 6361 | # Figure out "hidden" library dependencies from verbose |
@@ -6918,7 +6364,6 @@ func_stripname_cnf () | |||
6918 | # objects, libraries and library flags. | 6364 | # objects, libraries and library flags. |
6919 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], | 6365 | m4_defun([_LT_SYS_HIDDEN_LIBDEPS], |
6920 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 6366 | [m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
6921 | AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl | ||
6922 | # Dependencies to place before and after the object being linked: | 6367 | # Dependencies to place before and after the object being linked: |
6923 | _LT_TAGVAR(predep_objects, $1)= | 6368 | _LT_TAGVAR(predep_objects, $1)= |
6924 | _LT_TAGVAR(postdep_objects, $1)= | 6369 | _LT_TAGVAR(postdep_objects, $1)= |
@@ -6968,20 +6413,7 @@ public class foo { | |||
6968 | } | 6413 | } |
6969 | }; | 6414 | }; |
6970 | _LT_EOF | 6415 | _LT_EOF |
6971 | ], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF | ||
6972 | package foo | ||
6973 | func foo() { | ||
6974 | } | ||
6975 | _LT_EOF | ||
6976 | ]) | 6416 | ]) |
6977 | |||
6978 | _lt_libdeps_save_CFLAGS=$CFLAGS | ||
6979 | case "$CC $CFLAGS " in #( | ||
6980 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; | ||
6981 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; | ||
6982 | *\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; | ||
6983 | esac | ||
6984 | |||
6985 | dnl Parse the compiler output and extract the necessary | 6417 | dnl Parse the compiler output and extract the necessary |
6986 | dnl objects, libraries and library flags. | 6418 | dnl objects, libraries and library flags. |
6987 | if AC_TRY_EVAL(ac_compile); then | 6419 | if AC_TRY_EVAL(ac_compile); then |
@@ -6993,7 +6425,7 @@ if AC_TRY_EVAL(ac_compile); then | |||
6993 | pre_test_object_deps_done=no | 6425 | pre_test_object_deps_done=no |
6994 | 6426 | ||
6995 | for p in `eval "$output_verbose_link_cmd"`; do | 6427 | for p in `eval "$output_verbose_link_cmd"`; do |
6996 | case ${prev}${p} in | 6428 | case $p in |
6997 | 6429 | ||
6998 | -L* | -R* | -l*) | 6430 | -L* | -R* | -l*) |
6999 | # Some compilers place space between "-{L,R}" and the path. | 6431 | # Some compilers place space between "-{L,R}" and the path. |
@@ -7002,22 +6434,13 @@ if AC_TRY_EVAL(ac_compile); then | |||
7002 | test $p = "-R"; then | 6434 | test $p = "-R"; then |
7003 | prev=$p | 6435 | prev=$p |
7004 | continue | 6436 | continue |
6437 | else | ||
6438 | prev= | ||
7005 | fi | 6439 | fi |
7006 | 6440 | ||
7007 | # Expand the sysroot to ease extracting the directories later. | ||
7008 | if test -z "$prev"; then | ||
7009 | case $p in | ||
7010 | -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; | ||
7011 | -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; | ||
7012 | -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; | ||
7013 | esac | ||
7014 | fi | ||
7015 | case $p in | ||
7016 | =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; | ||
7017 | esac | ||
7018 | if test "$pre_test_object_deps_done" = no; then | 6441 | if test "$pre_test_object_deps_done" = no; then |
7019 | case ${prev} in | 6442 | case $p in |
7020 | -L | -R) | 6443 | -L* | -R*) |
7021 | # Internal compiler library paths should come after those | 6444 | # Internal compiler library paths should come after those |
7022 | # provided the user. The postdeps already come after the | 6445 | # provided the user. The postdeps already come after the |
7023 | # user supplied libs so there is no need to process them. | 6446 | # user supplied libs so there is no need to process them. |
@@ -7037,10 +6460,8 @@ if AC_TRY_EVAL(ac_compile); then | |||
7037 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" | 6460 | _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" |
7038 | fi | 6461 | fi |
7039 | fi | 6462 | fi |
7040 | prev= | ||
7041 | ;; | 6463 | ;; |
7042 | 6464 | ||
7043 | *.lto.$objext) ;; # Ignore GCC LTO objects | ||
7044 | *.$objext) | 6465 | *.$objext) |
7045 | # This assumes that the test object file only shows up | 6466 | # This assumes that the test object file only shows up |
7046 | # once in the compiler output. | 6467 | # once in the compiler output. |
@@ -7076,7 +6497,6 @@ else | |||
7076 | fi | 6497 | fi |
7077 | 6498 | ||
7078 | $RM -f confest.$objext | 6499 | $RM -f confest.$objext |
7079 | CFLAGS=$_lt_libdeps_save_CFLAGS | ||
7080 | 6500 | ||
7081 | # PORTME: override above test on systems where it is broken | 6501 | # PORTME: override above test on systems where it is broken |
7082 | m4_if([$1], [CXX], | 6502 | m4_if([$1], [CXX], |
@@ -7113,7 +6533,7 @@ linux*) | |||
7113 | 6533 | ||
7114 | solaris*) | 6534 | solaris*) |
7115 | case $cc_basename in | 6535 | case $cc_basename in |
7116 | CC* | sunCC*) | 6536 | CC*) |
7117 | # The more standards-conforming stlport4 library is | 6537 | # The more standards-conforming stlport4 library is |
7118 | # incompatible with the Cstd library. Avoid specifying | 6538 | # incompatible with the Cstd library. Avoid specifying |
7119 | # it if it's in CXXFLAGS. Ignore libCrun as | 6539 | # it if it's in CXXFLAGS. Ignore libCrun as |
@@ -7157,16 +6577,32 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1], | |||
7157 | ])# _LT_SYS_HIDDEN_LIBDEPS | 6577 | ])# _LT_SYS_HIDDEN_LIBDEPS |
7158 | 6578 | ||
7159 | 6579 | ||
6580 | # _LT_PROG_F77 | ||
6581 | # ------------ | ||
6582 | # Since AC_PROG_F77 is broken, in that it returns the empty string | ||
6583 | # if there is no fortran compiler, we have our own version here. | ||
6584 | m4_defun([_LT_PROG_F77], | ||
6585 | [ | ||
6586 | pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) | ||
6587 | AC_PROG_F77 | ||
6588 | if test -z "$F77" || test "X$F77" = "Xno"; then | ||
6589 | _lt_disable_F77=yes | ||
6590 | fi | ||
6591 | popdef([AC_MSG_ERROR]) | ||
6592 | ])# _LT_PROG_F77 | ||
6593 | |||
6594 | dnl aclocal-1.4 backwards compatibility: | ||
6595 | dnl AC_DEFUN([_LT_PROG_F77], []) | ||
6596 | |||
6597 | |||
7160 | # _LT_LANG_F77_CONFIG([TAG]) | 6598 | # _LT_LANG_F77_CONFIG([TAG]) |
7161 | # -------------------------- | 6599 | # -------------------------- |
7162 | # Ensure that the configuration variables for a Fortran 77 compiler are | 6600 | # Ensure that the configuration variables for a Fortran 77 compiler are |
7163 | # suitably defined. These variables are subsequently used by _LT_CONFIG | 6601 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
7164 | # to write the compiler configuration to `libtool'. | 6602 | # to write the compiler configuration to `libtool'. |
7165 | m4_defun([_LT_LANG_F77_CONFIG], | 6603 | m4_defun([_LT_LANG_F77_CONFIG], |
7166 | [AC_LANG_PUSH(Fortran 77) | 6604 | [AC_REQUIRE([_LT_PROG_F77])dnl |
7167 | if test -z "$F77" || test "X$F77" = "Xno"; then | 6605 | AC_LANG_PUSH(Fortran 77) |
7168 | _lt_disable_F77=yes | ||
7169 | fi | ||
7170 | 6606 | ||
7171 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 6607 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
7172 | _LT_TAGVAR(allow_undefined_flag, $1)= | 6608 | _LT_TAGVAR(allow_undefined_flag, $1)= |
@@ -7176,6 +6612,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= | |||
7176 | _LT_TAGVAR(hardcode_direct, $1)=no | 6612 | _LT_TAGVAR(hardcode_direct, $1)=no |
7177 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 6613 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
7178 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 6614 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
6615 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
7179 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 6616 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
7180 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 6617 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
7181 | _LT_TAGVAR(hardcode_automatic, $1)=no | 6618 | _LT_TAGVAR(hardcode_automatic, $1)=no |
@@ -7184,8 +6621,6 @@ _LT_TAGVAR(module_cmds, $1)= | |||
7184 | _LT_TAGVAR(module_expsym_cmds, $1)= | 6621 | _LT_TAGVAR(module_expsym_cmds, $1)= |
7185 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 6622 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
7186 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 6623 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
7187 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
7188 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
7189 | _LT_TAGVAR(no_undefined_flag, $1)= | 6624 | _LT_TAGVAR(no_undefined_flag, $1)= |
7190 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 6625 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
7191 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 6626 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
@@ -7225,9 +6660,7 @@ if test "$_lt_disable_F77" != yes; then | |||
7225 | # Allow CC to be a program name with arguments. | 6660 | # Allow CC to be a program name with arguments. |
7226 | lt_save_CC="$CC" | 6661 | lt_save_CC="$CC" |
7227 | lt_save_GCC=$GCC | 6662 | lt_save_GCC=$GCC |
7228 | lt_save_CFLAGS=$CFLAGS | ||
7229 | CC=${F77-"f77"} | 6663 | CC=${F77-"f77"} |
7230 | CFLAGS=$FFLAGS | ||
7231 | compiler=$CC | 6664 | compiler=$CC |
7232 | _LT_TAGVAR(compiler, $1)=$CC | 6665 | _LT_TAGVAR(compiler, $1)=$CC |
7233 | _LT_CC_BASENAME([$compiler]) | 6666 | _LT_CC_BASENAME([$compiler]) |
@@ -7281,24 +6714,38 @@ if test "$_lt_disable_F77" != yes; then | |||
7281 | 6714 | ||
7282 | GCC=$lt_save_GCC | 6715 | GCC=$lt_save_GCC |
7283 | CC="$lt_save_CC" | 6716 | CC="$lt_save_CC" |
7284 | CFLAGS="$lt_save_CFLAGS" | ||
7285 | fi # test "$_lt_disable_F77" != yes | 6717 | fi # test "$_lt_disable_F77" != yes |
7286 | 6718 | ||
7287 | AC_LANG_POP | 6719 | AC_LANG_POP |
7288 | ])# _LT_LANG_F77_CONFIG | 6720 | ])# _LT_LANG_F77_CONFIG |
7289 | 6721 | ||
7290 | 6722 | ||
6723 | # _LT_PROG_FC | ||
6724 | # ----------- | ||
6725 | # Since AC_PROG_FC is broken, in that it returns the empty string | ||
6726 | # if there is no fortran compiler, we have our own version here. | ||
6727 | m4_defun([_LT_PROG_FC], | ||
6728 | [ | ||
6729 | pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) | ||
6730 | AC_PROG_FC | ||
6731 | if test -z "$FC" || test "X$FC" = "Xno"; then | ||
6732 | _lt_disable_FC=yes | ||
6733 | fi | ||
6734 | popdef([AC_MSG_ERROR]) | ||
6735 | ])# _LT_PROG_FC | ||
6736 | |||
6737 | dnl aclocal-1.4 backwards compatibility: | ||
6738 | dnl AC_DEFUN([_LT_PROG_FC], []) | ||
6739 | |||
6740 | |||
7291 | # _LT_LANG_FC_CONFIG([TAG]) | 6741 | # _LT_LANG_FC_CONFIG([TAG]) |
7292 | # ------------------------- | 6742 | # ------------------------- |
7293 | # Ensure that the configuration variables for a Fortran compiler are | 6743 | # Ensure that the configuration variables for a Fortran compiler are |
7294 | # suitably defined. These variables are subsequently used by _LT_CONFIG | 6744 | # suitably defined. These variables are subsequently used by _LT_CONFIG |
7295 | # to write the compiler configuration to `libtool'. | 6745 | # to write the compiler configuration to `libtool'. |
7296 | m4_defun([_LT_LANG_FC_CONFIG], | 6746 | m4_defun([_LT_LANG_FC_CONFIG], |
7297 | [AC_LANG_PUSH(Fortran) | 6747 | [AC_REQUIRE([_LT_PROG_FC])dnl |
7298 | 6748 | AC_LANG_PUSH(Fortran) | |
7299 | if test -z "$FC" || test "X$FC" = "Xno"; then | ||
7300 | _lt_disable_FC=yes | ||
7301 | fi | ||
7302 | 6749 | ||
7303 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 6750 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
7304 | _LT_TAGVAR(allow_undefined_flag, $1)= | 6751 | _LT_TAGVAR(allow_undefined_flag, $1)= |
@@ -7308,6 +6755,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= | |||
7308 | _LT_TAGVAR(hardcode_direct, $1)=no | 6755 | _LT_TAGVAR(hardcode_direct, $1)=no |
7309 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no | 6756 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
7310 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= | 6757 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
6758 | _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= | ||
7311 | _LT_TAGVAR(hardcode_libdir_separator, $1)= | 6759 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
7312 | _LT_TAGVAR(hardcode_minus_L, $1)=no | 6760 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
7313 | _LT_TAGVAR(hardcode_automatic, $1)=no | 6761 | _LT_TAGVAR(hardcode_automatic, $1)=no |
@@ -7316,8 +6764,6 @@ _LT_TAGVAR(module_cmds, $1)= | |||
7316 | _LT_TAGVAR(module_expsym_cmds, $1)= | 6764 | _LT_TAGVAR(module_expsym_cmds, $1)= |
7317 | _LT_TAGVAR(link_all_deplibs, $1)=unknown | 6765 | _LT_TAGVAR(link_all_deplibs, $1)=unknown |
7318 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 6766 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
7319 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
7320 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
7321 | _LT_TAGVAR(no_undefined_flag, $1)= | 6767 | _LT_TAGVAR(no_undefined_flag, $1)= |
7322 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | 6768 | _LT_TAGVAR(whole_archive_flag_spec, $1)= |
7323 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no | 6769 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no |
@@ -7357,9 +6803,7 @@ if test "$_lt_disable_FC" != yes; then | |||
7357 | # Allow CC to be a program name with arguments. | 6803 | # Allow CC to be a program name with arguments. |
7358 | lt_save_CC="$CC" | 6804 | lt_save_CC="$CC" |
7359 | lt_save_GCC=$GCC | 6805 | lt_save_GCC=$GCC |
7360 | lt_save_CFLAGS=$CFLAGS | ||
7361 | CC=${FC-"f95"} | 6806 | CC=${FC-"f95"} |
7362 | CFLAGS=$FCFLAGS | ||
7363 | compiler=$CC | 6807 | compiler=$CC |
7364 | GCC=$ac_cv_fc_compiler_gnu | 6808 | GCC=$ac_cv_fc_compiler_gnu |
7365 | 6809 | ||
@@ -7415,8 +6859,7 @@ if test "$_lt_disable_FC" != yes; then | |||
7415 | fi # test -n "$compiler" | 6859 | fi # test -n "$compiler" |
7416 | 6860 | ||
7417 | GCC=$lt_save_GCC | 6861 | GCC=$lt_save_GCC |
7418 | CC=$lt_save_CC | 6862 | CC="$lt_save_CC" |
7419 | CFLAGS=$lt_save_CFLAGS | ||
7420 | fi # test "$_lt_disable_FC" != yes | 6863 | fi # test "$_lt_disable_FC" != yes |
7421 | 6864 | ||
7422 | AC_LANG_POP | 6865 | AC_LANG_POP |
@@ -7453,12 +6896,10 @@ _LT_COMPILER_BOILERPLATE | |||
7453 | _LT_LINKER_BOILERPLATE | 6896 | _LT_LINKER_BOILERPLATE |
7454 | 6897 | ||
7455 | # Allow CC to be a program name with arguments. | 6898 | # Allow CC to be a program name with arguments. |
7456 | lt_save_CC=$CC | 6899 | lt_save_CC="$CC" |
7457 | lt_save_CFLAGS=$CFLAGS | ||
7458 | lt_save_GCC=$GCC | 6900 | lt_save_GCC=$GCC |
7459 | GCC=yes | 6901 | GCC=yes |
7460 | CC=${GCJ-"gcj"} | 6902 | CC=${GCJ-"gcj"} |
7461 | CFLAGS=$GCJFLAGS | ||
7462 | compiler=$CC | 6903 | compiler=$CC |
7463 | _LT_TAGVAR(compiler, $1)=$CC | 6904 | _LT_TAGVAR(compiler, $1)=$CC |
7464 | _LT_TAGVAR(LD, $1)="$LD" | 6905 | _LT_TAGVAR(LD, $1)="$LD" |
@@ -7468,8 +6909,6 @@ _LT_CC_BASENAME([$compiler]) | |||
7468 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | 6909 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no |
7469 | 6910 | ||
7470 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | 6911 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
7471 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
7472 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
7473 | 6912 | ||
7474 | ## CAVEAT EMPTOR: | 6913 | ## CAVEAT EMPTOR: |
7475 | ## There is no encapsulation within the following macros, do not change | 6914 | ## There is no encapsulation within the following macros, do not change |
@@ -7489,82 +6928,10 @@ fi | |||
7489 | AC_LANG_RESTORE | 6928 | AC_LANG_RESTORE |
7490 | 6929 | ||
7491 | GCC=$lt_save_GCC | 6930 | GCC=$lt_save_GCC |
7492 | CC=$lt_save_CC | 6931 | CC="$lt_save_CC" |
7493 | CFLAGS=$lt_save_CFLAGS | ||
7494 | ])# _LT_LANG_GCJ_CONFIG | 6932 | ])# _LT_LANG_GCJ_CONFIG |
7495 | 6933 | ||
7496 | 6934 | ||
7497 | # _LT_LANG_GO_CONFIG([TAG]) | ||
7498 | # -------------------------- | ||
7499 | # Ensure that the configuration variables for the GNU Go compiler | ||
7500 | # are suitably defined. These variables are subsequently used by _LT_CONFIG | ||
7501 | # to write the compiler configuration to `libtool'. | ||
7502 | m4_defun([_LT_LANG_GO_CONFIG], | ||
7503 | [AC_REQUIRE([LT_PROG_GO])dnl | ||
7504 | AC_LANG_SAVE | ||
7505 | |||
7506 | # Source file extension for Go test sources. | ||
7507 | ac_ext=go | ||
7508 | |||
7509 | # Object file extension for compiled Go test sources. | ||
7510 | objext=o | ||
7511 | _LT_TAGVAR(objext, $1)=$objext | ||
7512 | |||
7513 | # Code to be used in simple compile tests | ||
7514 | lt_simple_compile_test_code="package main; func main() { }" | ||
7515 | |||
7516 | # Code to be used in simple link tests | ||
7517 | lt_simple_link_test_code='package main; func main() { }' | ||
7518 | |||
7519 | # ltmain only uses $CC for tagged configurations so make sure $CC is set. | ||
7520 | _LT_TAG_COMPILER | ||
7521 | |||
7522 | # save warnings/boilerplate of simple test code | ||
7523 | _LT_COMPILER_BOILERPLATE | ||
7524 | _LT_LINKER_BOILERPLATE | ||
7525 | |||
7526 | # Allow CC to be a program name with arguments. | ||
7527 | lt_save_CC=$CC | ||
7528 | lt_save_CFLAGS=$CFLAGS | ||
7529 | lt_save_GCC=$GCC | ||
7530 | GCC=yes | ||
7531 | CC=${GOC-"gccgo"} | ||
7532 | CFLAGS=$GOFLAGS | ||
7533 | compiler=$CC | ||
7534 | _LT_TAGVAR(compiler, $1)=$CC | ||
7535 | _LT_TAGVAR(LD, $1)="$LD" | ||
7536 | _LT_CC_BASENAME([$compiler]) | ||
7537 | |||
7538 | # Go did not exist at the time GCC didn't implicitly link libc in. | ||
7539 | _LT_TAGVAR(archive_cmds_need_lc, $1)=no | ||
7540 | |||
7541 | _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds | ||
7542 | _LT_TAGVAR(reload_flag, $1)=$reload_flag | ||
7543 | _LT_TAGVAR(reload_cmds, $1)=$reload_cmds | ||
7544 | |||
7545 | ## CAVEAT EMPTOR: | ||
7546 | ## There is no encapsulation within the following macros, do not change | ||
7547 | ## the running order or otherwise move them around unless you know exactly | ||
7548 | ## what you are doing... | ||
7549 | if test -n "$compiler"; then | ||
7550 | _LT_COMPILER_NO_RTTI($1) | ||
7551 | _LT_COMPILER_PIC($1) | ||
7552 | _LT_COMPILER_C_O($1) | ||
7553 | _LT_COMPILER_FILE_LOCKS($1) | ||
7554 | _LT_LINKER_SHLIBS($1) | ||
7555 | _LT_LINKER_HARDCODE_LIBPATH($1) | ||
7556 | |||
7557 | _LT_CONFIG($1) | ||
7558 | fi | ||
7559 | |||
7560 | AC_LANG_RESTORE | ||
7561 | |||
7562 | GCC=$lt_save_GCC | ||
7563 | CC=$lt_save_CC | ||
7564 | CFLAGS=$lt_save_CFLAGS | ||
7565 | ])# _LT_LANG_GO_CONFIG | ||
7566 | |||
7567 | |||
7568 | # _LT_LANG_RC_CONFIG([TAG]) | 6935 | # _LT_LANG_RC_CONFIG([TAG]) |
7569 | # ------------------------- | 6936 | # ------------------------- |
7570 | # Ensure that the configuration variables for the Windows resource compiler | 6937 | # Ensure that the configuration variables for the Windows resource compiler |
@@ -7596,11 +6963,9 @@ _LT_LINKER_BOILERPLATE | |||
7596 | 6963 | ||
7597 | # Allow CC to be a program name with arguments. | 6964 | # Allow CC to be a program name with arguments. |
7598 | lt_save_CC="$CC" | 6965 | lt_save_CC="$CC" |
7599 | lt_save_CFLAGS=$CFLAGS | ||
7600 | lt_save_GCC=$GCC | 6966 | lt_save_GCC=$GCC |
7601 | GCC= | 6967 | GCC= |
7602 | CC=${RC-"windres"} | 6968 | CC=${RC-"windres"} |
7603 | CFLAGS= | ||
7604 | compiler=$CC | 6969 | compiler=$CC |
7605 | _LT_TAGVAR(compiler, $1)=$CC | 6970 | _LT_TAGVAR(compiler, $1)=$CC |
7606 | _LT_CC_BASENAME([$compiler]) | 6971 | _LT_CC_BASENAME([$compiler]) |
@@ -7613,8 +6978,7 @@ fi | |||
7613 | 6978 | ||
7614 | GCC=$lt_save_GCC | 6979 | GCC=$lt_save_GCC |
7615 | AC_LANG_RESTORE | 6980 | AC_LANG_RESTORE |
7616 | CC=$lt_save_CC | 6981 | CC="$lt_save_CC" |
7617 | CFLAGS=$lt_save_CFLAGS | ||
7618 | ])# _LT_LANG_RC_CONFIG | 6982 | ])# _LT_LANG_RC_CONFIG |
7619 | 6983 | ||
7620 | 6984 | ||
@@ -7634,13 +6998,6 @@ dnl aclocal-1.4 backwards compatibility: | |||
7634 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) | 6998 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) |
7635 | 6999 | ||
7636 | 7000 | ||
7637 | # LT_PROG_GO | ||
7638 | # ---------- | ||
7639 | AC_DEFUN([LT_PROG_GO], | ||
7640 | [AC_CHECK_TOOL(GOC, gccgo,) | ||
7641 | ]) | ||
7642 | |||
7643 | |||
7644 | # LT_PROG_RC | 7001 | # LT_PROG_RC |
7645 | # ---------- | 7002 | # ---------- |
7646 | AC_DEFUN([LT_PROG_RC], | 7003 | AC_DEFUN([LT_PROG_RC], |
@@ -7680,15 +7037,6 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) | |||
7680 | AC_SUBST([OBJDUMP]) | 7037 | AC_SUBST([OBJDUMP]) |
7681 | ]) | 7038 | ]) |
7682 | 7039 | ||
7683 | # _LT_DECL_DLLTOOL | ||
7684 | # ---------------- | ||
7685 | # Ensure DLLTOOL variable is set. | ||
7686 | m4_defun([_LT_DECL_DLLTOOL], | ||
7687 | [AC_CHECK_TOOL(DLLTOOL, dlltool, false) | ||
7688 | test -z "$DLLTOOL" && DLLTOOL=dlltool | ||
7689 | _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) | ||
7690 | AC_SUBST([DLLTOOL]) | ||
7691 | ]) | ||
7692 | 7040 | ||
7693 | # _LT_DECL_SED | 7041 | # _LT_DECL_SED |
7694 | # ------------ | 7042 | # ------------ |
@@ -7782,8 +7130,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], | |||
7782 | # Try some XSI features | 7130 | # Try some XSI features |
7783 | xsi_shell=no | 7131 | xsi_shell=no |
7784 | ( _lt_dummy="a/b/c" | 7132 | ( _lt_dummy="a/b/c" |
7785 | test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ | 7133 | test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
7786 | = c,a/b,b/c, \ | 7134 | = c,a/b,, \ |
7787 | && eval 'test $(( 1 + 1 )) -eq 2 \ | 7135 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
7788 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ | 7136 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
7789 | && xsi_shell=yes | 7137 | && xsi_shell=yes |
@@ -7822,162 +7170,208 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl | |||
7822 | ])# _LT_CHECK_SHELL_FEATURES | 7170 | ])# _LT_CHECK_SHELL_FEATURES |
7823 | 7171 | ||
7824 | 7172 | ||
7825 | # _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) | 7173 | # _LT_PROG_XSI_SHELLFNS |
7826 | # ------------------------------------------------------ | 7174 | # --------------------- |
7827 | # In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and | 7175 | # Bourne and XSI compatible variants of some useful shell functions. |
7828 | # '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. | 7176 | m4_defun([_LT_PROG_XSI_SHELLFNS], |
7829 | m4_defun([_LT_PROG_FUNCTION_REPLACE], | 7177 | [case $xsi_shell in |
7830 | [dnl { | 7178 | yes) |
7831 | sed -e '/^$1 ()$/,/^} # $1 /c\ | 7179 | cat << \_LT_EOF >> "$cfgfile" |
7832 | $1 ()\ | 7180 | |
7833 | {\ | 7181 | # func_dirname file append nondir_replacement |
7834 | m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) | 7182 | # Compute the dirname of FILE. If nonempty, add APPEND to the result, |
7835 | } # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ | 7183 | # otherwise set result to NONDIR_REPLACEMENT. |
7836 | && mv -f "$cfgfile.tmp" "$cfgfile" \ | 7184 | func_dirname () |
7837 | || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | 7185 | { |
7838 | test 0 -eq $? || _lt_function_replace_fail=: | 7186 | case ${1} in |
7839 | ]) | 7187 | */*) func_dirname_result="${1%/*}${2}" ;; |
7188 | * ) func_dirname_result="${3}" ;; | ||
7189 | esac | ||
7190 | } | ||
7840 | 7191 | ||
7192 | # func_basename file | ||
7193 | func_basename () | ||
7194 | { | ||
7195 | func_basename_result="${1##*/}" | ||
7196 | } | ||
7841 | 7197 | ||
7842 | # _LT_PROG_REPLACE_SHELLFNS | 7198 | # func_dirname_and_basename file append nondir_replacement |
7843 | # ------------------------- | 7199 | # perform func_basename and func_dirname in a single function |
7844 | # Replace existing portable implementations of several shell functions with | 7200 | # call: |
7845 | # equivalent extended shell implementations where those features are available.. | 7201 | # dirname: Compute the dirname of FILE. If nonempty, |
7846 | m4_defun([_LT_PROG_REPLACE_SHELLFNS], | 7202 | # add APPEND to the result, otherwise set result |
7847 | [if test x"$xsi_shell" = xyes; then | 7203 | # to NONDIR_REPLACEMENT. |
7848 | _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl | 7204 | # value returned in "$func_dirname_result" |
7849 | case ${1} in | 7205 | # basename: Compute filename of FILE. |
7850 | */*) func_dirname_result="${1%/*}${2}" ;; | 7206 | # value retuned in "$func_basename_result" |
7851 | * ) func_dirname_result="${3}" ;; | 7207 | # Implementation must be kept synchronized with func_dirname |
7852 | esac]) | 7208 | # and func_basename. For efficiency, we do not delegate to |
7853 | 7209 | # those functions but instead duplicate the functionality here. | |
7854 | _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl | 7210 | func_dirname_and_basename () |
7855 | func_basename_result="${1##*/}"]) | 7211 | { |
7856 | 7212 | case ${1} in | |
7857 | _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl | 7213 | */*) func_dirname_result="${1%/*}${2}" ;; |
7858 | case ${1} in | 7214 | * ) func_dirname_result="${3}" ;; |
7859 | */*) func_dirname_result="${1%/*}${2}" ;; | 7215 | esac |
7860 | * ) func_dirname_result="${3}" ;; | 7216 | func_basename_result="${1##*/}" |
7861 | esac | 7217 | } |
7862 | func_basename_result="${1##*/}"]) | ||
7863 | 7218 | ||
7864 | _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl | 7219 | # func_stripname prefix suffix name |
7865 | # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | 7220 | # strip PREFIX and SUFFIX off of NAME. |
7866 | # positional parameters, so assign one to ordinary parameter first. | 7221 | # PREFIX and SUFFIX must not contain globbing or regex special |
7867 | func_stripname_result=${3} | 7222 | # characters, hashes, percent signs, but SUFFIX may contain a leading |
7868 | func_stripname_result=${func_stripname_result#"${1}"} | 7223 | # dot (in which case that matches only a dot). |
7869 | func_stripname_result=${func_stripname_result%"${2}"}]) | 7224 | func_stripname () |
7225 | { | ||
7226 | # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are | ||
7227 | # positional parameters, so assign one to ordinary parameter first. | ||
7228 | func_stripname_result=${3} | ||
7229 | func_stripname_result=${func_stripname_result#"${1}"} | ||
7230 | func_stripname_result=${func_stripname_result%"${2}"} | ||
7231 | } | ||
7870 | 7232 | ||
7871 | _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl | 7233 | # func_opt_split |
7872 | func_split_long_opt_name=${1%%=*} | 7234 | func_opt_split () |
7873 | func_split_long_opt_arg=${1#*=}]) | 7235 | { |
7236 | func_opt_split_opt=${1%%=*} | ||
7237 | func_opt_split_arg=${1#*=} | ||
7238 | } | ||
7874 | 7239 | ||
7875 | _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl | 7240 | # func_lo2o object |
7876 | func_split_short_opt_arg=${1#??} | 7241 | func_lo2o () |
7877 | func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) | 7242 | { |
7243 | case ${1} in | ||
7244 | *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | ||
7245 | *) func_lo2o_result=${1} ;; | ||
7246 | esac | ||
7247 | } | ||
7878 | 7248 | ||
7879 | _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl | 7249 | # func_xform libobj-or-source |
7880 | case ${1} in | 7250 | func_xform () |
7881 | *.lo) func_lo2o_result=${1%.lo}.${objext} ;; | 7251 | { |
7882 | *) func_lo2o_result=${1} ;; | 7252 | func_xform_result=${1%.*}.lo |
7883 | esac]) | 7253 | } |
7884 | 7254 | ||
7885 | _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) | 7255 | # func_arith arithmetic-term... |
7256 | func_arith () | ||
7257 | { | ||
7258 | func_arith_result=$(( $[*] )) | ||
7259 | } | ||
7886 | 7260 | ||
7887 | _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) | 7261 | # func_len string |
7262 | # STRING may not start with a hyphen. | ||
7263 | func_len () | ||
7264 | { | ||
7265 | func_len_result=${#1} | ||
7266 | } | ||
7888 | 7267 | ||
7889 | _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) | 7268 | _LT_EOF |
7890 | fi | 7269 | ;; |
7270 | *) # Bourne compatible functions. | ||
7271 | cat << \_LT_EOF >> "$cfgfile" | ||
7891 | 7272 | ||
7892 | if test x"$lt_shell_append" = xyes; then | 7273 | # func_dirname file append nondir_replacement |
7893 | _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) | 7274 | # Compute the dirname of FILE. If nonempty, add APPEND to the result, |
7275 | # otherwise set result to NONDIR_REPLACEMENT. | ||
7276 | func_dirname () | ||
7277 | { | ||
7278 | # Extract subdirectory from the argument. | ||
7279 | func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` | ||
7280 | if test "X$func_dirname_result" = "X${1}"; then | ||
7281 | func_dirname_result="${3}" | ||
7282 | else | ||
7283 | func_dirname_result="$func_dirname_result${2}" | ||
7284 | fi | ||
7285 | } | ||
7894 | 7286 | ||
7895 | _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl | 7287 | # func_basename file |
7896 | func_quote_for_eval "${2}" | 7288 | func_basename () |
7897 | dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ | 7289 | { |
7898 | eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) | 7290 | func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` |
7291 | } | ||
7899 | 7292 | ||
7900 | # Save a `func_append' function call where possible by direct use of '+=' | 7293 | dnl func_dirname_and_basename |
7901 | sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ | 7294 | dnl A portable version of this function is already defined in general.m4sh |
7902 | && mv -f "$cfgfile.tmp" "$cfgfile" \ | 7295 | dnl so there is no need for it here. |
7903 | || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7904 | test 0 -eq $? || _lt_function_replace_fail=: | ||
7905 | else | ||
7906 | # Save a `func_append' function call even when '+=' is not available | ||
7907 | sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ | ||
7908 | && mv -f "$cfgfile.tmp" "$cfgfile" \ | ||
7909 | || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") | ||
7910 | test 0 -eq $? || _lt_function_replace_fail=: | ||
7911 | fi | ||
7912 | 7296 | ||
7913 | if test x"$_lt_function_replace_fail" = x":"; then | 7297 | # func_stripname prefix suffix name |
7914 | AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) | 7298 | # strip PREFIX and SUFFIX off of NAME. |
7915 | fi | 7299 | # PREFIX and SUFFIX must not contain globbing or regex special |
7916 | ]) | 7300 | # characters, hashes, percent signs, but SUFFIX may contain a leading |
7301 | # dot (in which case that matches only a dot). | ||
7302 | # func_strip_suffix prefix name | ||
7303 | func_stripname () | ||
7304 | { | ||
7305 | case ${2} in | ||
7306 | .*) func_stripname_result=`$ECHO "X${3}" \ | ||
7307 | | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; | ||
7308 | *) func_stripname_result=`$ECHO "X${3}" \ | ||
7309 | | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; | ||
7310 | esac | ||
7311 | } | ||
7917 | 7312 | ||
7918 | # _LT_PATH_CONVERSION_FUNCTIONS | 7313 | # sed scripts: |
7919 | # ----------------------------- | 7314 | my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' |
7920 | # Determine which file name conversion functions should be used by | 7315 | my_sed_long_arg='1s/^-[[^=]]*=//' |
7921 | # func_to_host_file (and, implicitly, by func_to_host_path). These are needed | 7316 | |
7922 | # for certain cross-compile configurations and native mingw. | 7317 | # func_opt_split |
7923 | m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], | 7318 | func_opt_split () |
7924 | [AC_REQUIRE([AC_CANONICAL_HOST])dnl | 7319 | { |
7925 | AC_REQUIRE([AC_CANONICAL_BUILD])dnl | 7320 | func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` |
7926 | AC_MSG_CHECKING([how to convert $build file names to $host format]) | 7321 | func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` |
7927 | AC_CACHE_VAL(lt_cv_to_host_file_cmd, | 7322 | } |
7928 | [case $host in | 7323 | |
7929 | *-*-mingw* ) | 7324 | # func_lo2o object |
7930 | case $build in | 7325 | func_lo2o () |
7931 | *-*-mingw* ) # actually msys | 7326 | { |
7932 | lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 | 7327 | func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` |
7933 | ;; | 7328 | } |
7934 | *-*-cygwin* ) | 7329 | |
7935 | lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 | 7330 | # func_xform libobj-or-source |
7936 | ;; | 7331 | func_xform () |
7937 | * ) # otherwise, assume *nix | 7332 | { |
7938 | lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 | 7333 | func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` |
7939 | ;; | 7334 | } |
7940 | esac | 7335 | |
7941 | ;; | 7336 | # func_arith arithmetic-term... |
7942 | *-*-cygwin* ) | 7337 | func_arith () |
7943 | case $build in | 7338 | { |
7944 | *-*-mingw* ) # actually msys | 7339 | func_arith_result=`expr "$[@]"` |
7945 | lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin | 7340 | } |
7946 | ;; | 7341 | |
7947 | *-*-cygwin* ) | 7342 | # func_len string |
7948 | lt_cv_to_host_file_cmd=func_convert_file_noop | 7343 | # STRING may not start with a hyphen. |
7949 | ;; | 7344 | func_len () |
7950 | * ) # otherwise, assume *nix | 7345 | { |
7951 | lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin | 7346 | func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` |
7952 | ;; | 7347 | } |
7953 | esac | 7348 | |
7954 | ;; | 7349 | _LT_EOF |
7955 | * ) # unhandled hosts (and "normal" native builds) | ||
7956 | lt_cv_to_host_file_cmd=func_convert_file_noop | ||
7957 | ;; | ||
7958 | esac | 7350 | esac |
7959 | ]) | 7351 | |
7960 | to_host_file_cmd=$lt_cv_to_host_file_cmd | 7352 | case $lt_shell_append in |
7961 | AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) | 7353 | yes) |
7962 | _LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], | 7354 | cat << \_LT_EOF >> "$cfgfile" |
7963 | [0], [convert $build file names to $host format])dnl | 7355 | |
7964 | 7356 | # func_append var value | |
7965 | AC_MSG_CHECKING([how to convert $build file names to toolchain format]) | 7357 | # Append VALUE to the end of shell variable VAR. |
7966 | AC_CACHE_VAL(lt_cv_to_tool_file_cmd, | 7358 | func_append () |
7967 | [#assume ordinary cross tools, or native build. | 7359 | { |
7968 | lt_cv_to_tool_file_cmd=func_convert_file_noop | 7360 | eval "$[1]+=\$[2]" |
7969 | case $host in | 7361 | } |
7970 | *-*-mingw* ) | 7362 | _LT_EOF |
7971 | case $build in | ||
7972 | *-*-mingw* ) # actually msys | ||
7973 | lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 | ||
7974 | ;; | ||
7975 | esac | ||
7976 | ;; | 7363 | ;; |
7977 | esac | 7364 | *) |
7365 | cat << \_LT_EOF >> "$cfgfile" | ||
7366 | |||
7367 | # func_append var value | ||
7368 | # Append VALUE to the end of shell variable VAR. | ||
7369 | func_append () | ||
7370 | { | ||
7371 | eval "$[1]=\$$[1]\$[2]" | ||
7372 | } | ||
7373 | |||
7374 | _LT_EOF | ||
7375 | ;; | ||
7376 | esac | ||
7978 | ]) | 7377 | ]) |
7979 | to_tool_file_cmd=$lt_cv_to_tool_file_cmd | ||
7980 | AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) | ||
7981 | _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], | ||
7982 | [0], [convert $build files to toolchain format])dnl | ||
7983 | ])# _LT_PATH_CONVERSION_FUNCTIONS | ||
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 5d9acd8..34151a3 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 | |||
@@ -1,14 +1,13 @@ | |||
1 | # Helper functions for option handling. -*- Autoconf -*- | 1 | # Helper functions for option handling. -*- Autoconf -*- |
2 | # | 2 | # |
3 | # Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, | 3 | # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. |
4 | # Inc. | ||
5 | # Written by Gary V. Vaughan, 2004 | 4 | # Written by Gary V. Vaughan, 2004 |
6 | # | 5 | # |
7 | # This file is free software; the Free Software Foundation gives | 6 | # This file is free software; the Free Software Foundation gives |
8 | # unlimited permission to copy and/or distribute it, with or without | 7 | # unlimited permission to copy and/or distribute it, with or without |
9 | # modifications, as long as this notice is preserved. | 8 | # modifications, as long as this notice is preserved. |
10 | 9 | ||
11 | # serial 7 ltoptions.m4 | 10 | # serial 6 ltoptions.m4 |
12 | 11 | ||
13 | # This is to help aclocal find these macros, as it can't see m4_define. | 12 | # This is to help aclocal find these macros, as it can't see m4_define. |
14 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) | 13 | AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) |
@@ -126,7 +125,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll], | |||
126 | [enable_win32_dll=yes | 125 | [enable_win32_dll=yes |
127 | 126 | ||
128 | case $host in | 127 | case $host in |
129 | *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) | 128 | *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) |
130 | AC_CHECK_TOOL(AS, as, false) | 129 | AC_CHECK_TOOL(AS, as, false) |
131 | AC_CHECK_TOOL(DLLTOOL, dlltool, false) | 130 | AC_CHECK_TOOL(DLLTOOL, dlltool, false) |
132 | AC_CHECK_TOOL(OBJDUMP, objdump, false) | 131 | AC_CHECK_TOOL(OBJDUMP, objdump, false) |
@@ -134,13 +133,13 @@ case $host in | |||
134 | esac | 133 | esac |
135 | 134 | ||
136 | test -z "$AS" && AS=as | 135 | test -z "$AS" && AS=as |
137 | _LT_DECL([], [AS], [1], [Assembler program])dnl | 136 | _LT_DECL([], [AS], [0], [Assembler program])dnl |
138 | 137 | ||
139 | test -z "$DLLTOOL" && DLLTOOL=dlltool | 138 | test -z "$DLLTOOL" && DLLTOOL=dlltool |
140 | _LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl | 139 | _LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl |
141 | 140 | ||
142 | test -z "$OBJDUMP" && OBJDUMP=objdump | 141 | test -z "$OBJDUMP" && OBJDUMP=objdump |
143 | _LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl | 142 | _LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl |
144 | ])# win32-dll | 143 | ])# win32-dll |
145 | 144 | ||
146 | AU_DEFUN([AC_LIBTOOL_WIN32_DLL], | 145 | AU_DEFUN([AC_LIBTOOL_WIN32_DLL], |
@@ -326,24 +325,9 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) | |||
326 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. | 325 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. |
327 | m4_define([_LT_WITH_PIC], | 326 | m4_define([_LT_WITH_PIC], |
328 | [AC_ARG_WITH([pic], | 327 | [AC_ARG_WITH([pic], |
329 | [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], | 328 | [AS_HELP_STRING([--with-pic], |
330 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], | 329 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], |
331 | [lt_p=${PACKAGE-default} | 330 | [pic_mode="$withval"], |
332 | case $withval in | ||
333 | yes|no) pic_mode=$withval ;; | ||
334 | *) | ||
335 | pic_mode=default | ||
336 | # Look at the argument we got. We use all the common list separators. | ||
337 | lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," | ||
338 | for lt_pkg in $withval; do | ||
339 | IFS="$lt_save_ifs" | ||
340 | if test "X$lt_pkg" = "X$lt_p"; then | ||
341 | pic_mode=yes | ||
342 | fi | ||
343 | done | ||
344 | IFS="$lt_save_ifs" | ||
345 | ;; | ||
346 | esac], | ||
347 | [pic_mode=default]) | 331 | [pic_mode=default]) |
348 | 332 | ||
349 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) | 333 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) |
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index 07a8602..f3c5309 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 | |||
@@ -7,17 +7,17 @@ | |||
7 | # unlimited permission to copy and/or distribute it, with or without | 7 | # unlimited permission to copy and/or distribute it, with or without |
8 | # modifications, as long as this notice is preserved. | 8 | # modifications, as long as this notice is preserved. |
9 | 9 | ||
10 | # @configure_input@ | 10 | # Generated from ltversion.in. |
11 | 11 | ||
12 | # serial 3337 ltversion.m4 | 12 | # serial 3017 ltversion.m4 |
13 | # This file is part of GNU Libtool | 13 | # This file is part of GNU Libtool |
14 | 14 | ||
15 | m4_define([LT_PACKAGE_VERSION], [2.4.2]) | 15 | m4_define([LT_PACKAGE_VERSION], [2.2.6b]) |
16 | m4_define([LT_PACKAGE_REVISION], [1.3337]) | 16 | m4_define([LT_PACKAGE_REVISION], [1.3017]) |
17 | 17 | ||
18 | AC_DEFUN([LTVERSION_VERSION], | 18 | AC_DEFUN([LTVERSION_VERSION], |
19 | [macro_version='2.4.2' | 19 | [macro_version='2.2.6b' |
20 | macro_revision='1.3337' | 20 | macro_revision='1.3017' |
21 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) | 21 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
22 | _LT_DECL(, macro_revision, 0) | 22 | _LT_DECL(, macro_revision, 0) |
23 | ]) | 23 | ]) |
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index c573da9..637bb20 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 | |||
@@ -1,13 +1,13 @@ | |||
1 | # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- | 1 | # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- |
2 | # | 2 | # |
3 | # Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. | 3 | # Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. |
4 | # Written by Scott James Remnant, 2004. | 4 | # Written by Scott James Remnant, 2004. |
5 | # | 5 | # |
6 | # This file is free software; the Free Software Foundation gives | 6 | # This file is free software; the Free Software Foundation gives |
7 | # unlimited permission to copy and/or distribute it, with or without | 7 | # unlimited permission to copy and/or distribute it, with or without |
8 | # modifications, as long as this notice is preserved. | 8 | # modifications, as long as this notice is preserved. |
9 | 9 | ||
10 | # serial 5 lt~obsolete.m4 | 10 | # serial 4 lt~obsolete.m4 |
11 | 11 | ||
12 | # These exist entirely to fool aclocal when bootstrapping libtool. | 12 | # These exist entirely to fool aclocal when bootstrapping libtool. |
13 | # | 13 | # |
@@ -77,6 +77,7 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) | |||
77 | m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) | 77 | m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) |
78 | m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) | 78 | m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) |
79 | m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) | 79 | m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) |
80 | m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) | ||
80 | m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) | 81 | m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) |
81 | m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) | 82 | m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) |
82 | m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) | 83 | m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) |
@@ -89,10 +90,3 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) | |||
89 | m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) | 90 | m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) |
90 | m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) | 91 | m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) |
91 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) | 92 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) |
92 | m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) | ||
93 | m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) | ||
94 | m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) | ||
95 | m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) | ||
96 | m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) | ||
97 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) | ||
98 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) | ||
diff --git a/src/ext/Makefile.am b/src/ext/Makefile.am index eb91918..7e2257d 100644 --- a/src/ext/Makefile.am +++ b/src/ext/Makefile.am | |||
@@ -2,8 +2,17 @@ SUBDIRS = . | |||
2 | 2 | ||
3 | INCLUDES = \ | 3 | INCLUDES = \ |
4 | -I$(top_srcdir)/src/include \ | 4 | -I$(top_srcdir)/src/include \ |
5 | -I$(top_srcdir) \ | 5 | -I$(top_srcdir) |
6 | @GNUNET_CFLAGS@ | 6 | |
7 | AM_CPPFLAGS = \ | ||
8 | $(GNUNET_CPPFLAGS) | ||
9 | |||
10 | # Set this variable if you are using GNUNET libraries for all programs and | ||
11 | # libraries. You don't then need to target-specific _LDFLAGS with GNUNET_LDFLAGS | ||
12 | # AM_LDFLAGS = \ | ||
13 | # $(GNUNET_LDFLAGS) \ | ||
14 | # $(WINFLAGS) \ | ||
15 | # -export-dynamic | ||
7 | 16 | ||
8 | lib_LTLIBRARIES = libgnunetext.la | 17 | lib_LTLIBRARIES = libgnunetext.la |
9 | 18 | ||
@@ -12,7 +21,7 @@ libgnunetext_la_SOURCES = \ | |||
12 | libgnunetext_la_LIBADD = \ | 21 | libgnunetext_la_LIBADD = \ |
13 | -lgnunetutil | 22 | -lgnunetutil |
14 | libgnunetext_la_LDFLAGS = \ | 23 | libgnunetext_la_LDFLAGS = \ |
15 | $(GNUNET_LIBS) $(WINFLAGS) \ | 24 | $(GNUNET_LDFLAGS) $(WINFLAGS) \ |
16 | -version-info 0:0:0 | 25 | -version-info 0:0:0 |
17 | 26 | ||
18 | 27 | ||
@@ -24,7 +33,7 @@ gnunet_service_ext_LDADD = \ | |||
24 | -lgnunetutil -lgnunetcore\ | 33 | -lgnunetutil -lgnunetcore\ |
25 | $(INTLLIBS) | 34 | $(INTLLIBS) |
26 | gnunet_service_ext_LDFLAGS = \ | 35 | gnunet_service_ext_LDFLAGS = \ |
27 | $(GNUNET_LIBS) $(WINFLAGS) -export-dynamic | 36 | $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic |
28 | 37 | ||
29 | gnunet_ext_SOURCES = \ | 38 | gnunet_ext_SOURCES = \ |
30 | gnunet-ext.c | 39 | gnunet-ext.c |
@@ -32,7 +41,7 @@ gnunet_ext_LDADD = \ | |||
32 | -lgnunetutil \ | 41 | -lgnunetutil \ |
33 | $(INTLLIBS) | 42 | $(INTLLIBS) |
34 | gnunet_ext_LDFLAGS = \ | 43 | gnunet_ext_LDFLAGS = \ |
35 | $(GNUNET_LIBS) $(WINFLAGS) -export-dynamic | 44 | $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic |
36 | 45 | ||
37 | 46 | ||
38 | check_PROGRAMS = \ | 47 | check_PROGRAMS = \ |
@@ -46,4 +55,4 @@ test_ext_api_LDADD = \ | |||
46 | $(top_builddir)/src/ext/libgnunetext.la \ | 55 | $(top_builddir)/src/ext/libgnunetext.la \ |
47 | -lgnunetutil | 56 | -lgnunetutil |
48 | test_ext_api_LDFLAGS = \ | 57 | test_ext_api_LDFLAGS = \ |
49 | $(GNUNET_LIBS) $(WINFLAGS) -export-dynamic \ No newline at end of file | 58 | $(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic \ No newline at end of file |