[network-manager-applet/nma-1-0: 1/18] build: fix build against nm-1-0



commit 2eef9d08067585dc6591fae3947cf83d8e955487
Author: Jiří Klimeš <jklimes redhat com>
Date:   Thu Jul 9 08:07:21 2015 +0200

    build: fix build against nm-1-0
    
    libnm-util/nm-version.h in nm-1-0 branch doesn't define NM_VERSION_1_2.
    
    Fixes: dcff29b56852ea9077a24eebdcd7c39111e25024

 src/Makefile.am                   |    2 +-
 src/connection-editor/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c885eee..1986b3e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ nm_applet_CPPFLAGS = \
        $(LIBSECRET_CFLAGS) \
        $(NOTIFY_CFLAGS) \
        -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_0 \
-       -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2 \
+       -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_0 \
        -DICONDIR=\""$(datadir)/icons"\"                                                \
        -DUIDIR=\""$(uidir)"\"                                                  \
        -DBINDIR=\""$(bindir)"\"                                                                \
diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am
index 33239b8..9c24a9e 100644
--- a/src/connection-editor/Makefile.am
+++ b/src/connection-editor/Makefile.am
@@ -4,7 +4,7 @@ nm_connection_editor_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(NMA_CFLAGS) \
        -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_0 \
-       -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2 \
+       -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_0 \
        -DICONDIR=\""$(datadir)/icons"\" \
        -DUIDIR=\""$(uidir)"\" \
        -DBINDIR=\""$(bindir)"\" \


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