updates.

minor changes to the name of the macros

move #include dosbuf.c further down

update to 2.3

* grep-2.2f beta release.
* m4/{djgpp,envsep,glibc,regex,dosfile,isc-posix}.m4 :
New files to aid configuration and unload configure.in.
* m4/Makefile.am : updated.
Patch forwarded by Ben Elliston.

3 files changed, 21 insertions, 15 deletions

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 77aa2063..e27eba19 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,8 +1,7 @@
 ## Process this file with automake to create Makefile.in
 AUTOMAKE_OPTIONS = no-dependencies
 
-EXTRA_DIST = cygwin.m4 \
-             djgpp.m4 \
+EXTRA_DIST = djgpp.m4 \
              dosfile.m4 \
              envsep.m4 \
              gettext.m4 \
@@ -13,7 +12,6 @@ EXTRA_DIST = cygwin.m4 \
              isc-posix.m4 \
              lcmessage.m4 \
              lfs.m4 \
-             mingw32.m4 \
              missing.m4 \
              progtest.m4 \
              regex.m4 \
diff --git a/m4/envsep.m4 b/m4/envsep.m4
index 0cae25bf..d0002258 100644
--- a/m4/envsep.m4
+++ b/m4/envsep.m4
@@ -7,14 +7,17 @@ AC_DEFUN(AM_SEP,
 [AC_REQUIRE([AC_CYGWIN])
 AC_REQUIRE([AC_MINGW32])
 AC_REQUIRE([AC_DJGPP])
-AC_MSG_CHECKING([for environ var separator])
+AC_MSG_CHECKING([for environ variable separator])
 AC_CACHE_VAL(ac_cv_sep,
 [if test "$CYGWIN" = yes || test "$MINGW32" = yes || "$DJGPP" = yes ; then
   ac_cv_sep=yes
 else
   ac_cv_sep=no
 fi])
-SEP=":"
-test "$ac_cv_sep" = yes && SEP=";"
-AC_MSG_RESULT(${ac_cv_sep})
+if test x"$ac_cv_sep" = xyes ; then
+	SEP=";"
+else
+	SEP=":"
+fi
+AC_MSG_RESULT(${SEP})
 AC_SUBST(SEP)])
diff --git a/m4/regex.m4 b/m4/regex.m4
index 382c3ed1..7a0b9bbb 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -3,18 +3,23 @@ dnl Of course, for them it doesn't do anything.
 dnl Derived from code in GNU grep.
 dnl Derived from code in GNU fileutils ;-).
 
-AC_DEFUN(AM_WITH_REGEX,
+AC_DEFUN(AM_INCLUDED_REGEX,
 [AC_REQUIRE([AM_GLIBC])
-AC_CACHE_CHECK([whether compiling regex.c], ac_cv_with_regex,
-[ # By default, don't use the included regex.c on systems with glibc 2
-test "$ac_cv_glibc" = yes && default=no || default=yes
+AC_CACHE_CHECK([whether compiling regex.c], ac_cv_included_regex,
+[
+# By default, don't use the included regex.c on systems with glibc 2
+if test x"$ac_cv_glibc" = xyes ; then
+	default=no
+else
+	default=yes
+fi
 	AC_ARG_WITH(included-regex,
 	[  --without-included-regex don't compile regex; this is the default on
                           systems with version 2 of the GNU C library
                           (use with caution on other system)],
-		    ac_cv_with_regex=$withval,
-		    ac_cv_with_regex=$default)
-if test "$ac_cv_with_regex" = yes; then
-  LIBOBJS="$LIBOBJS regex.o"
+		    ac_cv_included_regex=$withval,
+		    ac_cv_included_regex=$default)
+if test x"$ac_cv_included_regex" = xyes; then
+  LIBOBJS="$LIBOBJS regex.${ac_objext}"
 fi
 ])])