diff options
| author | Bernhard Rosenkraenzer <bero@arklinux.org> | 2001-09-25 13:18:48 +0000 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <bero@arklinux.org> | 2001-09-25 13:18:48 +0000 |
| commit | 525baae6fb9d5e3538977c538c7a79e9b6b3f6ab (patch) | |
| tree | 41310ef1b592c33c74dd583f919875b110fe63ab /m4 | |
| parent | cfa09c91f9454515e551c8e758b633c1b8f582d3 (diff) | |
| download | grep-525baae6fb9d5e3538977c538c7a79e9b6b3f6ab.tar.gz | |
More autoconf 2.5x/automake 1.5 changes
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gettext.m4 | 6 | ||||
| -rw-r--r-- | m4/progtest.m4 | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 5c63480e..d2373ea3 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -8,7 +8,7 @@ # serial 105 -AC_DEFUN(AM_WITH_NLS, +AC_DEFUN([AM_WITH_NLS], [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS AC_ARG_ENABLE(nls, @@ -61,8 +61,8 @@ AC_DEFUN(AM_WITH_NLS, if test "$gt_cv_func_gettext_libc" = "yes" \ || test "$gt_cv_func_gettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT, 1, [Define if you have gettext]) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + AC_DEFINE([HAVE_GETTEXT], 1, [Define if you have gettext]) + AM_PATH_PROG_WITH_TEST([MSGFMT], [msgfmt], [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl if test "$MSGFMT" != "no"; then AC_CHECK_FUNCS(dcgettext) diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 604e553f..f33cf6a9 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -11,7 +11,7 @@ dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN(AM_PATH_PROG_WITH_TEST, +AC_DEFUN([AM_PATH_PROG_WITH_TEST], [# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) @@ -23,6 +23,7 @@ changequote([, ])dnl ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ;; *) + if test -z "$ac_x"; then ac_x="-x"; fi IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for ac_dir in ifelse([$5], , $PATH, [$5]); do test -z "$ac_dir" && ac_dir=. |