diff options
| author | Bruno Haible <bruno@clisp.org> | 2003-06-19 14:00:21 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:10:42 +0200 |
| commit | 86a49d30ec88cdfa09d391b355456f6be69e3fbd (patch) | |
| tree | 6f014f7472d2f8c864298b0d153cb0ff7b524070 /autoconf-lib-link | |
| parent | f58ba018630aa17c2636572aa557ee744b0e856a (diff) | |
| download | external_gettext-86a49d30ec88cdfa09d391b355456f6be69e3fbd.zip external_gettext-86a49d30ec88cdfa09d391b355456f6be69e3fbd.tar.gz external_gettext-86a49d30ec88cdfa09d391b355456f6be69e3fbd.tar.bz2 | |
Avoid using egrep.
Diffstat (limited to 'autoconf-lib-link')
| -rw-r--r-- | autoconf-lib-link/m4/ChangeLog | 5 | ||||
| -rw-r--r-- | autoconf-lib-link/m4/lib-ld.m4 | 24 |
2 files changed, 18 insertions, 11 deletions
diff --git a/autoconf-lib-link/m4/ChangeLog b/autoconf-lib-link/m4/ChangeLog index 993f9a7..8e1bc8e 100644 --- a/autoconf-lib-link/m4/ChangeLog +++ b/autoconf-lib-link/m4/ChangeLog @@ -1,3 +1,8 @@ +2003-06-17 Paul Eggert <eggert@twinsun.com> + + * lib-ld.m4 (AC_LIB_PROG_LD_GNU, AC_LIB_PROG_LD): Don't use egrep, for + portability to POSIX 1003.1-2001. Backported from libtool-1.5. + 2003-05-22 Bruno Haible <bruno@clisp.org> * gettext-0.12.1 released. diff --git a/autoconf-lib-link/m4/lib-ld.m4 b/autoconf-lib-link/m4/lib-ld.m4 index 11d0ce7..502fd22 100644 --- a/autoconf-lib-link/m4/lib-ld.m4 +++ b/autoconf-lib-link/m4/lib-ld.m4 @@ -1,4 +1,4 @@ -# lib-ld.m4 serial 2 (gettext-0.12) +# lib-ld.m4 serial 3 (gettext-0.12.2) dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -14,11 +14,12 @@ dnl From libtool-1.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. -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then - acl_cv_prog_gnu_ld=yes -else - acl_cv_prog_gnu_ld=no -fi]) +case `$LD -v 2>&1 </dev/null` in +*GNU* | *'with BFD'*) + acl_cv_prog_gnu_ld=yes ;; +*) + acl_cv_prog_gnu_ld=no ;; +esac]) with_gnu_ld=$acl_cv_prog_gnu_ld ]) @@ -88,11 +89,12 @@ AC_CACHE_VAL(acl_cv_path_LD, # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac fi done IFS="$ac_save_ifs" |