diff options
| author | Werner Koch <[email protected]> | 2004-07-27 15:12:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-07-27 15:12:00 +0000 |
| commit | 5d4fb5734727e493fa8119f0d2d0f21ebc7452a7 (patch) | |
| tree | a2f907826fed2c350c048db21fc0c8d8e2850fc2 /m4/lib-ld.m4 | |
| parent | * keylist.c (list_keyblock_print): Always use the new listing format where (diff) | |
| download | gnupg-5d4fb5734727e493fa8119f0d2d0f21ebc7452a7.tar.gz gnupg-5d4fb5734727e493fa8119f0d2d0f21ebc7452a7.zip | |
* configure.ac (AM_GNU_GETTEXT_VERSION): New.
(min_automake_version): New.
* LINGUAS: Added all languages we supported in 1.2.5.
Copied all po files from 1.2.5.
* autogen.sh: Updated to the modern version, grepping the required
tool versions from configure.ac.
Diffstat (limited to 'm4/lib-ld.m4')
| -rw-r--r-- | m4/lib-ld.m4 | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 11d0ce773..38aeaec19 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,4 +1,4 @@ -# lib-ld.m4 serial 2 (gettext-0.12) +# lib-ld.m4 serial 3 (gettext-0.13) 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" |