mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-02 22:38:01 +00:00
build: bump dependency to glib-2.42
glib-2.42 brings G_PARAM_EXPLICIT_NOTIFY, which is interesting to use. 2.42.0 was released 2014-09-22, so it's very old. Bump from 2.40 to 2.42.0.
This commit is contained in:
parent
358c534e19
commit
b749c01091
10
configure.ac
10
configure.ac
|
@ -273,13 +273,11 @@ AC_SEARCH_LIBS([dlopen], [dl dld],
|
|||
[test "$ac_cv_search_dlopen" = "none required" || AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen"]),
|
||||
[])
|
||||
|
||||
PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
|
||||
[AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/tap-driver.sh')
|
||||
AC_SUBST(AM_TESTS_FD_REDIRECT, '--tap')],
|
||||
[PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.40 gmodule-2.0)
|
||||
AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/test-driver')])
|
||||
PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.42 gmodule-2.0])
|
||||
|
||||
GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40"
|
||||
AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/test-driver')
|
||||
|
||||
GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_42 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_42"
|
||||
|
||||
AC_SUBST(GLIB_CFLAGS)
|
||||
AC_SUBST(GLIB_LIBS)
|
||||
|
|
|
@ -274,7 +274,7 @@ config_h.set10('HAVE_LIBSYSTEMD', libsystemd_dep.found())
|
|||
|
||||
systemd_dep = dependency('systemd', required: false)
|
||||
|
||||
gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.40')
|
||||
gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.42')
|
||||
|
||||
glib_dep = declare_dependency(
|
||||
dependencies: [
|
||||
|
@ -282,8 +282,8 @@ glib_dep = declare_dependency(
|
|||
dependency('gmodule-2.0'),
|
||||
],
|
||||
compile_args: [
|
||||
'-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40',
|
||||
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40',
|
||||
'-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_42',
|
||||
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_42',
|
||||
]
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in a new issue