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.
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.
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.
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.
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.
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.
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.
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.
[[^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,[
# 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:
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
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])