diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | m4/dosfile.m4 | 26 |
2 files changed, 20 insertions, 10 deletions
@@ -1,3 +1,7 @@ +2001-02-18 Jim Meyering + + * m4/dosfile.m4 (AC_DOSFILE): Move AC_DEFINEs out of AC_CACHE_CHECK. + 2001-02-17 Alain Malgoire * doc/grep.texi : Document the new options and the new behaviour diff --git a/m4/dosfile.m4 b/m4/dosfile.m4 index d7341bb1..48184cf0 100644 --- a/m4/dosfile.m4 +++ b/m4/dosfile.m4 @@ -1,15 +1,21 @@ # Check to see if we use dir\file name conventtion -# If so, set macro HAVE_DOS_FILE_NAMES +# If so, set macro HAVE_DOS_FILE_NAMES # Also set the macro HAVE_DOS_FILE_CONTENTS for now, # since don't know of a good way to independently check this. dnl AC_DOSFILE() AC_DEFUN(AC_DOSFILE, -[AC_CACHE_CHECK([for dos file convention], ac_cv_dosfile, -[if test -d ".\."; then - ac_cv_dosfile=yes - AC_DEFINE(HAVE_DOS_FILE_CONTENTS, 1, [Define if text file lines end in CRLF.]) - AC_DEFINE(HAVE_DOS_FILE_NAMES) -else - ac_cv_dosfile=no -fi -])]) +[ + AC_CACHE_CHECK([for dos file convention], ac_cv_dosfile, + [if test -d ".\."; then + ac_cv_dosfile=yes + else + ac_cv_dosfile=no + fi + ]) + + if test $ac_cv_dosfile = yes; then + AC_DEFINE(HAVE_DOS_FILE_NAMES) + AC_DEFINE(HAVE_DOS_FILE_CONTENTS, 1, + [Define if text file lines end in CRLF.]) + fi +]) |