[network-manager-applet/nma-1-0] build: fix build against NM master



commit 76569a466aca81cd4e41dc9d68a7abb98357a907
Author: Dan Winship <danw redhat com>
Date:   Thu Jan 22 09:56:12 2015 -0500

    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
    (cherry picked from commit 3fa58788bfdecb922bb8dcb43c7c6c009de3c483)

 src/Makefile.am                   |    1 +
 src/connection-editor/Makefile.am |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 0e85dd5..acf6c13 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 a597458..2422a86 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)"\" \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]