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

2007-06-11 Christopher Aillon <caillon@redhat.com>

Browse source 
Patch from Christian Persch <chpe@gnome.org>

	* configure.in:
	* Makefile.am:
	Add a dependency on libnm-util and also removes the expansion of paths
	from configure which is disrecommended by automake. (446330)


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2589 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Christopher Aillon 2007-06-12 03:07:16 +00:00 • committed by Chris Aillon
parent 9caa66c446
commit 1486250e42
3 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
vpn-daemons/pptp/ChangeLog
View file

@ -1,3 +1,12 @@
2007-06-11 Christopher Aillon <caillon@redhat.com>
Patch from Christian Persch <chpe@gnome.org>
* configure.in:
* Makefile.am:
Add a dependency on libnm-util and also removes the expansion of paths
from configure which is disrecommended by automake. (446330)
2007-06-11 Christian Persch <chpe@gnome.org>
* properties/nm-ppp-dialog.glade: HIGify. Bug #383034.

25
vpn-daemons/pptp/Makefile.am
View file

@ -9,8 +9,14 @@ endif
dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-ppp-starter.conf
nmvpnservice_in_files = nm-ppp-starter.name.in
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-ppp-starter.name
nmvpnservice_DATA = $(nmvpnservice_in_files:.name.in=.name)
%.name: %.name.in Makefile
@sed -e "s|%bindir%|$(bindir)|g" \
-e "s|%libdir%|$(libdir)|g" \
-e "s|%libexecdir%|$(libexecdir)|g" $< > $@
if WITH_GNOME
desktopdir = $(datadir)/applications
@ -22,13 +28,14 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
icon_DATA = gnome-mime-application-x-pptp-settings.png
endif
EXTRA_DIST = $(nmvpnservice_DATA) \
$(dbusservice_DATA) \
$(desktop_in_files) \
$(icon_DATA) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
EXTRA_DIST =\
$(nmvpnservice_in_files) \
$(dbusservice_DATA) \
$(desktop_in_files) \
$(icon_DATA) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
CLEANFILES = $(desktop_DATA) *~
CLEANFILES = $(desktop_DATA) $(nmvpnservice_DATA) *~
DISTCLEANFILES = intltool-extract intltool-merge intltool-update

12
vpn-daemons/pptp/configure.in
View file

@ -3,7 +3,6 @@ AC_PREREQ(2.52)
AC_INIT(NetworkManager-ppp_vpn, 0.7.0-beta, eemynotna@gmail.com, NetworkManager-ppp_vpn)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([subdir-objects])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
@ -112,7 +111,7 @@ PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.30)
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1)
PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1 libnm-util >= 0.7.0)
AC_SUBST(NETWORK_MANAGER_CFLAGS)
AC_SUBST(NETWORK_MANAGER_LIBS)
@ -142,14 +141,6 @@ if test x"$with_gnome" != xno; then
AC_SUBST(GNOMEKEYRING_LIBS)
fi
AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
AS_AC_EXPAND(DATADIR, $datadir)
AS_AC_EXPAND(BINDIR, $bindir)
AS_AC_EXPAND(SBINDIR, $sbindir)
AS_AC_EXPAND(LIBDIR, $libdir)
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
AC_ARG_ENABLE(nm-vpn-dbus-old,
AC_HELP_STRING([ --enable-nm-vpn-dbus-old], [Build Plugin to use old non-'DBUS Dict' NetworkManager VPN interface [default=no]]),
enable_nm_vpn_dbus_old="$enableval", enable_nm_vpn_dbus_old=no)
@ -203,5 +194,4 @@ auth-dialog/Makefile
auth-dialog-general/Makefile
properties/Makefile
po/Makefile.in
nm-ppp-starter.name
])