mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
Merge branch 'm4-fixes' into 'master'
m4: Fix AM_PATH_GLIB_2_0 macro See merge request GNOME/glib!396
This commit is contained in:
commit
3b5e5b8f9e
@ -2,7 +2,7 @@
|
||||
# Owen Taylor 1997-2001
|
||||
|
||||
# Increment this whenever this file is changed.
|
||||
#serial 2
|
||||
#serial 3
|
||||
|
||||
dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
||||
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
|
||||
@ -53,7 +53,7 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run
|
||||
fi
|
||||
|
||||
dnl For GLIB_CFLAGS and GLIB_LIBS
|
||||
PKG_CHECK_MODULES([GLIB], [$pkg_config_args >= $min_glib_version], [:], [:])
|
||||
PKG_CHECK_MODULES([GLIB], [$pkg_config_args], [:], [:])
|
||||
|
||||
dnl For the tools
|
||||
PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal])
|
||||
|
Loading…
Reference in New Issue
Block a user