fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-14 17:10:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-12-04 Dan Williams <dcbw@redhat.com>

Browse source 
Patch from Michael Biebl <biebl@debian.org>

	* system-settings/plugins/ifcfg/Makefile.am
	  system-settings/src/main.c
	  system-settings/src/Makefile.am
		- Put system settings plugins in NM plugins dir

	* src/ppp-manager/Makefile.am
	  src/ppp-manager/nm-ppp-manager.c
		- Move pppd plugin to NM plugins dir



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3131 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-12-04 16:17:57 +00:00
parent 219c552de8
commit f56f5ef9f4
6 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2007-12-04 Dan Williams <dcbw@redhat.com>
Patch from Michael Biebl <biebl@debian.org>
* system-settings/plugins/ifcfg/Makefile.am
system-settings/src/main.c
system-settings/src/Makefile.am
- Put system settings plugins in NM plugins dir
* src/ppp-manager/Makefile.am
src/ppp-manager/nm-ppp-manager.c
- Move pppd plugin to NM plugins dir
2007-12-04 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-vpn-properties.h

5
src/ppp-manager/Makefile.am
View file

@ -17,14 +17,15 @@ libppp_manager_la_CPPFLAGS = \
$(HAL_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBDIR=\"$(libdir)\"
-DLIBDIR=\"$(libdir)\" \
-DPLUGINDIR=\"$(pkglibdir)\"
libppp_manager_la_LIBADD = \
$(DBUS_LIBS) \
$(GLIB_LIBS) \
$(top_builddir)/src/marshallers/libmarshallers.la
lib_LTLIBRARIES = nm-pppd-plugin.la
pkglib_LTLIBRARIES = nm-pppd-plugin.la
nm_pppd_plugin_la_SOURCES = \
nm-pppd-plugin.c \

2
src/ppp-manager/nm-ppp-manager.c
View file

@ -11,7 +11,7 @@
#include "nm-utils.h"
#include "nm-marshal.h"
#define NM_PPPD_PLUGIN LIBDIR "/nm-pppd-plugin.so"
#define NM_PPPD_PLUGIN PLUGINDIR "/nm-pppd-plugin.so"
#define NM_PPP_WAIT_PPPD 10000 /* 10 seconds */
typedef struct {

3
system-settings/plugins/ifcfg/Makefile.am
View file

@ -1,5 +1,5 @@
lib_LTLIBRARIES = libnm-settings-plugin-ifcfg.la
pkglib_LTLIBRARIES = libnm-settings-plugin-ifcfg.la
libnm_settings_plugin_ifcfg_la_SOURCES = \
shvar.c \
@ -19,6 +19,7 @@ libnm_settings_plugin_ifcfg_la_CPPFLAGS = \
-I$(top_srcdir)/libnm-util \
-DSYSCONFDIR=\"$(sysconfdir)\"
libnm_settings_plugin_ifcfg_la_LDFLAGS = -module -avoid-version
libnm_settings_plugin_ifcfg_la_LIBADD = \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \

23
system-settings/src/Makefile.am
View file

@ -13,18 +13,19 @@ nm_system_settings_SOURCES = \
nm-system-config-interface.h
nm_system_settings_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(GMODULE_CFLAGS) \
-DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \
-DSBINDIR=\"$(sbindir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DDATADIR=\"$(datadir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
-DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \
-DSBINDIR=\"$(sbindir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DDATADIR=\"$(datadir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DPLUGINDIR=\"$(pkglibdir)\"
nm_system_settings_LDADD = \
$(DBUS_LIBS) \

2
system-settings/src/main.c
View file

@ -149,7 +149,7 @@ load_plugins (Application *app, const char *plugins, GError **error)
continue;
full_name = g_strdup_printf ("nm-settings-plugin-%s", *pname);
path = g_module_build_path (NULL, full_name);
path = g_module_build_path (PLUGINDIR, full_name);
plugin = g_module_open (path, G_MODULE_BIND_LOCAL);
if (!plugin) {