1 diff -Nru grep-2.5e/acinclude.m4 grep-2.5e.new/acinclude.m4
2 --- grep-2.5e/acinclude.m4 Fri Aug 10 13:29:28 2001
3 +++ grep-2.5e.new/acinclude.m4 Fri Aug 10 13:29:09 2001
7 -AC_DEFUN(jm_CHECK_DECLARATION,
8 +AC_DEFUN([jm_CHECK_DECLARATION],
10 AC_MSG_CHECKING([whether $1 is declared])
11 AC_CACHE_VAL(jm_cv_func_decl_$1,
14 dnl jm_CHECK_DECLARATIONS(INCLUDES, FUNCTION... [, ACTION-IF-DECLARED
15 dnl [, ACTION-IF-NOT-DECLARED]])
16 -AC_DEFUN(jm_CHECK_DECLARATIONS,
17 +AC_DEFUN([jm_CHECK_DECLARATIONS],
23 dnl Check for DJGPP. we use DJ_GPP as the variable
27 [AC_CACHE_CHECK(for DJGPP environment, ac_cv_djgpp,
28 [AC_TRY_COMPILE(,[ return __DJGPP__;],
29 ac_cv_djgpp=yes, ac_cv_djgpp=no)
31 # Also set the macro HAVE_DOS_FILE_CONTENTS for now,
32 # since don't know of a good way to independently check this.
35 +AC_DEFUN([AC_DOSFILE],
37 AC_CACHE_CHECK([for dos file convention], ac_cv_dosfile,
38 [if test -d ".\."; then
45 [AC_REQUIRE([AC_CYGWIN])
46 AC_REQUIRE([AC_MINGW32])
47 AC_REQUIRE([AC_DJGPP])
49 dnl directory -- otherwise, they'll conflict with existing files.
51 dnl These are the prerequisite macros for GNU's error.c file.
52 -AC_DEFUN(jm_PREREQ_ERROR,
53 +AC_DEFUN([jm_PREREQ_ERROR],
55 AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
58 dnl glibc (2.1.93 and newer) and Solaris provide __fpending. On other systems,
59 dnl we have to grub around in the FILE struct.
61 -AC_DEFUN(jm_FUNC_FPENDING,
62 +AC_DEFUN([jm_FUNC_FPENDING],
64 AC_CHECK_HEADERS(stdio_ext.h)
65 AC_REPLACE_FUNCS([__fpending])
67 dnl Test for the GNU C Library.
68 dnl FIXME: this should migrate into libit.
73 AC_CACHE_CHECK(whether we are using the GNU C Library,
76 # Define HAVE_INTTYPES_H if <inttypes.h> exists,
77 # doesn't clash with <sys/types.h>, and declares uintmax_t.
79 -AC_DEFUN(jm_AC_HEADER_INTTYPES_H,
80 +AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
82 AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
85 dnl configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
87 undefine([AC_ISC_POSIX])
88 -AC_DEFUN(AC_ISC_POSIX,
89 +AC_DEFUN([AC_ISC_POSIX],
91 dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
92 dnl AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
95 dnl Internal subroutine of AC_SYS_LARGEFILE.
96 dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME)
97 -AC_DEFUN(AC_SYS_LARGEFILE_FLAGS,
98 +AC_DEFUN([AC_SYS_LARGEFILE_FLAGS],
99 [AC_CACHE_CHECK([for $1 value to request large file support],
100 ac_cv_sys_largefile_$1,
101 [if ($GETCONF LFS_$1) >conftest.1 2>conftest.2 && test ! -s conftest.2
104 dnl Internal subroutine of AC_SYS_LARGEFILE.
105 dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL)
106 -AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,
107 +AC_DEFUN([AC_SYS_LARGEFILE_SPACE_APPEND],
113 dnl Internal subroutine of AC_SYS_LARGEFILE.
114 dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT)
115 -AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
116 +AC_DEFUN([AC_SYS_LARGEFILE_MACRO_VALUE],
117 [AC_CACHE_CHECK([for $1], $2,
121 AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])
124 -AC_DEFUN(AC_SYS_LARGEFILE,
125 +AC_DEFUN([AC_SYS_LARGEFILE],
126 [AC_REQUIRE([AC_CANONICAL_HOST])
127 AC_ARG_ENABLE(largefile,
128 [ --disable-largefile omit support for large files])
130 dnl If it doesn't, arrange to use the replacement function.
133 -AC_DEFUN(jm_FUNC_MALLOC,
134 +AC_DEFUN([jm_FUNC_MALLOC],
136 dnl xmalloc.c requires that this symbol be defined so it doesn't
137 dnl mistakenly use a broken malloc -- as it might if this test were omitted.
139 ## --------------------------------------------------------- ##
140 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
141 dnl The program must properly implement --version.
142 -AC_DEFUN(AM_MISSING_PROG,
143 +AC_DEFUN([AM_MISSING_PROG],
144 [AC_MSG_CHECKING(for working $2)
145 # Run test in a subshell; some versions of sh will print an error if
146 # an executable is not found, even if stderr is redirected.
149 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
150 dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
151 -AC_DEFUN(AM_PATH_PROG_WITH_TEST,
152 +AC_DEFUN([AM_PATH_PROG_WITH_TEST],
153 [# Extract the first word of "$2", so it can be a program name with args.
154 set dummy $2; ac_word=[$]2
155 AC_MSG_CHECKING([for $ac_word])
157 dnl If it doesn't, arrange to use the replacement function.
160 -AC_DEFUN(jm_FUNC_REALLOC,
161 +AC_DEFUN([jm_FUNC_REALLOC],
163 dnl xmalloc.c requires that this symbol be defined so it doesn't
164 dnl mistakenly use a broken realloc -- as it might if this test were omitted.
167 dnl Usage: jm_INCLUDED_REGEX([lib/regex.c])
169 -AC_DEFUN(jm_INCLUDED_REGEX,
170 +AC_DEFUN([jm_INCLUDED_REGEX],
172 dnl Even packages that don't use regex.c can use this macro.
173 dnl Of course, for them it doesn't do anything.
175 # Check to make sure that the build environment is sane.
178 -AC_DEFUN(AM_SANITY_CHECK,
179 +AC_DEFUN([AM_SANITY_CHECK],
180 [AC_MSG_CHECKING([whether build environment is sane])
184 # Define uintmax_t to `unsigned long' or `unsigned long long'
185 # if <inttypes.h> does not exist.
187 -AC_DEFUN(jm_AC_TYPE_UINTMAX_T,
188 +AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
190 AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
191 if test $jm_ac_cv_header_inttypes_h = no; then
194 dnl From Paul Eggert.
196 -AC_DEFUN(jm_AC_TYPE_UNSIGNED_LONG_LONG,
197 +AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
199 AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
200 [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
203 # autoconf tests required for use of xstrtoumax.c
205 -AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
206 +AC_DEFUN([jm_AC_PREREQ_XSTRTOUMAX],
208 AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
209 AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
210 diff -Nru grep-2.5e/m4/error.m4 grep-2.5e.new/m4/error.m4
211 --- grep-2.5e/m4/error.m4 Sun Mar 4 05:40:16 2001
212 +++ grep-2.5e.new/m4/error.m4 Thu Jan 1 01:00:00 1970
216 -dnl FIXME: put these prerequisite-only *.m4 files in a separate
217 -dnl directory -- otherwise, they'll conflict with existing files.
219 -dnl These are the prerequisite macros for GNU's error.c file.
220 -AC_DEFUN(jm_PREREQ_ERROR,
222 - AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
225 diff -Nru grep-2.5e/m4/gettext.m4 grep-2.5e.new/m4/gettext.m4
226 --- grep-2.5e/m4/gettext.m4 Thu Mar 2 04:00:39 2000
227 +++ grep-2.5e.new/m4/gettext.m4 Thu Jan 1 01:00:00 1970
229 -# Macro to add for using GNU gettext.
230 -# Ulrich Drepper <drepper@cygnus.com>, 1995.
232 -# This file can be copied and used freely without restrictions. It can
233 -# be used in projects which are not available under the GNU Public License
234 -# but which still want to provide support for the GNU gettext functionality.
235 -# Please note that the actual code is *not* freely available.
239 -AC_DEFUN(AM_WITH_NLS,
240 - [AC_MSG_CHECKING([whether NLS is requested])
241 - dnl Default is enabled NLS
243 - [ --disable-nls do not use Native Language Support],
244 - USE_NLS=$enableval, USE_NLS=yes)
245 - AC_MSG_RESULT($USE_NLS)
248 - USE_INCLUDED_LIBINTL=no
250 - dnl If we use NLS figure out what method
251 - if test "$USE_NLS" = "yes"; then
252 - AC_DEFINE(ENABLE_NLS)
253 - AC_MSG_CHECKING([whether included gettext is requested])
254 - AC_ARG_WITH(included-gettext,
255 - [ --with-included-gettext use the GNU gettext library included here],
256 - nls_cv_force_use_gnu_gettext=$withval,
257 - nls_cv_force_use_gnu_gettext=no)
258 - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
260 - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
261 - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
262 - dnl User does not insist on using GNU NLS library. Figure out what
263 - dnl to use. If gettext or catgets are available (in this order) we
264 - dnl use this. Else we have to fall back to GNU NLS library.
265 - dnl catgets is only used if permitted by option --with-catgets.
266 - nls_cv_header_intl=
267 - nls_cv_header_libgt=
270 - AC_CHECK_HEADER(libintl.h,
271 - [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
272 - [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
273 - gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
275 - if test "$gt_cv_func_gettext_libc" != "yes"; then
276 - AC_CHECK_LIB(intl, bindtextdomain,
277 - [AC_CACHE_CHECK([for gettext in libintl],
278 - gt_cv_func_gettext_libintl,
279 - [AC_CHECK_LIB(intl, gettext,
280 - gt_cv_func_gettext_libintl=yes,
281 - gt_cv_func_gettext_libintl=no)],
282 - gt_cv_func_gettext_libintl=no)])
284 - if test "$gt_cv_func_gettext_libintl" = yes; then
285 - LIBS="$LIBS -lintl"
290 - if test "$gt_cv_func_gettext_libc" = "yes" \
291 - || test "$gt_cv_func_gettext_libintl" = "yes"; then
292 - AC_DEFINE(HAVE_GETTEXT)
293 - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
294 - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
295 - if test "$MSGFMT" != "no"; then
296 - AC_CHECK_FUNCS(dcgettext)
297 - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
298 - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
299 - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
300 - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
301 - return _nl_msg_cat_cntr],
303 - DATADIRNAME=share],
311 - if test "$CATOBJEXT" = "NONE"; then
312 - AC_MSG_CHECKING([whether catgets can be used])
313 - AC_ARG_WITH(catgets,
314 - [ --with-catgets use catgets functions if available],
315 - nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
316 - AC_MSG_RESULT($nls_cv_use_catgets)
318 - if test "$nls_cv_use_catgets" = "yes"; then
319 - dnl No gettext in C library. Try catgets next.
320 - AC_CHECK_LIB(i, main)
321 - AC_CHECK_FUNC(catgets,
322 - [AC_DEFINE(HAVE_CATGETS)
323 - INTLOBJS="\$(CATOBJS)"
324 - AC_PATH_PROG(GENCAT, gencat, no)dnl
325 - if test "$GENCAT" != "no"; then
326 - AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
327 - if test "$GMSGFMT" = "no"; then
328 - AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
329 - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
331 - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
332 - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
333 - USE_INCLUDED_LIBINTL=yes
337 - INTLDEPS='$(top_builddir)/intl/libintl.a'
339 - LIBS=`echo $LIBS | sed -e 's/-lintl//'`
340 - nls_cv_header_intl=intl/libintl.h
341 - nls_cv_header_libgt=intl/libgettext.h
346 - if test "$CATOBJEXT" = "NONE"; then
347 - dnl Neither gettext nor catgets in included in the C library.
348 - dnl Fall back on GNU gettext library.
349 - nls_cv_use_gnu_gettext=yes
353 - if test "$nls_cv_use_gnu_gettext" = "yes"; then
354 - dnl Mark actions used to generate GNU NLS library.
355 - INTLOBJS="\$(GETTOBJS)"
356 - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
357 - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
358 - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
359 - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
360 - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
362 - USE_INCLUDED_LIBINTL=yes
366 - INTLDEPS='$(top_builddir)/intl/libintl.a'
368 - LIBS=`echo $LIBS | sed -e 's/-lintl//'`
369 - nls_cv_header_intl=intl/libintl.h
370 - nls_cv_header_libgt=intl/libgettext.h
373 - dnl Test whether we really found GNU xgettext.
374 - if test "$XGETTEXT" != ":"; then
375 - dnl If it is no GNU xgettext we define it as : so that the
376 - dnl Makefiles still can work.
377 - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
381 - [found xgettext program is not GNU xgettext; ignore it])
386 - # We need to process the po/ directory.
390 - nls_cv_header_intl=intl/libintl.h
391 - nls_cv_header_libgt=intl/libgettext.h
393 - if test -z "$nsl_cv_header_intl"; then
394 - # Clean out junk possibly left behind by a previous configuration.
395 - rm -f intl/libintl.h
397 - AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
398 - AC_OUTPUT_COMMANDS(
399 - [case "$CONFIG_FILES" in *po/Makefile.in*)
400 - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
404 - # If this is used in GNU gettext we have to set USE_NLS to `yes'
405 - # because some of the sources are only built for this goal.
406 - if test "$PACKAGE" = gettext; then
408 - USE_INCLUDED_LIBINTL=yes
411 - dnl These rules are solely for the distribution goal. While doing this
412 - dnl we only have to keep exactly one list of the available catalogs
413 - dnl in configure.in.
414 - for lang in $ALL_LINGUAS; do
415 - GMOFILES="$GMOFILES $lang.gmo"
416 - POFILES="$POFILES $lang.po"
419 - dnl Make all variables we use known to autoconf.
420 - AC_SUBST(USE_INCLUDED_LIBINTL)
422 - AC_SUBST(CATOBJEXT)
423 - AC_SUBST(DATADIRNAME)
425 - AC_SUBST(INSTOBJEXT)
433 -AC_DEFUN(AM_GNU_GETTEXT,
434 - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
435 - AC_REQUIRE([AC_PROG_CC])dnl
436 - AC_REQUIRE([AC_PROG_RANLIB])dnl
437 - AC_REQUIRE([AC_ISC_POSIX])dnl
438 - AC_REQUIRE([AC_HEADER_STDC])dnl
439 - AC_REQUIRE([AC_C_CONST])dnl
440 - AC_REQUIRE([AC_C_INLINE])dnl
441 - AC_REQUIRE([AC_TYPE_OFF_T])dnl
442 - AC_REQUIRE([AC_TYPE_SIZE_T])dnl
443 - AC_REQUIRE([AC_FUNC_ALLOCA])dnl
444 - AC_REQUIRE([AC_FUNC_MMAP])dnl
446 - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
447 -unistd.h sys/param.h])
448 - AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
449 -strdup __argz_count __argz_stringify __argz_next])
451 - if test "${ac_cv_func_stpcpy+set}" != "set"; then
452 - AC_CHECK_FUNCS(stpcpy)
454 - if test "${ac_cv_func_stpcpy}" = "yes"; then
455 - AC_DEFINE(HAVE_STPCPY)
461 - if test "x$CATOBJEXT" != "x"; then
462 - if test "x$ALL_LINGUAS" = "x"; then
465 - AC_MSG_CHECKING(for catalogs to be installed)
467 - for lang in ${LINGUAS=$ALL_LINGUAS}; do
468 - case "$ALL_LINGUAS" in
469 - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
472 - LINGUAS=$NEW_LINGUAS
473 - AC_MSG_RESULT($LINGUAS)
476 - dnl Construct list of names of catalog files to be constructed.
477 - if test -n "$LINGUAS"; then
478 - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
482 - dnl The reference to <locale.h> in the installed <libintl.h> file
483 - dnl must be resolved because we cannot expect the users of this
484 - dnl to define HAVE_LOCALE_H.
485 - if test $ac_cv_header_locale_h = yes; then
486 - INCLUDE_LOCALE_H="#include <locale.h>"
488 - INCLUDE_LOCALE_H="\
489 -/* The system does not provide the header <locale.h>. Take care yourself. */"
491 - AC_SUBST(INCLUDE_LOCALE_H)
493 - dnl Determine which catalog format we have (if any is needed)
494 - dnl For now we know about two different formats:
495 - dnl Linux libc-5 and the normal X/Open format
496 - test -d intl || mkdir intl
497 - if test "$CATOBJEXT" = ".cat"; then
498 - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
500 - dnl Transform the SED scripts while copying because some dumb SEDs
501 - dnl cannot handle comments.
502 - sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
504 - dnl po2tbl.sed is always needed.
505 - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
506 - $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
508 - dnl In the intl/Makefile.in we have a special dependency which makes
509 - dnl only sense for gettext. We comment this out for non-gettext
511 - if test "$PACKAGE" = "gettext"; then
521 - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
522 - dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
523 - dnl Try to locate is.
525 - if test -n "$ac_aux_dir"; then
526 - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
528 - if test -z "$MKINSTALLDIRS"; then
529 - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
531 - AC_SUBST(MKINSTALLDIRS)
533 - dnl *** For now the libtool support in intl/Makefile is not for real.
537 - dnl Generate list of files to be processed by xgettext which will
538 - dnl be included in po/Makefile.
539 - test -d po || mkdir po
540 - if test "x$srcdir" != "x."; then
542 - if test "x`echo $srcdir | sed -e 's@^[A-z]:@@' -e 's@/.*@@'`" = "x"; then
543 - posrcprefix="$srcdir/"
545 - posrcprefix="../$srcdir/"
547 - changequote([, ])dnl
552 - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
553 - < $srcdir/po/POTFILES.in > po/POTFILES
555 diff -Nru grep-2.5e/m4/largefile.m4 grep-2.5e.new/m4/largefile.m4
556 --- grep-2.5e/m4/largefile.m4 Thu Mar 2 04:00:39 2000
557 +++ grep-2.5e.new/m4/largefile.m4 Thu Jan 1 01:00:00 1970
561 -dnl By default, many hosts won't let programs access large files;
562 -dnl one must use special compiler options to get large-file access to work.
563 -dnl For more details about this brain damage please see:
564 -dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
566 -dnl Written by Paul Eggert <eggert@twinsun.com>.
568 -dnl Internal subroutine of AC_SYS_LARGEFILE.
569 -dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME)
570 -AC_DEFUN(AC_SYS_LARGEFILE_FLAGS,
571 - [AC_CACHE_CHECK([for $1 value to request large file support],
572 - ac_cv_sys_largefile_$1,
573 - [if ($GETCONF LFS_$1) >conftest.1 2>conftest.2 && test ! -s conftest.2
575 - ac_cv_sys_largefile_$1=`cat conftest.1`
577 - ac_cv_sys_largefile_$1=no
579 - [case "$host_os" in
580 - # HP-UX 10.20 requires -D__STDC_EXT__ with gcc 2.95.1.
582 - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
583 -changequote([, ])dnl
584 - if test "$GCC" = yes; then
585 - ac_cv_sys_largefile_CFLAGS=-D__STDC_EXT__
588 - # IRIX 6.2 and later require cc -n32.
590 - irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*)
591 -changequote([, ])dnl
592 - if test "$GCC" != yes; then
593 - ac_cv_sys_largefile_CFLAGS=-n32
596 - if test "$ac_cv_sys_largefile_CFLAGS" != no; then
598 - CC="$CC $ac_cv_sys_largefile_CFLAGS"
599 - AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no)
603 - rm -f conftest*])])
605 -dnl Internal subroutine of AC_SYS_LARGEFILE.
606 -dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL)
607 -AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,
613 - *) $1=[$]$1' '$2 ;;
617 -dnl Internal subroutine of AC_SYS_LARGEFILE.
618 -dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT)
619 -AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
620 - [AC_CACHE_CHECK([for $1], $2,
624 - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
629 - $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;;
632 -changequote([, ])dnl
634 - if test "[$]$2" != no; then
635 - AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])
638 -AC_DEFUN(AC_SYS_LARGEFILE,
639 - [AC_REQUIRE([AC_CANONICAL_HOST])
640 - AC_ARG_ENABLE(largefile,
641 - [ --disable-largefile omit support for large files])
642 - if test "$enable_largefile" != no; then
643 - AC_CHECK_TOOL(GETCONF, getconf)
644 - AC_SYS_LARGEFILE_FLAGS(CFLAGS)
645 - AC_SYS_LARGEFILE_FLAGS(LDFLAGS)
646 - AC_SYS_LARGEFILE_FLAGS(LIBS)
648 - for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
651 - -D_FILE_OFFSET_BITS=*) ;;
652 - -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;;
653 - -D_LARGE_FILES | -D_LARGE_FILES=*) ;;
655 - AC_SYS_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;;
657 - AC_SYS_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;;
660 - AC_SYS_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS")
661 - AC_SYS_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS")
662 - AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS,
663 - ac_cv_sys_file_offset_bits,
664 - [Number of bits in a file offset, on hosts where this is settable.],
665 - [case "$host_os" in
666 - # HP-UX 10.20 and later
667 - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
668 - ac_cv_sys_file_offset_bits=64 ;;
670 - AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE,
671 - ac_cv_sys_largefile_source,
672 - [Define to make fseeko etc. visible, on some hosts.],
673 - [case "$host_os" in
674 - # HP-UX 10.20 and later
675 - hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
676 - ac_cv_sys_largefile_source=1 ;;
678 - AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
679 - ac_cv_sys_large_files,
680 - [Define for large files, on AIX-style hosts.],
681 - [case "$host_os" in
682 - # AIX 4.2 and later
683 - aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)
684 - ac_cv_sys_large_files=1 ;;
688 diff -Nru grep-2.5e/m4/lcmessage.m4 grep-2.5e.new/m4/lcmessage.m4
689 --- grep-2.5e/m4/lcmessage.m4 Thu Mar 2 04:00:39 2000
690 +++ grep-2.5e.new/m4/lcmessage.m4 Thu Jan 1 01:00:00 1970
692 -# Check whether LC_MESSAGES is available in <locale.h>.
693 -# Ulrich Drepper <drepper@cygnus.com>, 1995.
695 -# This file can be copied and used freely without restrictions. It can
696 -# be used in projects which are not available under the GNU Public License
697 -# but which still want to provide support for the GNU gettext functionality.
698 -# Please note that the actual code is *not* freely available.
702 -AC_DEFUN(AM_LC_MESSAGES,
703 - [if test $ac_cv_header_locale_h = yes; then
704 - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
705 - [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
706 - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
707 - if test $am_cv_val_LC_MESSAGES = yes; then
708 - AC_DEFINE(HAVE_LC_MESSAGES)
711 diff -Nru grep-2.5e/m4/progtest.m4 grep-2.5e.new/m4/progtest.m4
712 --- grep-2.5e/m4/progtest.m4 Thu Mar 2 04:00:39 2000
713 +++ grep-2.5e.new/m4/progtest.m4 Thu Jan 1 01:00:00 1970
715 -# Search path for a program which passes the given test.
716 -# Ulrich Drepper <drepper@cygnus.com>, 1996.
717 -# update to support dos
719 -# This file can be copied and used freely without restrictions. It can
720 -# be used in projects which are not available under the GNU Public License
721 -# but which still want to provide support for the GNU gettext functionality.
722 -# Please note that the actual code is *not* freely available.
726 -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
727 -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
728 -AC_DEFUN(AM_PATH_PROG_WITH_TEST,
729 -[# Extract the first word of "$2", so it can be a program name with args.
730 -set dummy $2; ac_word=[$]2
731 -AC_MSG_CHECKING([for $ac_word])
732 -AC_CACHE_VAL(ac_cv_path_$1,
736 -changequote([, ])dnl
737 - ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
740 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
741 - for ac_dir in ifelse([$5], , $PATH, [$5]); do
742 - test -z "$ac_dir" && ac_dir=.
743 - if test $ac_x $ac_dir/$ac_word; then
745 - ac_cv_path_$1="$ac_dir/$ac_word"
751 -dnl If no 4th arg is given, leave the cache variable unset,
752 -dnl so AC_PATH_PROGS will keep looking.
753 -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
758 -if test -n "[$]$1"; then
759 - AC_MSG_RESULT([$]$1)
765 --- grep-2.5e/Makefile.am Sun Mar 4 17:45:49 2001
766 +++ grep-2.5e.new/Makefile.am Fri Aug 10 13:39:04 2001
768 SUBDIRS = intl po lib doc src tests djgpp m4 vms bootstrap
770 EXTRA_DIST = TODO README README-alpha PATCHES.AC PATCHES.AM
772 -# We should be able to just define `ACLOCAL_AMFLAGS = --acdir=m4',
773 -# but this runs afoul of a bug in automake 1.
774 -# The following hack works around this bug by creating acinclude.m4 manually.
776 -M4DIR = $(srcdir)/m4
777 -ACINCLUDE_INPUTS = $(M4DIR)/decl.m4 $(M4DIR)/djgpp.m4 $(M4DIR)/dosfile.m4 \
778 - $(M4DIR)/envsep.m4 $(M4DIR)/error.m4 $(M4DIR)/gettext.m4 $(M4DIR)/glibc.m4 \
779 - $(M4DIR)/header.m4 $(M4DIR)/init.m4 $(M4DIR)/install.m4 \
780 - $(M4DIR)/inttypes_h.m4 $(M4DIR)/isc-posix.m4 $(M4DIR)/largefile.m4 \
781 - $(M4DIR)/lcmessage.m4 $(M4DIR)/malloc.m4 $(M4DIR)/missing.m4 \
782 - $(M4DIR)/progtest.m4 $(M4DIR)/realloc.m4 $(M4DIR)/regex.m4 \
783 - $(M4DIR)/sanity.m4 $(M4DIR)/strerror_r.m4 $(M4DIR)/uintmax_t.m4 \
784 - $(M4DIR)/ulonglong.m4 $(M4DIR)/xstrtoumax.m4
785 -$(srcdir)/acinclude.m4 : $(ACINCLUDE_INPUTS)
786 - cat $(ACINCLUDE_INPUTS) >$(srcdir)/acinclude.m4