diff options
| author | Dan Winship <danw@redhat.com> | 2015-01-22 09:56:12 -0500 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2015-01-22 10:14:05 -0500 |
| commit | 3fa58788bfdecb922bb8dcb43c7c6c009de3c483 (patch) | |
| tree | b5e726d102a7409ff7fa97ee52d34d4af5b91f17 | |
| parent | 7509976afe4e37361f4c872d58f5e44c28de20db (diff) | |
| download | network-manager-applet-3fa58788bfdecb922bb8dcb43c7c6c009de3c483.tar.gz | |
build: fix build against NM master
We were setting -DNM_VERSION_MAX_ALLOWED=NM_VERSION_0_9_10, but if you
don't set NM_VERSION_MIN_REQUIRED, it defaults to
NM_VERSION_CUR_STABLE, which meant that we were setting MIN to 1_0 and
MAX to 0_9_10, which clearly won't work. Fix this by setting MIN to
0_9_10 too (since that's still the version we're requiring in
configure).
https://bugzilla.gnome.org/show_bug.cgi?id=743343
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/connection-editor/Makefile.am | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0e85dd57..acf6c135 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,7 @@ nm_applet_CPPFLAGS = \ $(NMA_CFLAGS) \ $(LIBSECRET_CFLAGS) \ $(NOTIFY_CFLAGS) \ + -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_10 \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_0_9_10 \ -DICONDIR=\""$(datadir)/icons"\" \ -DUIDIR=\""$(uidir)"\" \ diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am index a5974580..2422a866 100644 --- a/src/connection-editor/Makefile.am +++ b/src/connection-editor/Makefile.am @@ -3,6 +3,7 @@ bin_PROGRAMS = nm-connection-editor nm_connection_editor_CPPFLAGS = \ $(GTK_CFLAGS) \ $(NMA_CFLAGS) \ + -DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_10 \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_0_9_10 \ -DICONDIR=\""$(datadir)/icons"\" \ -DUIDIR=\""$(uidir)"\" \ |