ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid-7.3/aclocal.m4
(Generate patch)

Comparing ircd-hybrid-7.3/aclocal.m4 (file contents):
Revision 1095 by michael, Mon Aug 2 20:14:21 2010 UTC vs.
Revision 1106 by michael, Tue Nov 2 15:10:53 2010 UTC

# Line 13 | Line 13
13  
14   m4_ifndef([AC_AUTOCONF_VERSION],
15    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16 < m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
17 < [m4_warning([this file was generated for autoconf 2.67.
16 > m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
17 > [m4_warning([this file was generated for autoconf 2.68.
18   You have another version of autoconf.  It may work, but is not guaranteed to.
19   If you have problems, you may need to regenerate the build system entirely.
20   To do so, use the procedure documented by the package, typically `autoreconf'.])])
# Line 87 | Line 87 | AS_IF([test -z "$ARGZ_H"],
87             ;; #(
88           *) lt_cv_sys_argz_works=yes ;;
89           esac]])
90 <     AS_IF([test $lt_cv_sys_argz_works = yes],
90 >     AS_IF([test "$lt_cv_sys_argz_works" = yes],
91          [AC_DEFINE([HAVE_WORKING_ARGZ], 1,
92                     [This value is set to 1 to indicate that the system argz facility works])],
93          [ARGZ_H=argz.h
# Line 269 | Line 269 | _LT_DECL([], [exeext], [0], [Executable
269   dnl
270   m4_require([_LT_FILEUTILS_DEFAULTS])dnl
271   m4_require([_LT_CHECK_SHELL_FEATURES])dnl
272 + m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
273   m4_require([_LT_CMD_RELOAD])dnl
274   m4_require([_LT_CHECK_MAGIC_METHOD])dnl
275 + m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
276   m4_require([_LT_CMD_OLD_ARCHIVE])dnl
277   m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
278 + m4_require([_LT_WITH_SYSROOT])dnl
279  
280   _LT_CONFIG_LIBTOOL_INIT([
281   # See if we are running on zsh, and set the options which allow our
# Line 843 | Line 846 | _LT_EOF
846    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
847    # text mode, it properly converts lines to CR/LF.  This bash problem
848    # is reportedly fixed, but why not run on old versions too?
849 <  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
850 <    || (rm -f "$cfgfile"; exit 1)
849 >  sed '$q' "$ltmain" >> "$cfgfile" \
850 >     || (rm -f "$cfgfile"; exit 1)
851  
852 <  _LT_PROG_XSI_SHELLFNS
852 >  _LT_PROG_REPLACE_SHELLFNS
853  
854 <  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
852 <    || (rm -f "$cfgfile"; exit 1)
853 <
854 <  mv -f "$cfgfile" "$ofile" ||
854 >   mv -f "$cfgfile" "$ofile" ||
855      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
856    chmod +x "$ofile"
857   ],
# Line 1168 | Line 1168 | m4_defun([_LT_DARWIN_LINKER_FEATURES],
1168    fi
1169   ])
1170  
1171 < # _LT_SYS_MODULE_PATH_AIX
1172 < # -----------------------
1171 > # _LT_SYS_MODULE_PATH_AIX([TAGNAME])
1172 > # ----------------------------------
1173   # Links a minimal program and checks the executable
1174   # for the system default hardcoded library path. In most cases,
1175   # this is /usr/lib:/lib, but when the MPI compilers are used
1176   # the location of the communication and MPI libs are included too.
1177   # If we don't find anything, use the default library path according
1178   # to the aix ld manual.
1179 + # Store the results from the different compilers for each TAGNAME.
1180 + # Allow to override them for all tags through lt_cv_aix_libpath.
1181   m4_defun([_LT_SYS_MODULE_PATH_AIX],
1182   [m4_require([_LT_DECL_SED])dnl
1183 < AC_LINK_IFELSE(AC_LANG_PROGRAM,[
1184 < lt_aix_libpath_sed='
1185 <    /Import File Strings/,/^$/ {
1186 <        /^0/ {
1187 <            s/^0  *\(.*\)$/\1/
1188 <            p
1189 <        }
1190 <    }'
1191 < aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1192 < # Check for a 64-bit object if we didn't find anything.
1193 < if test -z "$aix_libpath"; then
1194 <  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1195 < fi],[])
1196 < if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
1183 > if test "${lt_cv_aix_libpath+set}" = set; then
1184 >  aix_libpath=$lt_cv_aix_libpath
1185 > else
1186 >  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
1187 >  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
1188 >  lt_aix_libpath_sed='[
1189 >      /Import File Strings/,/^$/ {
1190 >          /^0/ {
1191 >              s/^0  *\([^ ]*\) *$/\1/
1192 >              p
1193 >          }
1194 >      }]'
1195 >  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1196 >  # Check for a 64-bit object if we didn't find anything.
1197 >  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
1198 >    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
1199 >  fi],[])
1200 >  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
1201 >    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
1202 >  fi
1203 >  ])
1204 >  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
1205 > fi
1206   ])# _LT_SYS_MODULE_PATH_AIX
1207  
1208  
# Line 1216 | Line 1227 | ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
1227  
1228   AC_MSG_CHECKING([how to print strings])
1229   # Test print first, because it will be a builtin if present.
1230 < if test "X`print -r -- -n 2>/dev/null`" = X-n && \
1230 > if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
1231     test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
1232    ECHO='print -r --'
1233   elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
# Line 1260 | Line 1271 | _LT_DECL([], [ECHO], [1], [An echo progr
1271   ])# _LT_PROG_ECHO_BACKSLASH
1272  
1273  
1274 + # _LT_WITH_SYSROOT
1275 + # ----------------
1276 + AC_DEFUN([_LT_WITH_SYSROOT],
1277 + [AC_MSG_CHECKING([for sysroot])
1278 + AC_ARG_WITH([sysroot],
1279 + [  --with-sysroot[=DIR] Search for dependent libraries within DIR
1280 +                        (or the compiler's sysroot if not specified).],
1281 + [], [with_sysroot=no])
1282 +
1283 + dnl lt_sysroot will always be passed unquoted.  We quote it here
1284 + dnl in case the user passed a directory name.
1285 + lt_sysroot=
1286 + case ${with_sysroot} in #(
1287 + yes)
1288 +   if test "$GCC" = yes; then
1289 +     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
1290 +   fi
1291 +   ;; #(
1292 + /*)
1293 +   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
1294 +   ;; #(
1295 + no|'')
1296 +   ;; #(
1297 + *)
1298 +   AC_MSG_RESULT([${with_sysroot}])
1299 +   AC_MSG_ERROR([The sysroot must be an absolute path.])
1300 +   ;;
1301 + esac
1302 +
1303 + AC_MSG_RESULT([${lt_sysroot:-no}])
1304 + _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
1305 + [dependent libraries, and in which our libraries should be installed.])])
1306 +
1307   # _LT_ENABLE_LOCK
1308   # ---------------
1309   m4_defun([_LT_ENABLE_LOCK],
# Line 1406 | Line 1450 | need_locks="$enable_libtool_lock"
1450   ])# _LT_ENABLE_LOCK
1451  
1452  
1453 + # _LT_PROG_AR
1454 + # -----------
1455 + m4_defun([_LT_PROG_AR],
1456 + [AC_CHECK_TOOLS(AR, [ar], false)
1457 + : ${AR=ar}
1458 + : ${AR_FLAGS=cru}
1459 + _LT_DECL([], [AR], [1], [The archiver])
1460 + _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
1461 +
1462 + AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
1463 +  [lt_cv_ar_at_file=no
1464 +   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
1465 +     [echo conftest.$ac_objext > conftest.lst
1466 +      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
1467 +      AC_TRY_EVAL([lt_ar_try])
1468 +      if test "$ac_status" -eq 0; then
1469 +        # Ensure the archiver fails upon bogus file names.
1470 +        rm -f conftest.$ac_objext libconftest.a
1471 +        AC_TRY_EVAL([lt_ar_try])
1472 +        if test "$ac_status" -ne 0; then
1473 +          lt_cv_ar_at_file=@
1474 +        fi
1475 +      fi
1476 +      rm -f conftest.* libconftest.a
1477 +     ])
1478 +  ])
1479 +
1480 + if test "x$lt_cv_ar_at_file" = xno; then
1481 +  archiver_list_spec=
1482 + else
1483 +  archiver_list_spec=$lt_cv_ar_at_file
1484 + fi
1485 + _LT_DECL([], [archiver_list_spec], [1],
1486 +  [How to feed a file listing to the archiver])
1487 + ])# _LT_PROG_AR
1488 +
1489 +
1490   # _LT_CMD_OLD_ARCHIVE
1491   # -------------------
1492   m4_defun([_LT_CMD_OLD_ARCHIVE],
1493 < [AC_CHECK_TOOL(AR, ar, false)
1413 < test -z "$AR" && AR=ar
1414 < test -z "$AR_FLAGS" && AR_FLAGS=cru
1415 < _LT_DECL([], [AR], [1], [The archiver])
1416 < _LT_DECL([], [AR_FLAGS], [1])
1493 > [_LT_PROG_AR
1494  
1495   AC_CHECK_TOOL(STRIP, strip, :)
1496   test -z "$STRIP" && STRIP=:
# Line 1753 | Line 1830 | else
1830   /* When -fvisbility=hidden is used, assume the code has been annotated
1831     correspondingly for the symbols needed.  */
1832   #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
1833 < void fnord () __attribute__((visibility("default")));
1833 > int fnord () __attribute__((visibility("default")));
1834   #endif
1835  
1836 < void fnord () { int i=42; }
1836 > int fnord () { return 42; }
1837   int main ()
1838   {
1839    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
# Line 2296 | Line 2373 | cygwin* | mingw* | pw32* | cegcc*)
2373    need_version=no
2374    need_lib_prefix=no
2375  
2376 <  case $GCC,$host_os in
2377 <  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
2376 >  case $GCC,$cc_basename in
2377 >  yes,*)
2378 >    # gcc
2379      library_names_spec='$libname.dll.a'
2380      # DLL is installed to $(libdir)/../bin by postinstall_cmds
2381      postinstall_cmds='base_file=`basename \${file}`~
# Line 2330 | Line 2408 | m4_if([$1], [],[
2408        library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2409        ;;
2410      esac
2411 +    dynamic_linker='Win32 ld.exe'
2412 +    ;;
2413 +
2414 +  *,cl*)
2415 +    # Native MSVC
2416 +    libname_spec='$name'
2417 +    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2418 +    library_names_spec='${libname}.dll.lib'
2419 +
2420 +    case $build_os in
2421 +    mingw*)
2422 +      sys_lib_search_path_spec=
2423 +      lt_save_ifs=$IFS
2424 +      IFS=';'
2425 +      for lt_path in $LIB
2426 +      do
2427 +        IFS=$lt_save_ifs
2428 +        # Let DOS variable expansion print the short 8.3 style file name.
2429 +        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
2430 +        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
2431 +      done
2432 +      IFS=$lt_save_ifs
2433 +      # Convert to MSYS style.
2434 +      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
2435 +      ;;
2436 +    cygwin*)
2437 +      # Convert to unix form, then to dos form, then back to unix form
2438 +      # but this time dos style (no spaces!) so that the unix form looks
2439 +      # like /cygdrive/c/PROGRA~1:/cygdr...
2440 +      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
2441 +      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
2442 +      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
2443 +      ;;
2444 +    *)
2445 +      sys_lib_search_path_spec="$LIB"
2446 +      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
2447 +        # It is most probably a Windows format PATH.
2448 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
2449 +      else
2450 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
2451 +      fi
2452 +      # FIXME: find the short name or the path components, as spaces are
2453 +      # common. (e.g. "Program Files" -> "PROGRA~1")
2454 +      ;;
2455 +    esac
2456 +
2457 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
2458 +    postinstall_cmds='base_file=`basename \${file}`~
2459 +      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
2460 +      dldir=$destdir/`dirname \$dlpath`~
2461 +      test -d \$dldir || mkdir -p \$dldir~
2462 +      $install_prog $dir/$dlname \$dldir/$dlname'
2463 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
2464 +      dlpath=$dir/\$dldll~
2465 +       $RM \$dlpath'
2466 +    shlibpath_overrides_runpath=yes
2467 +    dynamic_linker='Win32 link.exe'
2468      ;;
2469  
2470    *)
2471 +    # Assume MSVC wrapper
2472      library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
2473 +    dynamic_linker='Win32 ld.exe'
2474      ;;
2475    esac
2339  dynamic_linker='Win32 ld.exe'
2476    # FIXME: first we should search . and the directory the executable is in
2477    shlibpath_var=PATH
2478    ;;
# Line 3040 | Line 3176 | case $reload_flag in
3176   esac
3177   reload_cmds='$LD$reload_flag -o $output$reload_objs'
3178   case $host_os in
3179 +  cygwin* | mingw* | pw32* | cegcc*)
3180 +    if test "$GCC" != yes; then
3181 +      reload_cmds=false
3182 +    fi
3183 +    ;;
3184    darwin*)
3185      if test "$GCC" = yes; then
3186        reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
# Line 3258 | Line 3399 | tpf*)
3399    ;;
3400   esac
3401   ])
3402 +
3403 + file_magic_glob=
3404 + want_nocaseglob=no
3405 + if test "$build" = "$host"; then
3406 +  case $host_os in
3407 +  mingw* | pw32*)
3408 +    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
3409 +      want_nocaseglob=yes
3410 +    else
3411 +      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
3412 +    fi
3413 +    ;;
3414 +  esac
3415 + fi
3416 +
3417   file_magic_cmd=$lt_cv_file_magic_cmd
3418   deplibs_check_method=$lt_cv_deplibs_check_method
3419   test -z "$deplibs_check_method" && deplibs_check_method=unknown
# Line 3265 | Line 3421 | test -z "$deplibs_check_method" && depli
3421   _LT_DECL([], [deplibs_check_method], [1],
3422      [Method to check whether dependent libraries are shared objects])
3423   _LT_DECL([], [file_magic_cmd], [1],
3424 <    [Command to use when deplibs_check_method == "file_magic"])
3424 >    [Command to use when deplibs_check_method = "file_magic"])
3425 > _LT_DECL([], [file_magic_glob], [1],
3426 >    [How to find potential files when deplibs_check_method = "file_magic"])
3427 > _LT_DECL([], [want_nocaseglob], [1],
3428 >    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
3429   ])# _LT_CHECK_MAGIC_METHOD
3430  
3431  
# Line 3368 | Line 3528 | dnl aclocal-1.4 backwards compatibility:
3528   dnl AC_DEFUN([AM_PROG_NM], [])
3529   dnl AC_DEFUN([AC_PROG_NM], [])
3530  
3531 + # _LT_CHECK_SHAREDLIB_FROM_LINKLIB
3532 + # --------------------------------
3533 + # how to determine the name of the shared library
3534 + # associated with a specific link library.
3535 + #  -- PORTME fill in with the dynamic library characteristics
3536 + m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
3537 + [m4_require([_LT_DECL_EGREP])
3538 + m4_require([_LT_DECL_OBJDUMP])
3539 + m4_require([_LT_DECL_DLLTOOL])
3540 + AC_CACHE_CHECK([how to associate runtime and link libraries],
3541 + lt_cv_sharedlib_from_linklib_cmd,
3542 + [lt_cv_sharedlib_from_linklib_cmd='unknown'
3543 +
3544 + case $host_os in
3545 + cygwin* | mingw* | pw32* | cegcc*)
3546 +  # two different shell functions defined in ltmain.sh
3547 +  # decide which to use based on capabilities of $DLLTOOL
3548 +  case `$DLLTOOL --help 2>&1` in
3549 +  *--identify-strict*)
3550 +    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
3551 +    ;;
3552 +  *)
3553 +    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
3554 +    ;;
3555 +  esac
3556 +  ;;
3557 + *)
3558 +  # fallback: assume linklib IS sharedlib
3559 +  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
3560 +  ;;
3561 + esac
3562 + ])
3563 + sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
3564 + test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
3565 +
3566 + _LT_DECL([], [sharedlib_from_linklib_cmd], [1],
3567 +    [Command to associate shared and link libraries])
3568 + ])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
3569 +
3570 +
3571 + # _LT_PATH_MANIFEST_TOOL
3572 + # ----------------------
3573 + # locate the manifest tool
3574 + m4_defun([_LT_PATH_MANIFEST_TOOL],
3575 + [AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
3576 + test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
3577 + AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
3578 +  [lt_cv_path_mainfest_tool=no
3579 +  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
3580 +  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
3581 +  cat conftest.err >&AS_MESSAGE_LOG_FD
3582 +  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
3583 +    lt_cv_path_mainfest_tool=yes
3584 +  fi
3585 +  rm -f conftest*])
3586 + if test "x$lt_cv_path_mainfest_tool" != xyes; then
3587 +  MANIFEST_TOOL=:
3588 + fi
3589 + _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
3590 + ])# _LT_PATH_MANIFEST_TOOL
3591 +
3592  
3593   # LT_LIB_M
3594   # --------
# Line 3494 | Line 3715 | esac
3715   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
3716  
3717   # Transform an extracted symbol line into symbol name and symbol address
3718 < lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
3719 < 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'"
3718 > lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
3719 > 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'"
3720  
3721   # Handle CRLF in mingw tool chain
3722   opt_cr=
# Line 3531 | Line 3752 | for ac_symprfx in "" "_"; do
3752    else
3753      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[     ]]\($symcode$symcode*\)[[       ]][[    ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
3754    fi
3755 +  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
3756  
3757    # Check to see that the pipe works correctly.
3758    pipe_works=no
# Line 3564 | Line 3786 | _LT_EOF
3786        if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
3787          if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
3788            cat <<_LT_EOF > conftest.$ac_ext
3789 + /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
3790 + #if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
3791 + /* DATA imports from DLLs on WIN32 con't be const, because runtime
3792 +   relocations are performed -- see ld's documentation on pseudo-relocs.  */
3793 + # define LT@&t@_DLSYM_CONST
3794 + #elif defined(__osf__)
3795 + /* This system does not cope well with relocations in const data.  */
3796 + # define LT@&t@_DLSYM_CONST
3797 + #else
3798 + # define LT@&t@_DLSYM_CONST const
3799 + #endif
3800 +
3801   #ifdef __cplusplus
3802   extern "C" {
3803   #endif
# Line 3575 | Line 3809 | _LT_EOF
3809            cat <<_LT_EOF >> conftest.$ac_ext
3810  
3811   /* The mapping between symbol names and symbols.  */
3812 < const struct {
3812 > LT@&t@_DLSYM_CONST struct {
3813    const char *name;
3814    void       *address;
3815   }
# Line 3601 | Line 3835 | static const void *lt_preloaded_setup()
3835   _LT_EOF
3836            # Now try linking the two files.
3837            mv conftest.$ac_objext conftstm.$ac_objext
3838 <          lt_save_LIBS="$LIBS"
3839 <          lt_save_CFLAGS="$CFLAGS"
3838 >          lt_globsym_save_LIBS=$LIBS
3839 >          lt_globsym_save_CFLAGS=$CFLAGS
3840            LIBS="conftstm.$ac_objext"
3841            CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
3842            if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
3843              pipe_works=yes
3844            fi
3845 <          LIBS="$lt_save_LIBS"
3846 <          CFLAGS="$lt_save_CFLAGS"
3845 >          LIBS=$lt_globsym_save_LIBS
3846 >          CFLAGS=$lt_globsym_save_CFLAGS
3847          else
3848            echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
3849          fi
# Line 3642 | Line 3876 | else
3876    AC_MSG_RESULT(ok)
3877   fi
3878  
3879 + # Response file support.
3880 + if test "$lt_cv_nm_interface" = "MS dumpbin"; then
3881 +  nm_file_list_spec='@'
3882 + elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
3883 +  nm_file_list_spec='@'
3884 + fi
3885 +
3886   _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
3887      [Take the output of nm and produce a listing of raw symbols and C names])
3888   _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
# Line 3652 | Line 3893 | _LT_DECL([global_symbol_to_c_name_addres
3893   _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
3894      [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
3895      [Transform the output of nm in a C name address pair when lib prefix is needed])
3896 + _LT_DECL([], [nm_file_list_spec], [1],
3897 +    [Specify filename containing input files for $NM])
3898   ]) # _LT_CMD_GLOBAL_SYMBOLS
3899  
3900  
# Line 3663 | Line 3906 | _LT_TAGVAR(lt_prog_compiler_wl, $1)=
3906   _LT_TAGVAR(lt_prog_compiler_pic, $1)=
3907   _LT_TAGVAR(lt_prog_compiler_static, $1)=
3908  
3666 AC_MSG_CHECKING([for $compiler option to produce PIC])
3909   m4_if([$1], [CXX], [
3910    # C++ specific cases for pic, static, wl, etc.
3911    if test "$GXX" = yes; then
# Line 3768 | Line 4010 | m4_if([$1], [CXX], [
4010            ;;
4011          esac
4012          ;;
4013 +      mingw* | cygwin* | os2* | pw32* | cegcc*)
4014 +        # This hack is so that the source file can tell whether it is being
4015 +        # built for inclusion in a dll (and should export symbols for example).
4016 +        m4_if([$1], [GCJ], [],
4017 +          [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
4018 +        ;;
4019        dgux*)
4020          case $cc_basename in
4021            ec++*)
# Line 4142 | Line 4390 | m4_if([$1], [CXX], [
4390          _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
4391          _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
4392          ;;
4393 +      nagfor*)
4394 +        # NAG Fortran compiler
4395 +        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
4396 +        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
4397 +        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
4398 +        ;;
4399        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4400          # Portland Group compilers (*not* the Pentium gcc compiler,
4401          # which looks to be a dead project)
# Line 4261 | Line 4515 | case $host_os in
4515      _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
4516      ;;
4517   esac
4518 < AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
4519 < _LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
4520 <        [How to pass a linker flag through the compiler])
4518 >
4519 > AC_CACHE_CHECK([for $compiler option to produce PIC],
4520 >  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
4521 >  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
4522 > _LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
4523  
4524   #
4525   # Check to make sure the PIC flag actually works.
# Line 4282 | Line 4538 | fi
4538   _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
4539          [Additional compiler flags for building library objects])
4540  
4541 + _LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
4542 +        [How to pass a linker flag through the compiler])
4543   #
4544   # Check to make sure the static flag actually works.
4545   #
# Line 4302 | Line 4560 | _LT_TAGDECL([link_static_flag], [lt_prog
4560   m4_defun([_LT_LINKER_SHLIBS],
4561   [AC_REQUIRE([LT_PATH_LD])dnl
4562   AC_REQUIRE([LT_PATH_NM])dnl
4563 + m4_require([_LT_PATH_MANIFEST_TOOL])dnl
4564   m4_require([_LT_FILEUTILS_DEFAULTS])dnl
4565   m4_require([_LT_DECL_EGREP])dnl
4566   m4_require([_LT_DECL_SED])dnl
# Line 4310 | Line 4569 | m4_require([_LT_TAG_COMPILER])dnl
4569   AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
4570   m4_if([$1], [CXX], [
4571    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
4572 +  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
4573    case $host_os in
4574    aix[[4-9]]*)
4575      # If we're using GNU nm, then we don't want the "-C" option.
# Line 4324 | Line 4584 | m4_if([$1], [CXX], [
4584      ;;
4585    pw32*)
4586      _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
4587 <  ;;
4587 >    ;;
4588    cygwin* | mingw* | cegcc*)
4589 <    _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'
4590 <  ;;
4589 >    case $cc_basename in
4590 >    cl*) ;;
4591 >    *)
4592 >      _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'
4593 >      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
4594 >      ;;
4595 >    esac
4596 >    ;;
4597    *)
4598      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
4599 <  ;;
4599 >    ;;
4600    esac
4335  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
4601   ], [
4602    runpath_var=
4603    _LT_TAGVAR(allow_undefined_flag, $1)=
# Line 4500 | Line 4765 | _LT_EOF
4765        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
4766        _LT_TAGVAR(always_export_symbols, $1)=no
4767        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
4768 <      _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'
4768 >      _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'
4769 >      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
4770  
4771        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
4772          _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'
# Line 4548 | Line 4814 | _LT_EOF
4814        if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
4815           && test "$tmp_diet" = no
4816        then
4817 <        tmp_addflag=
4817 >        tmp_addflag=' $pic_flag'
4818          tmp_sharedflag='-shared'
4819          case $cc_basename,$host_cpu in
4820          pgcc*)                          # Portland Group C compiler
# Line 4618 | Line 4884 | _LT_EOF
4884          _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4885          wlarc=
4886        else
4887 <        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4888 <        _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'
4887 >        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4888 >        _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'
4889        fi
4890        ;;
4891  
# Line 4637 | Line 4903 | _LT_EOF
4903  
4904   _LT_EOF
4905        elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4906 <        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4907 <        _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'
4906 >        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4907 >        _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'
4908        else
4909          _LT_TAGVAR(ld_shlibs, $1)=no
4910        fi
# Line 4684 | Line 4950 | _LT_EOF
4950  
4951      *)
4952        if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
4953 <        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4954 <        _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'
4953 >        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
4954 >        _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'
4955        else
4956          _LT_TAGVAR(ld_shlibs, $1)=no
4957        fi
# Line 4815 | Line 5081 | _LT_EOF
5081          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
5082          # Determine the default libpath from the value encoded in an
5083          # empty executable.
5084 <        _LT_SYS_MODULE_PATH_AIX
5084 >        _LT_SYS_MODULE_PATH_AIX([$1])
5085          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
5086          _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"
5087        else
# Line 4826 | Line 5092 | _LT_EOF
5092          else
5093           # Determine the default libpath from the value encoded in an
5094           # empty executable.
5095 <         _LT_SYS_MODULE_PATH_AIX
5095 >         _LT_SYS_MODULE_PATH_AIX([$1])
5096           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
5097            # Warning - without using the other run time loading flags,
5098            # -berok will link without error, but may produce a broken library.
# Line 4870 | Line 5136 | _LT_EOF
5136        # Microsoft Visual C++.
5137        # hardcode_libdir_flag_spec is actually meaningless, as there is
5138        # no search path for DLLs.
5139 <      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
5140 <      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
5141 <      # Tell ltmain to make .lib files, not .a files.
5142 <      libext=lib
5143 <      # Tell ltmain to make .dll files, not .so files.
5144 <      shrext_cmds=".dll"
5145 <      # FIXME: Setting linknames here is a bad hack.
5146 <      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
5147 <      # The linker will automatically build a .lib file if we build a DLL.
5148 <      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
5149 <      # FIXME: Should let the user specify the lib program.
5150 <      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
5151 <      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
5152 <      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
5139 >      case $cc_basename in
5140 >      cl*)
5141 >        # Native MSVC
5142 >        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
5143 >        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
5144 >        _LT_TAGVAR(always_export_symbols, $1)=yes
5145 >        _LT_TAGVAR(file_list_spec, $1)='@'
5146 >        # Tell ltmain to make .lib files, not .a files.
5147 >        libext=lib
5148 >        # Tell ltmain to make .dll files, not .so files.
5149 >        shrext_cmds=".dll"
5150 >        # FIXME: Setting linknames here is a bad hack.
5151 >        _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
5152 >        _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
5153 >            sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
5154 >          else
5155 >            sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
5156 >          fi~
5157 >          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
5158 >          linknames='
5159 >        # The linker will not automatically build a static lib if we build a DLL.
5160 >        # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
5161 >        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
5162 >        _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'
5163 >        # Don't use ranlib
5164 >        _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
5165 >        _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
5166 >          lt_tool_outputfile="@TOOL_OUTPUT@"~
5167 >          case $lt_outputfile in
5168 >            *.exe|*.EXE) ;;
5169 >            *)
5170 >              lt_outputfile="$lt_outputfile.exe"
5171 >              lt_tool_outputfile="$lt_tool_outputfile.exe"
5172 >              ;;
5173 >          esac~
5174 >          if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
5175 >            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
5176 >            $RM "$lt_outputfile.manifest";
5177 >          fi'
5178 >        ;;
5179 >      *)
5180 >        # Assume MSVC wrapper
5181 >        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
5182 >        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
5183 >        # Tell ltmain to make .lib files, not .a files.
5184 >        libext=lib
5185 >        # Tell ltmain to make .dll files, not .so files.
5186 >        shrext_cmds=".dll"
5187 >        # FIXME: Setting linknames here is a bad hack.
5188 >        _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
5189 >        # The linker will automatically build a .lib file if we build a DLL.
5190 >        _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
5191 >        # FIXME: Should let the user specify the lib program.
5192 >        _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
5193 >        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
5194 >        ;;
5195 >      esac
5196        ;;
5197  
5198      darwin* | rhapsody*)
# Line 4921 | Line 5230 | _LT_EOF
5230  
5231      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
5232      freebsd* | dragonfly*)
5233 <      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
5233 >      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
5234        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5235        _LT_TAGVAR(hardcode_direct, $1)=yes
5236        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
# Line 4929 | Line 5238 | _LT_EOF
5238  
5239      hpux9*)
5240        if test "$GCC" = yes; then
5241 <        _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'
5241 >        _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'
5242        else
5243          _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'
5244        fi
# Line 4945 | Line 5254 | _LT_EOF
5254  
5255      hpux10*)
5256        if test "$GCC" = yes && test "$with_gnu_ld" = no; then
5257 <        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5257 >        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5258        else
5259          _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
5260        fi
# Line 4969 | Line 5278 | _LT_EOF
5278            _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5279            ;;
5280          ia64*)
5281 <          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
5281 >          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
5282            ;;
5283          *)
5284 <          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5284 >          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5285            ;;
5286          esac
5287        else
# Line 5019 | Line 5328 | _LT_EOF
5328  
5329      irix5* | irix6* | nonstopux*)
5330        if test "$GCC" = yes; then
5331 <        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $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'
5331 >        _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'
5332          # Try to use the -exported_symbol ld option, if it does not
5333          # work, assume that -exports_file does not work either and
5334          # implicitly export all symbols.
5335 <        save_LDFLAGS="$LDFLAGS"
5336 <        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5337 <        AC_LINK_IFELSE(int foo(void) {},
5338 <          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $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'
5339 <        )
5340 <        LDFLAGS="$save_LDFLAGS"
5335 >        # This should be the same for all languages, so no per-tag cache variable.
5336 >        AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
5337 >          [lt_cv_irix_exported_symbol],
5338 >          [save_LDFLAGS="$LDFLAGS"
5339 >           LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
5340 >           AC_LINK_IFELSE(
5341 >             [AC_LANG_SOURCE(
5342 >                [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
5343 >                              [C++], [[int foo (void) { return 0; }]],
5344 >                              [Fortran 77], [[
5345 >      subroutine foo
5346 >      end]],
5347 >                              [Fortran], [[
5348 >      subroutine foo
5349 >      end]])])],
5350 >              [lt_cv_irix_exported_symbol=yes],
5351 >              [lt_cv_irix_exported_symbol=no])
5352 >           LDFLAGS="$save_LDFLAGS"])
5353 >        if test "$lt_cv_irix_exported_symbol" = yes; then
5354 >          _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'
5355 >        fi
5356        else
5357          _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'
5358          _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'
# Line 5113 | Line 5437 | _LT_EOF
5437      osf4* | osf5*)      # as osf3* with the addition of -msym flag
5438        if test "$GCC" = yes; then
5439          _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
5440 <        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_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'
5440 >        _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'
5441          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
5442        else
5443          _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
# Line 5132 | Line 5456 | _LT_EOF
5456        _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
5457        if test "$GCC" = yes; then
5458          wlarc='${wl}'
5459 <        _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5459 >        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5460          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
5461 <          $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
5461 >          $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'
5462        else
5463          case `$CC -V 2>&1` in
5464          *"Compilers 5.0"*)
# Line 5406 | Line 5730 | _LT_TAGDECL([], [inherit_rpath], [0],
5730      to runtime path list])
5731   _LT_TAGDECL([], [link_all_deplibs], [0],
5732      [Whether libtool must link a program against all its dependency libraries])
5409 _LT_TAGDECL([], [fix_srcfile_path], [1],
5410    [Fix the shell variable $srcfile for the compiler])
5733   _LT_TAGDECL([], [always_export_symbols], [0],
5734      [Set to "yes" if exported symbols are required])
5735   _LT_TAGDECL([], [export_symbols_cmds], [2],
# Line 5418 | Line 5740 | _LT_TAGDECL([], [include_expsyms], [1],
5740      [Symbols that must always be exported])
5741   _LT_TAGDECL([], [prelink_cmds], [2],
5742      [Commands necessary for linking programs (against libraries) with templates])
5743 + _LT_TAGDECL([], [postlink_cmds], [2],
5744 +    [Commands necessary for finishing linking programs])
5745   _LT_TAGDECL([], [file_list_spec], [1],
5746      [Specify filename containing input files])
5747   dnl FIXME: Not yet implemented
# Line 5515 | Line 5839 | CC="$lt_save_CC"
5839   m4_defun([_LT_LANG_CXX_CONFIG],
5840   [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
5841   m4_require([_LT_DECL_EGREP])dnl
5842 + m4_require([_LT_PATH_MANIFEST_TOOL])dnl
5843   if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
5844      ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
5845      (test "X$CXX" != "Xg++"))) ; then
# Line 5576 | Line 5901 | if test "$_lt_caught_CXX_error" != yes;
5901  
5902    # Allow CC to be a program name with arguments.
5903    lt_save_CC=$CC
5904 +  lt_save_CFLAGS=$CFLAGS
5905    lt_save_LD=$LD
5906    lt_save_GCC=$GCC
5907    GCC=$GXX
# Line 5593 | Line 5919 | if test "$_lt_caught_CXX_error" != yes;
5919    fi
5920    test -z "${LDCXX+set}" || LD=$LDCXX
5921    CC=${CXX-"c++"}
5922 +  CFLAGS=$CXXFLAGS
5923    compiler=$CC
5924    _LT_TAGVAR(compiler, $1)=$CC
5925    _LT_CC_BASENAME([$compiler])
# Line 5614 | Line 5941 | if test "$_lt_caught_CXX_error" != yes;
5941        # Check if GNU C++ uses GNU ld as the underlying linker, since the
5942        # archiving commands below assume that GNU ld is being used.
5943        if test "$with_gnu_ld" = yes; then
5944 <        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
5945 <        _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'
5944 >        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
5945 >        _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'
5946  
5947          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
5948          _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
# Line 5756 | Line 6083 | if test "$_lt_caught_CXX_error" != yes;
6083            _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
6084            # Determine the default libpath from the value encoded in an empty
6085            # executable.
6086 <          _LT_SYS_MODULE_PATH_AIX
6086 >          _LT_SYS_MODULE_PATH_AIX([$1])
6087            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
6088  
6089            _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"
# Line 5768 | Line 6095 | if test "$_lt_caught_CXX_error" != yes;
6095            else
6096              # Determine the default libpath from the value encoded in an
6097              # empty executable.
6098 <            _LT_SYS_MODULE_PATH_AIX
6098 >            _LT_SYS_MODULE_PATH_AIX([$1])
6099              _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
6100              # Warning - without using the other run time loading flags,
6101              # -berok will link without error, but may produce a broken library.
# Line 5810 | Line 6137 | if test "$_lt_caught_CXX_error" != yes;
6137          ;;
6138  
6139        cygwin* | mingw* | pw32* | cegcc*)
6140 <        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
6141 <        # as there is no search path for DLLs.
6142 <        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
6143 <        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
6144 <        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
6145 <        _LT_TAGVAR(always_export_symbols, $1)=no
6146 <        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
6147 <
6148 <        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6149 <          _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'
6150 <          # If the export-symbols file already is a .def file (1st line
6151 <          # is EXPORTS), use it as is; otherwise, prepend...
6152 <          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6153 <            cp $export_symbols $output_objdir/$soname.def;
6154 <          else
6155 <            echo EXPORTS > $output_objdir/$soname.def;
6156 <            cat $export_symbols >> $output_objdir/$soname.def;
6157 <          fi~
6158 <          $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'
6159 <        else
6160 <          _LT_TAGVAR(ld_shlibs, $1)=no
6161 <        fi
6162 <        ;;
6140 >        case $GXX,$cc_basename in
6141 >        ,cl* | no,cl*)
6142 >          # Native MSVC
6143 >          # hardcode_libdir_flag_spec is actually meaningless, as there is
6144 >          # no search path for DLLs.
6145 >          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
6146 >          _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
6147 >          _LT_TAGVAR(always_export_symbols, $1)=yes
6148 >          _LT_TAGVAR(file_list_spec, $1)='@'
6149 >          # Tell ltmain to make .lib files, not .a files.
6150 >          libext=lib
6151 >          # Tell ltmain to make .dll files, not .so files.
6152 >          shrext_cmds=".dll"
6153 >          # FIXME: Setting linknames here is a bad hack.
6154 >          _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
6155 >          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6156 >              $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
6157 >            else
6158 >              $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
6159 >            fi~
6160 >            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
6161 >            linknames='
6162 >          # The linker will not automatically build a static lib if we build a DLL.
6163 >          # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
6164 >          _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
6165 >          # Don't use ranlib
6166 >          _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
6167 >          _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
6168 >            lt_tool_outputfile="@TOOL_OUTPUT@"~
6169 >            case $lt_outputfile in
6170 >              *.exe|*.EXE) ;;
6171 >              *)
6172 >                lt_outputfile="$lt_outputfile.exe"
6173 >                lt_tool_outputfile="$lt_tool_outputfile.exe"
6174 >                ;;
6175 >            esac~
6176 >            func_to_tool_file "$lt_outputfile"~
6177 >            if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
6178 >              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
6179 >              $RM "$lt_outputfile.manifest";
6180 >            fi'
6181 >          ;;
6182 >        *)
6183 >          # g++
6184 >          # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
6185 >          # as there is no search path for DLLs.
6186 >          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
6187 >          _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
6188 >          _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
6189 >          _LT_TAGVAR(always_export_symbols, $1)=no
6190 >          _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
6191 >
6192 >          if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
6193 >            _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'
6194 >            # If the export-symbols file already is a .def file (1st line
6195 >            # is EXPORTS), use it as is; otherwise, prepend...
6196 >            _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
6197 >              cp $export_symbols $output_objdir/$soname.def;
6198 >            else
6199 >              echo EXPORTS > $output_objdir/$soname.def;
6200 >              cat $export_symbols >> $output_objdir/$soname.def;
6201 >            fi~
6202 >            $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'
6203 >          else
6204 >            _LT_TAGVAR(ld_shlibs, $1)=no
6205 >          fi
6206 >          ;;
6207 >        esac
6208 >        ;;
6209        darwin* | rhapsody*)
6210          _LT_DARWIN_LINKER_FEATURES($1)
6211          ;;
# Line 5907 | Line 6280 | if test "$_lt_caught_CXX_error" != yes;
6280              ;;
6281            *)
6282              if test "$GXX" = yes; then
6283 <              _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'
6283 >              _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'
6284              else
6285                # FIXME: insert proper C++ library support
6286                _LT_TAGVAR(ld_shlibs, $1)=no
# Line 5978 | Line 6351 | if test "$_lt_caught_CXX_error" != yes;
6351                      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
6352                      ;;
6353                    ia64*)
6354 <                    _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'
6354 >                    _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'
6355                      ;;
6356                    *)
6357 <                    _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'
6357 >                    _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'
6358                      ;;
6359                  esac
6360                fi
# Line 6022 | Line 6395 | if test "$_lt_caught_CXX_error" != yes;
6395            *)
6396              if test "$GXX" = yes; then
6397                if test "$with_gnu_ld" = no; then
6398 <                _LT_TAGVAR(archive_cmds, $1)='$CC -shared -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'
6398 >                _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'
6399                else
6400 <                _LT_TAGVAR(archive_cmds, $1)='$CC -shared -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'
6400 >                _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'
6401                fi
6402              fi
6403              _LT_TAGVAR(link_all_deplibs, $1)=yes
# Line 6302 | Line 6675 | if test "$_lt_caught_CXX_error" != yes;
6675                    _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'
6676                    ;;
6677                  *)
6678 <                  _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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
6678 >                  _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'
6679                    ;;
6680                esac
6681  
# Line 6389 | Line 6762 | if test "$_lt_caught_CXX_error" != yes;
6762              if test "$GXX" = yes && test "$with_gnu_ld" = no; then
6763                _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
6764                if $CC --version | $GREP -v '^2\.7' > /dev/null; then
6765 <                _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
6765 >                _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'
6766                  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
6767 <                  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
6767 >                  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
6768  
6769                  # Commands to make compiler produce verbose output that lists
6770                  # what "hidden" libraries, object files and flags are used when
# Line 6520 | Line 6893 | if test "$_lt_caught_CXX_error" != yes;
6893    fi # test -n "$compiler"
6894  
6895    CC=$lt_save_CC
6896 +  CFLAGS=$lt_save_CFLAGS
6897    LDCXX=$LD
6898    LD=$lt_save_LD
6899    GCC=$lt_save_GCC
# Line 6534 | Line 6908 | AC_LANG_POP
6908   ])# _LT_LANG_CXX_CONFIG
6909  
6910  
6911 + # _LT_FUNC_STRIPNAME_CNF
6912 + # ----------------------
6913 + # func_stripname_cnf prefix suffix name
6914 + # strip PREFIX and SUFFIX off of NAME.
6915 + # PREFIX and SUFFIX must not contain globbing or regex special
6916 + # characters, hashes, percent signs, but SUFFIX may contain a leading
6917 + # dot (in which case that matches only a dot).
6918 + #
6919 + # This function is identical to the (non-XSI) version of func_stripname,
6920 + # except this one can be used by m4 code that may be executed by configure,
6921 + # rather than the libtool script.
6922 + m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
6923 + AC_REQUIRE([_LT_DECL_SED])
6924 + AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
6925 + func_stripname_cnf ()
6926 + {
6927 +  case ${2} in
6928 +  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
6929 +  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
6930 +  esac
6931 + } # func_stripname_cnf
6932 + ])# _LT_FUNC_STRIPNAME_CNF
6933 +
6934   # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
6935   # ---------------------------------
6936   # Figure out "hidden" library dependencies from verbose
# Line 6542 | Line 6939 | AC_LANG_POP
6939   # objects, libraries and library flags.
6940   m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
6941   [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
6942 + AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
6943   # Dependencies to place before and after the object being linked:
6944   _LT_TAGVAR(predep_objects, $1)=
6945   _LT_TAGVAR(postdep_objects, $1)=
# Line 6592 | Line 6990 | public class foo {
6990   };
6991   _LT_EOF
6992   ])
6993 +
6994 + _lt_libdeps_save_CFLAGS=$CFLAGS
6995 + case "$CC $CFLAGS " in #(
6996 + *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
6997 + *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
6998 + esac
6999 +
7000   dnl Parse the compiler output and extract the necessary
7001   dnl objects, libraries and library flags.
7002   if AC_TRY_EVAL(ac_compile); then
# Line 6603 | Line 7008 | if AC_TRY_EVAL(ac_compile); then
7008    pre_test_object_deps_done=no
7009  
7010    for p in `eval "$output_verbose_link_cmd"`; do
7011 <    case $p in
7011 >    case ${prev}${p} in
7012  
7013      -L* | -R* | -l*)
7014         # Some compilers place space between "-{L,R}" and the path.
# Line 6612 | Line 7017 | if AC_TRY_EVAL(ac_compile); then
7017            test $p = "-R"; then
7018           prev=$p
7019           continue
6615       else
6616         prev=
7020         fi
7021  
7022 +       # Expand the sysroot to ease extracting the directories later.
7023 +       if test -z "$prev"; then
7024 +         case $p in
7025 +         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
7026 +         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
7027 +         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
7028 +         esac
7029 +       fi
7030 +       case $p in
7031 +       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
7032 +       esac
7033         if test "$pre_test_object_deps_done" = no; then
7034 <         case $p in
7035 <         -L* | -R*)
7034 >         case ${prev} in
7035 >         -L | -R)
7036             # Internal compiler library paths should come after those
7037             # provided the user.  The postdeps already come after the
7038             # user supplied libs so there is no need to process them.
# Line 6638 | Line 7052 | if AC_TRY_EVAL(ac_compile); then
7052             _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
7053           fi
7054         fi
7055 +       prev=
7056         ;;
7057  
7058 +    *.lto.$objext) ;; # Ignore GCC LTO objects
7059      *.$objext)
7060         # This assumes that the test object file only shows up
7061         # once in the compiler output.
# Line 6675 | Line 7091 | else
7091   fi
7092  
7093   $RM -f confest.$objext
7094 + CFLAGS=$_lt_libdeps_save_CFLAGS
7095  
7096   # PORTME: override above test on systems where it is broken
7097   m4_if([$1], [CXX],
# Line 6824 | Line 7241 | if test "$_lt_disable_F77" != yes; then
7241    # Allow CC to be a program name with arguments.
7242    lt_save_CC="$CC"
7243    lt_save_GCC=$GCC
7244 +  lt_save_CFLAGS=$CFLAGS
7245    CC=${F77-"f77"}
7246 +  CFLAGS=$FFLAGS
7247    compiler=$CC
7248    _LT_TAGVAR(compiler, $1)=$CC
7249    _LT_CC_BASENAME([$compiler])
# Line 6878 | Line 7297 | if test "$_lt_disable_F77" != yes; then
7297  
7298    GCC=$lt_save_GCC
7299    CC="$lt_save_CC"
7300 +  CFLAGS="$lt_save_CFLAGS"
7301   fi # test "$_lt_disable_F77" != yes
7302  
7303   AC_LANG_POP
# Line 6954 | Line 7374 | if test "$_lt_disable_FC" != yes; then
7374    # Allow CC to be a program name with arguments.
7375    lt_save_CC="$CC"
7376    lt_save_GCC=$GCC
7377 +  lt_save_CFLAGS=$CFLAGS
7378    CC=${FC-"f95"}
7379 +  CFLAGS=$FCFLAGS
7380    compiler=$CC
7381    GCC=$ac_cv_fc_compiler_gnu
7382  
# Line 7010 | Line 7432 | if test "$_lt_disable_FC" != yes; then
7432    fi # test -n "$compiler"
7433  
7434    GCC=$lt_save_GCC
7435 <  CC="$lt_save_CC"
7435 >  CC=$lt_save_CC
7436 >  CFLAGS=$lt_save_CFLAGS
7437   fi # test "$_lt_disable_FC" != yes
7438  
7439   AC_LANG_POP
# Line 7047 | Line 7470 | _LT_COMPILER_BOILERPLATE
7470   _LT_LINKER_BOILERPLATE
7471  
7472   # Allow CC to be a program name with arguments.
7473 < lt_save_CC="$CC"
7473 > lt_save_CC=$CC
7474 > lt_save_CFLAGS=$CFLAGS
7475   lt_save_GCC=$GCC
7476   GCC=yes
7477   CC=${GCJ-"gcj"}
7478 + CFLAGS=$GCJFLAGS
7479   compiler=$CC
7480   _LT_TAGVAR(compiler, $1)=$CC
7481   _LT_TAGVAR(LD, $1)="$LD"
# Line 7077 | Line 7502 | fi
7502   AC_LANG_RESTORE
7503  
7504   GCC=$lt_save_GCC
7505 < CC="$lt_save_CC"
7505 > CC=$lt_save_CC
7506 > CFLAGS=$lt_save_CFLAGS
7507   ])# _LT_LANG_GCJ_CONFIG
7508  
7509  
# Line 7112 | Line 7538 | _LT_LINKER_BOILERPLATE
7538  
7539   # Allow CC to be a program name with arguments.
7540   lt_save_CC="$CC"
7541 + lt_save_CFLAGS=$CFLAGS
7542   lt_save_GCC=$GCC
7543   GCC=
7544   CC=${RC-"windres"}
7545 + CFLAGS=
7546   compiler=$CC
7547   _LT_TAGVAR(compiler, $1)=$CC
7548   _LT_CC_BASENAME([$compiler])
# Line 7127 | Line 7555 | fi
7555  
7556   GCC=$lt_save_GCC
7557   AC_LANG_RESTORE
7558 < CC="$lt_save_CC"
7558 > CC=$lt_save_CC
7559 > CFLAGS=$lt_save_CFLAGS
7560   ])# _LT_LANG_RC_CONFIG
7561  
7562  
# Line 7186 | Line 7615 | _LT_DECL([], [OBJDUMP], [1], [An object
7615   AC_SUBST([OBJDUMP])
7616   ])
7617  
7618 + # _LT_DECL_DLLTOOL
7619 + # ----------------
7620 + # Ensure DLLTOOL variable is set.
7621 + m4_defun([_LT_DECL_DLLTOOL],
7622 + [AC_CHECK_TOOL(DLLTOOL, dlltool, false)
7623 + test -z "$DLLTOOL" && DLLTOOL=dlltool
7624 + _LT_DECL([], [DLLTOOL], [1], [DLL creation program])
7625 + AC_SUBST([DLLTOOL])
7626 + ])
7627  
7628   # _LT_DECL_SED
7629   # ------------
# Line 7277 | Line 7715 | m4_defun([_LT_CHECK_SHELL_FEATURES],
7715   # Try some XSI features
7716   xsi_shell=no
7717   ( _lt_dummy="a/b/c"
7718 <  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
7719 <      = c,a/b,, \
7718 >  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
7719 >      = c,a/b,b/c, \
7720      && eval 'test $(( 1 + 1 )) -eq 2 \
7721      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
7722    && xsi_shell=yes
# Line 7317 | Line 7755 | _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn
7755   ])# _LT_CHECK_SHELL_FEATURES
7756  
7757  
7758 < # _LT_PROG_XSI_SHELLFNS
7759 < # ---------------------
7760 < # Bourne and XSI compatible variants of some useful shell functions.
7761 < m4_defun([_LT_PROG_XSI_SHELLFNS],
7762 < [case $xsi_shell in
7763 <  yes)
7764 <    cat << \_LT_EOF >> "$cfgfile"
7765 <
7766 < # func_dirname file append nondir_replacement
7767 < # Compute the dirname of FILE.  If nonempty, add APPEND to the result,
7768 < # otherwise set result to NONDIR_REPLACEMENT.
7769 < func_dirname ()
7770 < {
7771 <  case ${1} in
7772 <    */*) func_dirname_result="${1%/*}${2}" ;;
7335 <    *  ) func_dirname_result="${3}" ;;
7336 <  esac
7337 < }
7338 <
7339 < # func_basename file
7340 < func_basename ()
7341 < {
7342 <  func_basename_result="${1##*/}"
7343 < }
7344 <
7345 < # func_dirname_and_basename file append nondir_replacement
7346 < # perform func_basename and func_dirname in a single function
7347 < # call:
7348 < #   dirname:  Compute the dirname of FILE.  If nonempty,
7349 < #             add APPEND to the result, otherwise set result
7350 < #             to NONDIR_REPLACEMENT.
7351 < #             value returned in "$func_dirname_result"
7352 < #   basename: Compute filename of FILE.
7353 < #             value retuned in "$func_basename_result"
7354 < # Implementation must be kept synchronized with func_dirname
7355 < # and func_basename. For efficiency, we do not delegate to
7356 < # those functions but instead duplicate the functionality here.
7357 < func_dirname_and_basename ()
7358 < {
7359 <  case ${1} in
7360 <    */*) func_dirname_result="${1%/*}${2}" ;;
7361 <    *  ) func_dirname_result="${3}" ;;
7362 <  esac
7363 <  func_basename_result="${1##*/}"
7364 < }
7365 <
7366 < # func_stripname prefix suffix name
7367 < # strip PREFIX and SUFFIX off of NAME.
7368 < # PREFIX and SUFFIX must not contain globbing or regex special
7369 < # characters, hashes, percent signs, but SUFFIX may contain a leading
7370 < # dot (in which case that matches only a dot).
7371 < func_stripname ()
7372 < {
7373 <  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7374 <  # positional parameters, so assign one to ordinary parameter first.
7375 <  func_stripname_result=${3}
7376 <  func_stripname_result=${func_stripname_result#"${1}"}
7377 <  func_stripname_result=${func_stripname_result%"${2}"}
7378 < }
7379 <
7380 < # func_opt_split
7381 < func_opt_split ()
7382 < {
7383 <  func_opt_split_opt=${1%%=*}
7384 <  func_opt_split_arg=${1#*=}
7385 < }
7386 <
7387 < # func_lo2o object
7388 < func_lo2o ()
7389 < {
7390 <  case ${1} in
7391 <    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7392 <    *)    func_lo2o_result=${1} ;;
7393 <  esac
7394 < }
7395 <
7396 < # func_xform libobj-or-source
7397 < func_xform ()
7398 < {
7399 <  func_xform_result=${1%.*}.lo
7400 < }
7758 > # _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
7759 > # ------------------------------------------------------
7760 > # In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
7761 > # '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
7762 > m4_defun([_LT_PROG_FUNCTION_REPLACE],
7763 > [dnl {
7764 > sed -e '/^$1 ()$/,/^} # $1 /c\
7765 > $1 ()\
7766 > {\
7767 > m4_bpatsubsts([$2], [$], [\\], [^\([     ]\)], [\\\1])
7768 > } # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
7769 >  && mv -f "$cfgfile.tmp" "$cfgfile" \
7770 >    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7771 > test 0 -eq $? || _lt_function_replace_fail=:
7772 > ])
7773  
7402 # func_arith arithmetic-term...
7403 func_arith ()
7404 {
7405  func_arith_result=$(( $[*] ))
7406 }
7774  
7775 < # func_len string
7776 < # STRING may not start with a hyphen.
7777 < func_len ()
7778 < {
7779 <  func_len_result=${#1}
7780 < }
7775 > # _LT_PROG_REPLACE_SHELLFNS
7776 > # -------------------------
7777 > # Replace existing portable implementations of several shell functions with
7778 > # equivalent extended shell implementations where those features are available..
7779 > m4_defun([_LT_PROG_REPLACE_SHELLFNS],
7780 > [if test x"$xsi_shell" = xyes; then
7781 >  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
7782 >    case ${1} in
7783 >      */*) func_dirname_result="${1%/*}${2}" ;;
7784 >      *  ) func_dirname_result="${3}" ;;
7785 >    esac])
7786 >
7787 >  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
7788 >    func_basename_result="${1##*/}"])
7789 >
7790 >  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
7791 >    case ${1} in
7792 >      */*) func_dirname_result="${1%/*}${2}" ;;
7793 >      *  ) func_dirname_result="${3}" ;;
7794 >    esac
7795 >    func_basename_result="${1##*/}"])
7796  
7797 < _LT_EOF
7798 <    ;;
7799 <  *) # Bourne compatible functions.
7800 <    cat << \_LT_EOF >> "$cfgfile"
7797 >  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
7798 >    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
7799 >    # positional parameters, so assign one to ordinary parameter first.
7800 >    func_stripname_result=${3}
7801 >    func_stripname_result=${func_stripname_result#"${1}"}
7802 >    func_stripname_result=${func_stripname_result%"${2}"}])
7803  
7804 < # func_dirname file append nondir_replacement
7805 < # Compute the dirname of FILE.  If nonempty, add APPEND to the result,
7806 < # otherwise set result to NONDIR_REPLACEMENT.
7423 < func_dirname ()
7424 < {
7425 <  # Extract subdirectory from the argument.
7426 <  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
7427 <  if test "X$func_dirname_result" = "X${1}"; then
7428 <    func_dirname_result="${3}"
7429 <  else
7430 <    func_dirname_result="$func_dirname_result${2}"
7431 <  fi
7432 < }
7804 >  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
7805 >    func_split_long_opt_name=${1%%=*}
7806 >    func_split_long_opt_arg=${1#*=}])
7807  
7808 < # func_basename file
7809 < func_basename ()
7810 < {
7437 <  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
7438 < }
7808 >  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
7809 >    func_split_short_opt_arg=${1#??}
7810 >    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
7811  
7812 < dnl func_dirname_and_basename
7813 < dnl A portable version of this function is already defined in general.m4sh
7814 < dnl so there is no need for it here.
7812 >  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
7813 >    case ${1} in
7814 >      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
7815 >      *)    func_lo2o_result=${1} ;;
7816 >    esac])
7817  
7818 < # func_stripname prefix suffix name
7445 < # strip PREFIX and SUFFIX off of NAME.
7446 < # PREFIX and SUFFIX must not contain globbing or regex special
7447 < # characters, hashes, percent signs, but SUFFIX may contain a leading
7448 < # dot (in which case that matches only a dot).
7449 < # func_strip_suffix prefix name
7450 < func_stripname ()
7451 < {
7452 <  case ${2} in
7453 <    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
7454 <    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
7455 <  esac
7456 < }
7457 <
7458 < # sed scripts:
7459 < my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
7460 < my_sed_long_arg='1s/^-[[^=]]*=//'
7818 >  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
7819  
7820 < # func_opt_split
7463 < func_opt_split ()
7464 < {
7465 <  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
7466 <  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
7467 < }
7820 >  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
7821  
7822 < # func_lo2o object
7823 < func_lo2o ()
7471 < {
7472 <  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
7473 < }
7822 >  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
7823 > fi
7824  
7825 < # func_xform libobj-or-source
7826 < func_xform ()
7477 < {
7478 <  func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
7479 < }
7825 > if test x"$lt_shell_append" = xyes; then
7826 >  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
7827  
7828 < # func_arith arithmetic-term...
7829 < func_arith ()
7830 < {
7831 <  func_arith_result=`expr "$[@]"`
7485 < }
7828 >  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
7829 >    func_quote_for_eval "${2}"
7830 > dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
7831 >    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
7832  
7833 < # func_len string
7834 < # STRING may not start with a hyphen.
7835 < func_len ()
7836 < {
7837 <  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
7838 < }
7833 >  # Save a `func_append' function call where possible by direct use of '+='
7834 >  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
7835 >    && mv -f "$cfgfile.tmp" "$cfgfile" \
7836 >      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7837 >  test 0 -eq $? || _lt_function_replace_fail=:
7838 > else
7839 >  # Save a `func_append' function call even when '+=' is not available
7840 >  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
7841 >    && mv -f "$cfgfile.tmp" "$cfgfile" \
7842 >      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
7843 >  test 0 -eq $? || _lt_function_replace_fail=:
7844 > fi
7845  
7846 < _LT_EOF
7847 < esac
7846 > if test x"$_lt_function_replace_fail" = x":"; then
7847 >  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
7848 > fi
7849 > ])
7850  
7851 < case $lt_shell_append in
7852 <  yes)
7853 <    cat << \_LT_EOF >> "$cfgfile"
7854 <
7855 < # func_append var value
7856 < # Append VALUE to the end of shell variable VAR.
7857 < func_append ()
7858 < {
7859 <  eval "$[1]+=\$[2]"
7860 < }
7861 < _LT_EOF
7851 > # _LT_PATH_CONVERSION_FUNCTIONS
7852 > # -----------------------------
7853 > # Determine which file name conversion functions should be used by
7854 > # func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
7855 > # for certain cross-compile configurations and native mingw.
7856 > m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
7857 > [AC_REQUIRE([AC_CANONICAL_HOST])dnl
7858 > AC_REQUIRE([AC_CANONICAL_BUILD])dnl
7859 > AC_MSG_CHECKING([how to convert $build file names to $host format])
7860 > AC_CACHE_VAL(lt_cv_to_host_file_cmd,
7861 > [case $host in
7862 >  *-*-mingw* )
7863 >    case $build in
7864 >      *-*-mingw* ) # actually msys
7865 >        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
7866 >        ;;
7867 >      *-*-cygwin* )
7868 >        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
7869 >        ;;
7870 >      * ) # otherwise, assume *nix
7871 >        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
7872 >        ;;
7873 >    esac
7874      ;;
7875 <  *)
7876 <    cat << \_LT_EOF >> "$cfgfile"
7877 <
7878 < # func_append var value
7879 < # Append VALUE to the end of shell variable VAR.
7880 < func_append ()
7881 < {
7882 <  eval "$[1]=\$$[1]\$[2]"
7883 < }
7884 <
7885 < _LT_EOF
7875 >  *-*-cygwin* )
7876 >    case $build in
7877 >      *-*-mingw* ) # actually msys
7878 >        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
7879 >        ;;
7880 >      *-*-cygwin* )
7881 >        lt_cv_to_host_file_cmd=func_convert_file_noop
7882 >        ;;
7883 >      * ) # otherwise, assume *nix
7884 >        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
7885 >        ;;
7886 >    esac
7887      ;;
7888 <  esac
7888 >  * ) # unhandled hosts (and "normal" native builds)
7889 >    lt_cv_to_host_file_cmd=func_convert_file_noop
7890 >    ;;
7891 > esac
7892 > ])
7893 > to_host_file_cmd=$lt_cv_to_host_file_cmd
7894 > AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
7895 > _LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
7896 >         [0], [convert $build file names to $host format])dnl
7897 >
7898 > AC_MSG_CHECKING([how to convert $build file names to toolchain format])
7899 > AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
7900 > [#assume ordinary cross tools, or native build.
7901 > lt_cv_to_tool_file_cmd=func_convert_file_noop
7902 > case $host in
7903 >  *-*-mingw* )
7904 >    case $build in
7905 >      *-*-mingw* ) # actually msys
7906 >        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
7907 >        ;;
7908 >    esac
7909 >    ;;
7910 > esac
7911   ])
7912 + to_tool_file_cmd=$lt_cv_to_tool_file_cmd
7913 + AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
7914 + _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
7915 +         [0], [convert $build files to toolchain format])dnl
7916 + ])# _LT_PATH_CONVERSION_FUNCTIONS
7917  
7918   # ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
7919   #
# Line 7933 | Line 8327 | AC_CHECK_FUNCS([strlcat strlcpy], [], [A
8327   m4_pattern_allow([LT_LIBEXT])dnl
8328   AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension])
8329  
8330 + name=
8331 + eval "lt_libprefix=\"$libname_spec\""
8332 + m4_pattern_allow([LT_LIBPREFIX])dnl
8333 + AC_DEFINE_UNQUOTED([LT_LIBPREFIX],["$lt_libprefix"],[The archive prefix])
8334 +
8335   name=ltdl
8336 < LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
8336 > eval "LTDLOPEN=\"$libname_spec\""
8337   AC_SUBST([LTDLOPEN])
8338   ])# _LTDL_SETUP
8339  
# Line 8824 | Line 9223 | m4_define([lt_dict_filter],
9223   # unlimited permission to copy and/or distribute it, with or without
9224   # modifications, as long as this notice is preserved.
9225  
9226 < # Generated from ltversion.in.
9226 > # @configure_input@
9227  
9228 < # serial 3175 ltversion.m4
9228 > # serial 3293 ltversion.m4
9229   # This file is part of GNU Libtool
9230  
9231 < m4_define([LT_PACKAGE_VERSION], [2.2.10])
9232 < m4_define([LT_PACKAGE_REVISION], [1.3175])
9231 > m4_define([LT_PACKAGE_VERSION], [2.4])
9232 > m4_define([LT_PACKAGE_REVISION], [1.3293])
9233  
9234   AC_DEFUN([LTVERSION_VERSION],
9235 < [macro_version='2.2.10'
9236 < macro_revision='1.3175'
9235 > [macro_version='2.4'
9236 > macro_revision='1.3293'
9237   _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
9238   _LT_DECL(, macro_revision, 0)
9239   ])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines