diff options
author | Werner Lemberg <wl@gnu.org> | 2014-10-11 09:08:05 +0200 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2014-10-11 09:08:05 +0200 |
commit | 0aae4d02b195f688d9c5f9efcbc15b87a681d95f (patch) | |
tree | d01484206888924cbabee976fb73ebf97d8aca7a /m4/lib-ld.m4 | |
parent | e5caf927fb0780ab1dea1e2b8f158174a1f4fb13 (diff) | |
download | groff-git-0aae4d02b195f688d9c5f9efcbc15b87a681d95f.tar.gz |
Update generic GNU files to recent versions.
* INSTALL.gen, config.guess, config.rpath, config.sub,
contrib/groff_filenames/Makefile.sub, doc/fdl.texi, doc/texinfo.tex,
doc/txi-en.tex, install-sh, m4/ax_prog_perl_version.m4,
m4/codeset.m4, m4/fcntl-o.m4, m4/glibc21.m4, m4/iconv.m4,
m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4, m4/localcharset.m4,
src/include/localcharset.h, src/libs/gnulib/Makefile.in,
src/libs/gnulib/aclocal.m4, src/libs/gnulib/build-aux/compile,
src/libs/gnulib/build-aux/config.guess,
src/libs/gnulib/build-aux/config.sub,
src/libs/gnulib/build-aux/depcomp,
src/libs/gnulib/build-aux/install-sh,
src/libs/gnulib/build-aux/snippet/arg-nonnull.h,
src/libs/gnulib/build-aux/snippet/c++defs.h,
src/libs/gnulib/build-aux/snippet/warn-on-use.h,
src/libs/gnulib/configure, src/libs/gnulib/lib/Makefile.in,
src/libs/gnulib/lib/config.charset, src/libs/gnulib/lib/intprops.h,
src/libs/gnulib/lib/localcharset.c,
src/libs/gnulib/lib/localcharset.h, src/libs/gnulib/lib/ref-add.sin,
src/libs/gnulib/lib/ref-del.sin, src/libs/gnulib/lib/stdbool.in.h,
src/libs/gnulib/lib/stddef.in.h, src/libs/gnulib/lib/streq.h,
src/libs/gnulib/lib/unitypes.in.h,
src/libs/gnulib/lib/uniwidth.in.h,
src/libs/gnulib/lib/uniwidth/cjk.h,
src/libs/gnulib/lib/uniwidth/width.c, src/libs/gnulib/lib/verify.h,
src/libs/gnulib/lib/wchar.in.h, src/libs/gnulib/lib/wctype-h.c,
src/libs/gnulib/lib/wctype.in.h, src/libs/gnulib/lib/wcwidth.c,
src/libs/gnulib/m4/00gnulib.m4, src/libs/gnulib/m4/Makefile.in,
src/libs/gnulib/m4/codeset.m4, src/libs/gnulib/m4/configmake.m4,
src/libs/gnulib/m4/extensions.m4, src/libs/gnulib/m4/fcntl-o.m4,
src/libs/gnulib/m4/glibc21.m4, src/libs/gnulib/m4/gnulib-tool.m4,
src/libs/gnulib/m4/inttypes-pri.m4,
src/libs/gnulib/m4/localcharset.m4, src/libs/gnulib/m4/longlong.m4,
src/libs/gnulib/m4/onceonly.m4, src/libs/gnulib/m4/wchar_t.m4,
src/libs/gnulib/m4/wint_t.m4, src/libs/libgroff/config.charset,
src/libs/libgroff/localcharset.c, src/libs/libgroff/ref-add.sin,
src/libs/libgroff/ref-del.sin, src/preproc/refer/refer.man: Do it.
Diffstat (limited to 'm4/lib-ld.m4')
-rw-r--r-- | m4/lib-ld.m4 | 60 |
1 files changed, 35 insertions, 25 deletions
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 48ad28e30..ddc569f73 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,33 +1,39 @@ -# lib-ld.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 1996-2012 Free Software Foundation, Inc. +# lib-ld.m4 serial 6 +dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. +dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid +dnl collision with libtool.m4. -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +[# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) - acl_cv_prog_gnu_ld=yes ;; + acl_cv_prog_gnu_ld=yes + ;; *) - acl_cv_prog_gnu_ld=no ;; + acl_cv_prog_gnu_ld=no + ;; esac]) with_gnu_ld=$acl_cv_prog_gnu_ld ]) -dnl From libtool-1.4. Sets the variable LD. +dnl From libtool-2.4. Sets the variable LD. AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH([gnu-ld], -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl +[AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld [default=no]])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then @@ -40,10 +46,11 @@ if test "${PATH_SEPARATOR+set}" != set; then || PATH_SEPARATOR=';' } fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) + AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -53,11 +60,11 @@ if test "$GCC" = yes; then esac case $ac_prog in # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" @@ -78,23 +85,26 @@ else fi AC_CACHE_VAL([acl_cv_path_LD], [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break + ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break + ;; esac fi done - IFS="$ac_save_ifs" + IFS="$acl_save_ifs" else acl_cv_path_LD="$LD" # Let the user override the test with a path. fi]) |