Rename from GLIB_DIVERT_BEFORE_HELP. Update to track autoconf 2.49b.

* acglib.m4 (GLIB_AC_DIVERT_BEFORE_HELP):
Rename from GLIB_DIVERT_BEFORE_HELP.
Update to track autoconf 2.49b.
* configure.in: Reflect above change.
(AC_EGREP_HEADER): Rename from really obselete AC_HEADER_EGREP.
(debug_default): Replace "if test `expr ...`" with "case".

10 files changed, 72 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 09bb5588c..28adbe913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2000-12-08  Raja R Harinath  <harinath@cs.umn.edu>
 
+	* acglib.m4 (GLIB_AC_DIVERT_BEFORE_HELP): 
+	Rename from GLIB_DIVERT_BEFORE_HELP.  
+	Update to track autoconf 2.49b.
+	* configure.in: Reflect above change.
+	(AC_EGREP_HEADER): Rename from really obselete AC_HEADER_EGREP.
+	(debug_default): Replace "if test `expr ...`" with "case". 
+
 	* tests/Makefile.am (TESTS): Rearrange into other variables, and
 	include run-markup-tests.sh.
 	(TESTS_ENVIRONMENT): New.  Pass $srcdir to tests.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 09bb5588c..28adbe913 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,12 @@
 2000-12-08  Raja R Harinath  <harinath@cs.umn.edu>
 
+	* acglib.m4 (GLIB_AC_DIVERT_BEFORE_HELP): 
+	Rename from GLIB_DIVERT_BEFORE_HELP.  
+	Update to track autoconf 2.49b.
+	* configure.in: Reflect above change.
+	(AC_EGREP_HEADER): Rename from really obselete AC_HEADER_EGREP.
+	(debug_default): Replace "if test `expr ...`" with "case". 
+
 	* tests/Makefile.am (TESTS): Rearrange into other variables, and
 	include run-markup-tests.sh.
 	(TESTS_ENVIRONMENT): New.  Pass $srcdir to tests.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 09bb5588c..28adbe913 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
 2000-12-08  Raja R Harinath  <harinath@cs.umn.edu>
 
+	* acglib.m4 (GLIB_AC_DIVERT_BEFORE_HELP): 
+	Rename from GLIB_DIVERT_BEFORE_HELP.  
+	Update to track autoconf 2.49b.
+	* configure.in: Reflect above change.
+	(AC_EGREP_HEADER): Rename from really obselete AC_HEADER_EGREP.
+	(debug_default): Replace "if test `expr ...`" with "case". 
+
 	* tests/Makefile.am (TESTS): Rearrange into other variables, and
 	include run-markup-tests.sh.
 	(TESTS_ENVIRONMENT): New.  Pass $srcdir to tests.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 09bb5588c..28adbe913 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,12 @@
 2000-12-08  Raja R Harinath  <harinath@cs.umn.edu>
 
+	* acglib.m4 (GLIB_AC_DIVERT_BEFORE_HELP): 
+	Rename from GLIB_DIVERT_BEFORE_HELP.  
+	Update to track autoconf 2.49b.
+	* configure.in: Reflect above change.
+	(AC_EGREP_HEADER): Rename from really obselete AC_HEADER_EGREP.
+	(debug_default): Replace "if test `expr ...`" with "case". 
+
 	* tests/Makefile.am (TESTS): Rearrange into other variables, and
 	include run-markup-tests.sh.
 	(TESTS_ENVIRONMENT): New.  Pass $srcdir to tests.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 09bb5588c..28adbe913 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,12 @@
 2000-12-08  Raja R Harinath  <harinath@cs.umn.edu>
 
+	* acglib.m4 (GLIB_AC_DIVERT_BEFORE_HELP): 
+	Rename from GLIB_DIVERT_BEFORE_HELP.  
+	Update to track autoconf 2.49b.
+	* configure.in: Reflect above change.
+	(AC_EGREP_HEADER): Rename from really obselete AC_HEADER_EGREP.
+	(debug_default): Replace "if test `expr ...`" with "case". 
+
 	* tests/Makefile.am (TESTS): Rearrange into other variables, and
 	include run-markup-tests.sh.
 	(TESTS_ENVIRONMENT): New.  Pass $srcdir to tests.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 09bb5588c..28adbe913 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,12 @@
 2000-12-08  Raja R Harinath  <harinath@cs.umn.edu>
 
+	* acglib.m4 (GLIB_AC_DIVERT_BEFORE_HELP): 
+	Rename from GLIB_DIVERT_BEFORE_HELP.  
+	Update to track autoconf 2.49b.
+	* configure.in: Reflect above change.
+	(AC_EGREP_HEADER): Rename from really obselete AC_HEADER_EGREP.
+	(debug_default): Replace "if test `expr ...`" with "case". 
+
 	* tests/Makefile.am (TESTS): Rearrange into other variables, and
 	include run-markup-tests.sh.
 	(TESTS_ENVIRONMENT): New.  Pass $srcdir to tests.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 09bb5588c..28adbe913 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,12 @@
 2000-12-08  Raja R Harinath  <harinath@cs.umn.edu>
 
