On Sat, 2016-01-23 at 19:07 +0100, Thomas Haller wrote: > We want to specify the min/max version requirements for libnm-gtk > (the > user of libnm-glib), not for libnm-glib itself. > > Fixes: a0d4d15ed22fff2ed856ca6291812e96374afc94 > > https://mail.gnome.org/archives/networkmanager-list/2016-January/msg0 > 0021.html > --- > Hi, > > > He also mentioned that NMA_CFLAGS in configure.ac should probably > be > > LIBNM_GLIB_CFLAGS > > I think it's the other way around.
We have a number of hits for LIBNM_CLFAGS, which is used in all the libnm-ported stuff: src/Makefile.am: $(LIBNM_CFLAGS) \ src/connection-editor/Makefile.am: $(LIBNM_CFLAGS) \ src/libnma/Makefile.am: $(LIBNM_CFLAGS) \ src/utils/Makefile.am: $(LIBNM_CFLAGS) src/utils/tests/Makefile.am: $(LIBNM_CFLAGS) src/wireless-security/Makefile.am: $(LIBNM_CFLAGS) \ But there are no hits for NMA_CFLAGS, which has been the CFLAGS Makefile variable for all the libnm-util/libnm-glib stuff since the beginning. There are, however, hits for LIBNM_GLIB_CFLAGS and they only appear in the parts of code that use libnm-glib: src/libnm-gtk/Makefile.am: $(LIBNM_GLIB_CFLAGS) \ src/libnm-gtk/tests/Makefile.am: $(LIBNM_GLIB_CFLAGS) \ src/utils/Makefile.am: $(LIBNM_GLIB_CFLAGS) src/wireless-security/Makefile.am: $(LIBNM_GLIB_CFLAGS) \ So I'm thinking that LIBNM_CFLAGS is correct, but since NMA_CFLAGS isn't used anywhere and since LIBNM_GLIB_CFLAGS is used but isn't defined anywhere, that s/NMA_CFLAGS/LIBNM_GLIB_CFLAGS is the right thing to do? Dan > > configure.ac | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 25a98c7..39e8c40 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -87,9 +87,9 @@ NMA_CFLAGS="$NMA_CFLAGS > -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2" > NMA_CFLAGS="$NMA_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2" > > PKG_CHECK_MODULES(LIBNM, [libnm gio-2.0 >= 2.32 gmodule-export-2.0]) > -LIBNM_CFLAGS="$LIBNM_CFLAGS > -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32" > -LIBNM_CFLAGS="$LIBNM_CFLAGS > -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2" > -LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2" > +LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS > -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32" > +LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS > -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2" > +LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS > -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2" > > PKG_CHECK_MODULES(LIBSECRET, [libsecret-unstable]) > _______________________________________________ networkmanager-list mailing list networkmanager-list@gnome.org https://mail.gnome.org/mailman/listinfo/networkmanager-list
