c3173c2c6d
- Use modem-manager for better 3G modem support - Integrated system settings with NetworkManager itself - Use udev instead of HAL
127 lines
6.1 KiB
Diff
127 lines
6.1 KiB
Diff
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac
|
|
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix 2009-04-04 18:03:25.000000000 -0400
|
|
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac 2009-04-05 08:31:12.000000000 -0400
|
|
@@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
|
|
PKG_CHECK_MODULES(NMA,
|
|
[dbus-glib-1 >= 0.74
|
|
glib-2.0 >= 2.10
|
|
- NetworkManager >= 0.7.1
|
|
- libnm_glib >= 0.7.1
|
|
- libnm-util >= 0.7.1
|
|
- libnm_glib_vpn >= 0.7.1
|
|
gtk+-2.0 >= 2.14
|
|
libglade-2.0
|
|
gmodule-export-2.0
|
|
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am
|
|
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix 2009-04-03 09:30:25.000000000 -0400
|
|
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am 2009-04-05 08:31:12.000000000 -0400
|
|
@@ -1,5 +1,9 @@
|
|
bin_PROGRAMS = nm-connection-editor
|
|
|
|
+INCLUDES = -I${top_srcdir}/../include \
|
|
+ -I${top_srcdir}/../libnm-util \
|
|
+ -I${top_srcdir}/../libnm-glib
|
|
+
|
|
nm_connection_editor_CPPFLAGS = \
|
|
$(NMA_CFLAGS) \
|
|
-DICONDIR=\""$(datadir)/icons"\" \
|
|
@@ -70,7 +74,10 @@ nm_connection_editor_LDADD = \
|
|
${top_builddir}/src/utils/libutils.la \
|
|
${top_builddir}/src/marshallers/libmarshallers.la \
|
|
$(NMA_LIBS) \
|
|
- $(POLKIT_LIBS)
|
|
+ $(POLKIT_LIBS) \
|
|
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \
|
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la
|
|
|
|
if NO_POLKIT_GNOME
|
|
nm_connection_editor_LDADD += \
|
|
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am
|
|
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix 2008-11-26 20:37:43.000000000 -0500
|
|
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am 2009-04-05 08:31:12.000000000 -0400
|
|
@@ -1,3 +1,7 @@
|
|
+INCLUDES = -I${top_srcdir}/../include \
|
|
+ -I${top_srcdir}/../libnm-util \
|
|
+ -I${top_srcdir}/../libnm-glib
|
|
+
|
|
noinst_LTLIBRARIES = libgconf-helpers.la
|
|
|
|
libgconf_helpers_la_SOURCES = \
|
|
@@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \
|
|
libgconf_helpers_la_LIBADD = \
|
|
$(NMA_LIBS) \
|
|
${top_builddir}/src/marshallers/libmarshallers.la \
|
|
- ${top_builddir}/src/utils/libutils.la
|
|
+ ${top_builddir}/src/utils/libutils.la \
|
|
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
|
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am
|
|
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500
|
|
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am 2009-04-05 08:31:12.000000000 -0400
|
|
@@ -4,6 +4,10 @@ NULL=
|
|
|
|
bin_PROGRAMS = nm-applet
|
|
|
|
+INCLUDES = -I${top_srcdir}/../include \
|
|
+ -I${top_srcdir}/../libnm-util \
|
|
+ -I${top_srcdir}/../libnm-glib
|
|
+
|
|
nm_applet_CPPFLAGS = \
|
|
$(NMA_CFLAGS) \
|
|
$(NOTIFY_CFLAGS) \
|
|
@@ -57,7 +61,9 @@ nm_applet_LDADD = \
|
|
${top_builddir}/src/marshallers/libmarshallers.la \
|
|
${top_builddir}/src/utils/libutils.la \
|
|
${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
|
- ${top_builddir}/src/wireless-security/libwireless-security.la
|
|
+ ${top_builddir}/src/wireless-security/libwireless-security.la \
|
|
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|
|
gladedir = $(datadir)/nm-applet
|
|
glade_DATA = applet.glade keyring.png
|
|
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am
|
|
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500
|
|
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am 2009-04-05 08:31:12.000000000 -0400
|
|
@@ -1,3 +1,7 @@
|
|
+INCLUDES = -I${top_srcdir}/../include \
|
|
+ -I${top_srcdir}/../libnm-util \
|
|
+ -I${top_srcdir}/../libnm-glib
|
|
+
|
|
noinst_LTLIBRARIES = libutils.la
|
|
|
|
libutils_la_SOURCES = \
|
|
@@ -11,4 +15,7 @@ libutils_la_CPPFLAGS = \
|
|
-I${top_srcdir}/src/gconf-helpers \
|
|
-I${top_srcdir}/src
|
|
|
|
-libutils_la_LIBADD = $(NMA_LIBS)
|
|
+libutils_la_LIBADD = $(NMA_LIBS) \
|
|
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
+
|
|
diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am
|
|
--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix 2009-04-04 11:33:58.000000000 -0400
|
|
+++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am 2009-04-05 08:31:12.000000000 -0400
|
|
@@ -1,5 +1,9 @@
|
|
noinst_LTLIBRARIES = libwireless-security.la
|
|
|
|
+INCLUDES = -I${top_srcdir}/../include \
|
|
+ -I${top_srcdir}/../libnm-util \
|
|
+ -I${top_srcdir}/../libnm-glib
|
|
+
|
|
libwireless_security_la_SOURCES = \
|
|
wireless-security.h \
|
|
wireless-security.c \
|
|
@@ -38,5 +42,7 @@ libwireless_security_la_CPPFLAGS = \
|
|
libwireless_security_la_LIBADD = \
|
|
$(NMA_LIBS) \
|
|
${top_builddir}/src/utils/libutils.la \
|
|
- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la
|
|
+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
|
|
+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
|
|
+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
|
|
|