Imported Upstream version 1.0.8 upstream/1.0.8

19 files changed, 28 insertions, 0 deletions

diff --git a/examples/C/Makefile.in b/examples/C/Makefile.in
index 0d606287..3b154702 100644
--- a/examples/C/Makefile.in
+++ b/examples/C/Makefile.in
@@ -314,6 +314,7 @@ LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
index d8e5d285..4b03d87f 100644
--- a/examples/C/glib/Makefile.am
+++ b/examples/C/glib/Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS = \
 	-I${top_srcdir}/include \
+	-I$(top_builddir)/include \
 	-I${top_srcdir}/libnm-core \
 	-I${top_builddir}/libnm-core \
 	-I${top_srcdir}/libnm \
diff --git a/examples/C/glib/Makefile.in b/examples/C/glib/Makefile.in
index 9c18e61f..f4caa8a9 100644
--- a/examples/C/glib/Makefile.in
+++ b/examples/C/glib/Makefile.in
@@ -352,6 +352,7 @@ LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -494,6 +495,7 @@ with_resolvconf = @with_resolvconf@
 with_valgrind = @with_valgrind@
 AM_CPPFLAGS = \
 	-I${top_srcdir}/include \
+	-I$(top_builddir)/include \
 	-I${top_srcdir}/libnm-core \
 	-I${top_builddir}/libnm-core \
 	-I${top_srcdir}/libnm \
diff --git a/examples/C/qt/Makefile.in b/examples/C/qt/Makefile.in
index 7758476d..997aca76 100644
--- a/examples/C/qt/Makefile.in
+++ b/examples/C/qt/Makefile.in
@@ -324,6 +324,7 @@ LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 9e3a806b..cc227072 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -313,6 +313,7 @@ LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/examples/dispatcher/Makefile.in b/examples/dispatcher/Makefile.in
index fba9c820..b04b3e50 100644
--- a/examples/dispatcher/Makefile.in
+++ b/examples/dispatcher/Makefile.in
@@ -253,6 +253,7 @@ LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/examples/python/Makefile.in b/examples/python/Makefile.in
index d94a2675..c047d1a1 100644
--- a/examples/python/Makefile.in
+++ b/examples/python/Makefile.in
@@ -313,6 +313,7 @@ LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/examples/python/dbus/Makefile.in b/examples/python/dbus/Makefile.in
index 784997e1..023e52d8 100644
--- a/examples/python/dbus/Makefile.in
+++ b/examples/python/dbus/Makefile.in
@@ -253,6 +253,7 @@ LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/examples/python/gi/Makefile.in b/examples/python/gi/Makefile.in
index 18e395e9..21384364 100644
--- a/examples/python/gi/Makefile.in
+++ b/examples/python/gi/Makefile.in
@@ -253,6 +253,7 @@ LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/examples/python/gi/add_connection.py b/examples/python/gi/add_connection.py
index bb1163db..492d66d1 100755
--- a/examples/python/gi/add_connection.py
+++ b/examples/python/gi/add_connection.py
@@ -29,6 +29,8 @@
 # https://developer.gnome.org/NetworkManager/1.0/ref-settings.html
 #
 
+import gi
+gi.require_version('NM', '1.0')
 from gi.repository import GLib, NM
 import sys, uuid
 
diff --git a/examples/python/gi/device-state-ip4config.py b/examples/python/gi/device-state-ip4config.py
index 1a6f7dec..2a4a6221 100755
--- a/examples/python/gi/device-state-ip4config.py
+++ b/examples/python/gi/device-state-ip4config.py
@@ -21,6 +21,8 @@
 #
 
 import sys
+import gi
+gi.require_version('NM', '1.0')
 from gi.repository import GLib, NM
 
 #
diff --git a/examples/python/gi/firewall-zone.py b/examples/python/gi/firewall-zone.py
index ed9e5910..a56760ae 100755
--- a/examples/python/gi/firewall-zone.py
+++ b/examples/python/gi/firewall-zone.py
@@ -20,6 +20,8 @@
 #
 
 import sys
+import gi
+gi.require_version('NM', '1.0')
 from gi.repository import GLib, NM
 
 #
diff --git a/examples/python/gi/get-active-connections.py b/examples/python/gi/get-active-connections.py
index 55ba2d81..22c9eb4a 100755
--- a/examples/python/gi/get-active-connections.py
+++ b/examples/python/gi/get-active-connections.py
@@ -21,6 +21,8 @@
 
 # This example lists currently active connections
 
+import gi
+gi.require_version('NM', '1.0')
 from gi.repository import GLib, NM
 
 if __name__ == "__main__":
diff --git a/examples/python/gi/get_ips.py b/examples/python/gi/get_ips.py
index 690bd6ef..77e1d171 100755
--- a/examples/python/gi/get_ips.py
+++ b/examples/python/gi/get_ips.py
@@ -21,6 +21,8 @@
 #
 
 import sys, socket
+import gi
+gi.require_version('NM', '1.0')
 from gi.repository import GLib, NM
 
 #
diff --git a/examples/python/gi/list-connections.py b/examples/python/gi/list-connections.py
index 34b559fc..32ea70f5 100755
--- a/examples/python/gi/list-connections.py
+++ b/examples/python/gi/list-connections.py
@@ -20,6 +20,8 @@
 # Copyright 2012 - 2014 Red Hat, Inc.
 #
 
+import gi
+gi.require_version('NM', '1.0')
 from gi.repository import NM
 
 # This example asks settings service for all configured connections.
diff --git a/examples/python/gi/show-wifi-networks.py b/examples/python/gi/show-wifi-networks.py
index 7f3bd2db..a8bfbbfe 100755
--- a/examples/python/gi/show-wifi-networks.py
+++ b/examples/python/gi/show-wifi-networks.py
@@ -21,6 +21,8 @@
 #
 
 import locale
+import gi
+gi.require_version('NM', '1.0')
 from gi.repository import NM
 
 #
diff --git a/examples/python/gi/update-ip4-method.py b/examples/python/gi/update-ip4-method.py
index 983578cf..5e058031 100755
--- a/examples/python/gi/update-ip4-method.py
+++ b/examples/python/gi/update-ip4-method.py
@@ -27,6 +27,8 @@
 # https://developer.gnome.org/NetworkManager/1.0/ref-settings.html
 #
 
+import gi
+gi.require_version('NM', '1.0')
 from gi.repository import GLib, NM
 import sys, socket
 
diff --git a/examples/ruby/Makefile.in b/examples/ruby/Makefile.in
index b3960334..e314d036 100644
--- a/examples/ruby/Makefile.in
+++ b/examples/ruby/Makefile.in
@@ -253,6 +253,7 @@ LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
diff --git a/examples/shell/Makefile.in b/examples/shell/Makefile.in
index d22c113e..223d68aa 100644
--- a/examples/shell/Makefile.in
+++ b/examples/shell/Makefile.in
@@ -253,6 +253,7 @@ LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@