+	* acglib.m4 (GLIB_AC_DIVERT_BEFORE_HELP): 
+	Rename from GLIB_DIVERT_BEFORE_HELP.  
+	Update to track autoconf 2.49b.
+	* configure.in: Reflect above change.
+	(AC_EGREP_HEADER): Rename from really obselete AC_HEADER_EGREP.
+	(debug_default): Replace "if test `expr ...`" with "case". 
+
 	* tests/Makefile.am (TESTS): Rearrange into other variables, and
 	include run-markup-tests.sh.
 	(TESTS_ENVIRONMENT): New.  Pass $srcdir to tests.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 09bb5588c..28adbe913 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,12 @@
 2000-12-08  Raja R Harinath  <harinath@cs.umn.edu>
 
+	* acglib.m4 (GLIB_AC_DIVERT_BEFORE_HELP): 
+	Rename from GLIB_DIVERT_BEFORE_HELP.  
+	Update to track autoconf 2.49b.
+	* configure.in: Reflect above change.
+	(AC_EGREP_HEADER): Rename from really obselete AC_HEADER_EGREP.
+	(debug_default): Replace "if test `expr ...`" with "case". 
+
 	* tests/Makefile.am (TESTS): Rearrange into other variables, and
 	include run-markup-tests.sh.
 	(TESTS_ENVIRONMENT): New.  Pass $srcdir to tests.
diff --git a/acglib.m4 b/acglib.m4
index f8d8fb547..01972685d 100644
--- a/acglib.m4
+++ b/acglib.m4
@@ -12,15 +12,16 @@ define([GLIB_TR_CPP],
 		 [[^A-Z0-9_]], [_])])
 ])
 
-# GLIB_DIVERT_BEFORE_HELP(STUFF)
+# GLIB_AC_DIVERT_BEFORE_HELP(STUFF)
+# ---------------------------------
 # Put STUFF early enough so that they are available for $ac_help expansion.
 # Handle both classic (<= v2.13) and modern autoconf
-ifdef([AC_DIVERT],
-      [AC_DEFUN([GLIB_DIVERT_BEFORE_HELP],[AC_DIVERT([NOTICE],[$1])])],
-      [AC_DEFUN([GLIB_DIVERT_BEFORE_HELP],[dnl
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
+[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
+       [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
+              [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 $1
-AC_DIVERT_POP()])])
+AC_DIVERT_POP()])])])
 
 dnl GLIB_IF_VAR_EQ (ENV_VAR, VALUE [, EQUALS_ACTION] [, ELSE_ACTION])
 AC_DEFUN(GLIB_IF_VAR_EQ,[
diff --git a/configure.in b/configure.in
index a08670cdc..6fd14aca0 100644
--- a/configure.in
+++ b/configure.in
@@ -15,10 +15,10 @@ cflags_set=${CFLAGS+set}
 # we rewrite this file
 rm -f glibconfig-sysdefs.h
 
-GLIB_DIVERT_BEFORE_HELP([
+GLIB_AC_DIVERT_BEFORE_HELP([
 #
-# The following version number definitions apply to GLib, GModule, GObject and GThread
-# as a whole, so if changes occoured in any of them, they are all
+# The following version number definitions apply to GLib, GModule, GObject 
+# and GThread as a whole, so if changes occoured in any of them, they are all
 # treated with the same interface and binary age.
 #
 # Making releases:
@@ -91,13 +91,12 @@ AC_MSG_RESULT([$glib_native_beos])
 
 dnl
 
-GLIB_DIVERT_BEFORE_HELP([
+GLIB_AC_DIVERT_BEFORE_HELP([
 # figure debugging default, prior to $ac_help setup
-if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
-  debug_default=yes
-else
-  debug_default=minimum
-fi[]dnl
+case $GLIB_MINOR_VERSION in
+*[[13579]]) debug_default=yes ;;
+*)          debug_default=minimum ;;
+esac[]dnl
 ])
 
 dnl declare --enable-* args and collect ac_help strings
@@ -418,7 +417,7 @@ AC_TRY_COMPILE([#include <sys/types.h>],
 if test $gtk_ok = yes; then
     AC_MSG_RESULT([yes, found in sys/types.h])
 else
-    AC_HEADER_EGREP(fd_set, sys/select.h, gtk_ok=yes)
+    AC_EGREP_HEADER(fd_set, sys/select.h, gtk_ok=yes)
     if test $gtk_ok = yes; then
 	# *** FIXME: give it a different name
         AC_DEFINE(HAVE_SYS_SELECT_H,1,[found fd_set in sys/select.h])