diff options
author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2009-01-15 09:22:57 (GMT) |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2009-01-15 10:19:08 (GMT) |
commit | 71cdb52799220f8d9052643baf1d3e9836a9c755 (patch) | |
tree | 27aee97a35d9ab51f0d8f64a46690bd41a5f8c1b /gl/m4/lib-ld.m4 | |
parent | f7afa46586645e50498d8b2d0c67884f014dc3a4 (diff) | |
download | monitoring-plugins-71cdb52799220f8d9052643baf1d3e9836a9c755.tar.gz |
Sync with gnulib
Diffstat (limited to 'gl/m4/lib-ld.m4')
-rw-r--r-- | gl/m4/lib-ld.m4 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gl/m4/lib-ld.m4 b/gl/m4/lib-ld.m4 index 96c4e2c..e4863f2 100644 --- a/gl/m4/lib-ld.m4 +++ b/gl/m4/lib-ld.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # lib-ld.m4 serial 3 (gettext-0.13) | 1 | # lib-ld.m4 serial 4 (gettext-0.18) |
2 | dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 1996-2003, 2009 Free Software Foundation, Inc. |
3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
5 | dnl with or without modifications, as long as this notice is preserved. | 5 | dnl with or without modifications, as long as this notice is preserved. |
@@ -10,7 +10,7 @@ dnl with libtool.m4. | |||
10 | 10 | ||
11 | dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. | 11 | dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. |
12 | AC_DEFUN([AC_LIB_PROG_LD_GNU], | 12 | AC_DEFUN([AC_LIB_PROG_LD_GNU], |
13 | [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, | 13 | [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], |
14 | [# I'd rather use --version here, but apparently some GNU ld's only accept -v. | 14 | [# I'd rather use --version here, but apparently some GNU ld's only accept -v. |
15 | case `$LD -v 2>&1 </dev/null` in | 15 | case `$LD -v 2>&1 </dev/null` in |
16 | *GNU* | *'with BFD'*) | 16 | *GNU* | *'with BFD'*) |
@@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld | |||
23 | 23 | ||
24 | dnl From libtool-1.4. Sets the variable LD. | 24 | dnl From libtool-1.4. Sets the variable LD. |
25 | AC_DEFUN([AC_LIB_PROG_LD], | 25 | AC_DEFUN([AC_LIB_PROG_LD], |
26 | [AC_ARG_WITH(gnu-ld, | 26 | [AC_ARG_WITH([gnu-ld], |
27 | [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], | 27 | [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], |
28 | test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) | 28 | test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) |
29 | AC_REQUIRE([AC_PROG_CC])dnl | 29 | AC_REQUIRE([AC_PROG_CC])dnl |
@@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then | |||
77 | else | 77 | else |
78 | AC_MSG_CHECKING([for non-GNU ld]) | 78 | AC_MSG_CHECKING([for non-GNU ld]) |
79 | fi | 79 | fi |
80 | AC_CACHE_VAL(acl_cv_path_LD, | 80 | AC_CACHE_VAL([acl_cv_path_LD], |
81 | [if test -z "$LD"; then | 81 | [if test -z "$LD"; then |
82 | IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" | 82 | IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" |
83 | for ac_dir in $PATH; do | 83 | for ac_dir in $PATH; do |
@@ -101,9 +101,9 @@ else | |||
101 | fi]) | 101 | fi]) |
102 | LD="$acl_cv_path_LD" | 102 | LD="$acl_cv_path_LD" |
103 | if test -n "$LD"; then | 103 | if test -n "$LD"; then |
104 | AC_MSG_RESULT($LD) | 104 | AC_MSG_RESULT([$LD]) |
105 | else | 105 | else |
106 | AC_MSG_RESULT(no) | 106 | AC_MSG_RESULT([no]) |
107 | fi | 107 | fi |
108 | test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) | 108 | test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) |
109 | AC_LIB_PROG_LD_GNU | 109 | AC_LIB_PROG_LD_GNU |