luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename from GLIB_DIVERT_BEFORE_HELP. Update to track autoconf 2.49b.

Browse Source 
* 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".
This commit is contained in:
Raja R Harinath 2000-12-08 22:48:45 +00:00
parent 8f0a794c15
commit 31fc683b98
10 changed files with 72 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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.

7
ChangeLog.pre-2-0
View File

@ -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.

7
ChangeLog.pre-2-10
View File

@ -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.

7
ChangeLog.pre-2-12
View File

@ -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.

7
ChangeLog.pre-2-2
View File

@ -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.

7
ChangeLog.pre-2-4
View File

@ -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.

7
ChangeLog.pre-2-6
View File

@ -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.

7
ChangeLog.pre-2-8
View File

@ -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.

13
acglib.m4
View File

@ -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,[

19
configure.in
View File

@ -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])