diff options
| author | Tim Janik <timj@gtk.org> | 1998-08-17 00:00:51 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-08-17 00:00:51 +0000 |
| commit | e93e4945181e4bd6b419d7ee3c409db88ad918cd (patch) | |
| tree | ec347ef84f9aa6e9904d4629c0c9614e23118fd1 /glib.m4 | |
| parent | d5803865b40fbdf2ebec2dafbf9974bd590ebf40 (diff) | |
feature an extra MODULES parameter, so glib-config can be invoked with the
Mon Aug 17 01:46:14 1998 Tim Janik <timj@gtk.org>
* glib.m4: feature an extra MODULES parameter, so glib-config can
be invoked with the "gmodule" argument.
* glib.h: changed the log level to G_LOG_LEVEL_CRITICAL for all
g_return*_if_fail statements, and made them issue a message
like "assertion `%s' failed".
* gmessages.c (g_logv): ugh, don't pass log_domain as NULL to
g_log_find_domain.
Diffstat (limited to 'glib.m4')
| -rw-r--r-- | glib.m4 | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -1,8 +1,9 @@ # Configure paths for GLIB # Owen Taylor 97-11-3 -dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS +dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" is specified +dnl in MODULES, feature the glib-config gmodule option. dnl AC_DEFUN(AM_PATH_GLIB, [dnl @@ -28,6 +29,10 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru fi fi + case "$4" in + *gmodule*) glib_config_args="$glib_config_args gmodule";; + esac + AC_PATH_PROG(GLIB_CONFIG, glib-config, no) min_glib_version=ifelse([$1], ,0.99.7,$1) AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) |