diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | acconfig.h | 37 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | m4/decl.m4 | 2 | ||||
| -rw-r--r-- | m4/dosfile.m4 | 2 | ||||
| -rw-r--r-- | m4/gettext.m4 | 8 | ||||
| -rw-r--r-- | m4/init.m4 | 4 | ||||
| -rw-r--r-- | m4/install.m4 | 2 | ||||
| -rw-r--r-- | m4/largefile.m4 | 8 | ||||
| -rw-r--r-- | m4/lcmessage.m4 | 2 |
11 files changed, 27 insertions, 60 deletions
@@ -1,12 +1,16 @@ 2001-09-25 Bernhard Rosenkraenzer <bero@redhat.com> * configure.in: Detect pcre correctly even when it's in - non-standard locations, using pcre-config + non-standard locations, using pcre-config * src/grep.c: Add --color={always,never,tty} argument (like in ls) * src/grep.c: Turn off blinking in the default colorization * src/grep.c: Add --devices (-D) switch (analogous to --directories) - * doc/grep.texi, doc/grep.1, NEWS: Document changes - (--color, --devices, -D) * AUTHORS: Change maintainer, credit Alain for his work until now + * configure.in, m4/decl.m4, m4/dosfile.m4, m4/gettext.m4, + m4/init.m4, m4/install.m4, m4/largefile.m4, m4/lcmessage.m4: + Fix build with autoconf 2.5x, retain 2.1x compatibility for now + * acconfig.h: removed (no longer required) + * doc/grep.texi, doc/grep.1, NEWS: Document changes + (--color, --devices, -D) 2001-08-30 Alain Magloire @@ -1,5 +1,7 @@ Version 2.5 + - GNU grep can now be built with autoconf 2.52. + - The new option --devices controls how grep handles device files. Its usage is analogous to --directories. diff --git a/acconfig.h b/acconfig.h deleted file mode 100644 index dd9b080c..00000000 --- a/acconfig.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Define to use grep's error-checking malloc in the kwset routines. */ -#undef GREP - -/* Package name. */ -#undef PACKAGE - -/* Version number. */ -#undef VERSION - -/* Define to `int' if <sys/types.h> doesn't define. */ -#undef ssize_t - -/* Hack for Visual C++ suggested by irox. */ -#undef alloca - -/* Internationalization stuffs. */ - -#undef HAVE_STPCPY - -#undef ENABLE_NLS - -#undef HAVE_CATGETS - -#undef HAVE_GETTEXT - -#undef HAVE_LC_MESSAGES - -/* Define if <stdlib.h> declares strtoul. */ -#undef HAVE_DECL_STRTOUL - -/* Define if <stdlib.h> declares strtoull. */ -#undef HAVE_DECL_STRTOULL - -/* - * DOS specific - */ -#undef HAVE_DOS_FILE_NAMES diff --git a/configure.in b/configure.in index 62194d20..2b012574 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ # dnl Process this file with autoconf to produce a configure script AC_INIT(src/grep.c) -AC_DEFINE(GREP) +AC_DEFINE(GREP, 1, [We are building grep]) AC_PREREQ(2.13) dnl Automake stuff. @@ -56,23 +56,21 @@ jm_AC_PREREQ_XSTRTOUMAX dnl Replace this with jm_CHECK_DECLS once autoconf 2.15 is out. jm_CHECK_DECLARATIONS([#include <stdlib.h>], strtoul strtoull) test $jm_cv_func_decl_strtoul != yes -AC_DEFINE_UNQUOTED(HAVE_DECL_STRTOUL, $?, +AC_DEFINE_UNQUOTED([HAVE_DECL_STRTOUL], $?, [Define if <stdlib.h> declares strtoul.]) test $jm_cv_func_decl_strtoull != yes -AC_DEFINE_UNQUOTED(HAVE_DECL_STRTOULL, $?, +AC_DEFINE_UNQUOTED([HAVE_DECL_STRTOULL], $?, [Define if <stdlib.h> declares strtoull.]) dnl for VC++ case "$ac_cv_prog_CC" in - cl*) AC_DEFINE(alloca, _alloca) ;; + cl*) AC_DEFINE([alloca], _alloca, [Define if your compiler is broken]) ;; *) ;; esac dnl I18N feature ALL_LINGUAS="cs de el eo es et fr gl hr id it ja ko nl no pl pt_BR ru sl sv" AM_GNU_GETTEXT -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION") dnl DOS file name convention dnl sets HAVE_DOS_FILE_NAMES @@ -32,6 +32,6 @@ AC_DEFUN(jm_CHECK_DECLARATIONS, jm_CHECK_DECLARATION($jm_func, [$1], [ jm_tr_func=HAVE_DECL_`echo $jm_func | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` - AC_DEFINE_UNQUOTED($jm_tr_func) $3], [$4])dnl + AC_DEFINE_UNQUOTED($jm_tr_func, 1, [Define if your system declares $1]) $3], [$4])dnl done ]) diff --git a/m4/dosfile.m4 b/m4/dosfile.m4 index 48184cf0..5616eea4 100644 --- a/m4/dosfile.m4 +++ b/m4/dosfile.m4 @@ -14,7 +14,7 @@ AC_DEFUN(AC_DOSFILE, ]) if test $ac_cv_dosfile = yes; then - AC_DEFINE(HAVE_DOS_FILE_NAMES) + AC_DEFINE(HAVE_DOS_FILE_NAMES, 1, [Define if your OS uses backslashes as directory separators]) AC_DEFINE(HAVE_DOS_FILE_CONTENTS, 1, [Define if text file lines end in CRLF.]) fi diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 8a9484d3..5c63480e 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -21,7 +21,7 @@ AC_DEFUN(AM_WITH_NLS, dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) + AC_DEFINE(ENABLE_NLS, 1, [Define if you want to use NLS support]) AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], @@ -61,7 +61,7 @@ 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) + 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 @@ -91,7 +91,7 @@ AC_DEFUN(AM_WITH_NLS, dnl No gettext in C library. Try catgets next. AC_CHECK_LIB(i, main) AC_CHECK_FUNC(catgets, - [AC_DEFINE(HAVE_CATGETS) + [AC_DEFINE(HAVE_CATGETS, 1, [Define if you have catgets]) INTLOBJS="\$(CATOBJS)" AC_PATH_PROG(GENCAT, gencat, no)dnl if test "$GENCAT" != "no"; then @@ -224,7 +224,7 @@ strdup __argz_count __argz_stringify __argz_next]) AC_CHECK_FUNCS(stpcpy) fi if test "${ac_cv_func_stpcpy}" = "yes"; then - AC_DEFINE(HAVE_STPCPY) + AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy]) fi AM_LC_MESSAGES @@ -18,8 +18,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Package name]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Package version])) AC_REQUIRE([AM_SANITY_CHECK]) AC_REQUIRE([AC_ARG_PROGRAM]) dnl FIXME This is truly gross. diff --git a/m4/install.m4 b/m4/install.m4 index 78b04921..b0c3feac 100644 --- a/m4/install.m4 +++ b/m4/install.m4 @@ -6,7 +6,7 @@ # serial 1 -AC_DEFUN(AM_PROG_INSTALL, +AC_DEFUN([AM_PROG_INSTALL], [AC_REQUIRE([AC_PROG_INSTALL]) test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' AC_SUBST(INSTALL_SCRIPT)dnl diff --git a/m4/largefile.m4 b/m4/largefile.m4 index 10b9c488..85019083 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -9,7 +9,7 @@ dnl Written by Paul Eggert <eggert@twinsun.com>. dnl Internal subroutine of AC_SYS_LARGEFILE. dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME) -AC_DEFUN(AC_SYS_LARGEFILE_FLAGS, +AC_DEFUN([AC_SYS_LARGEFILE_FLAGS], [AC_CACHE_CHECK([for $1 value to request large file support], ac_cv_sys_largefile_$1, [if ($GETCONF LFS_$1) >conftest.1 2>conftest.2 && test ! -s conftest.2 @@ -46,7 +46,7 @@ changequote([, ])dnl dnl Internal subroutine of AC_SYS_LARGEFILE. dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL) -AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND, +AC_DEFUN([AC_SYS_LARGEFILE_SPACE_APPEND], [case $2 in no) ;; ?*) @@ -58,7 +58,7 @@ AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND, dnl Internal subroutine of AC_SYS_LARGEFILE. dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT) -AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE, +AC_DEFUN([AC_SYS_LARGEFILE_MACRO_VALUE], [AC_CACHE_CHECK([for $1], $2, [$2=no changequote(, )dnl @@ -77,7 +77,7 @@ changequote([, ])dnl AC_DEFINE_UNQUOTED([$1], [$]$2, [$3]) fi]) -AC_DEFUN(AC_SYS_LARGEFILE, +AC_DEFUN([AC_SYS_LARGEFILE], [AC_REQUIRE([AC_CANONICAL_HOST]) AC_ARG_ENABLE(largefile, [ --disable-largefile omit support for large files]) diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4 index e31bb533..b8b8bb77 100644 --- a/m4/lcmessage.m4 +++ b/m4/lcmessage.m4 @@ -14,6 +14,6 @@ AC_DEFUN(AM_LC_MESSAGES, [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES) + AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if you have LC_MESSAGES]) fi fi]) |