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

2007-08-15 Tambet Ingo <tambet@gmail.com>

Browse source 
* nm-vpnc-service.name.in: Use upper-case macro names as that's
        * what the
        sed script from Makefile is trying to replace.

        * src/Makefile.am: Link to $NM_UTILS_LIBS.

        * configure.in: Update required NetworkManager version to 0.7.0.
        Clean up the double-check to NetworkManager.pc.



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2693 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo 2007-08-15 12:01:05 +00:00
parent 2c2b1490c0
commit fc433a76a5
5 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
vpn-daemons/vpnc/ChangeLog
View file

@ -1,3 +1,13 @@
2007-08-15 Tambet Ingo <tambet@gmail.com>
* nm-vpnc-service.name.in: Use upper-case macro names as that's what the
sed script from Makefile is trying to replace.
* src/Makefile.am: Link to $NM_UTILS_LIBS.
* configure.in: Update required NetworkManager version to 0.7.0.
Clean up the double-check to NetworkManager.pc.
2007-08-14 Dan Williams <dcbw@redhat.com>
* src/nm-openvpn-service.c

6
vpn-daemons/vpnc/configure.in
View file

@ -56,9 +56,6 @@ 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)
AC_SUBST(NETWORK_MANAGER_CFLAGS)
if test x"$with_gnome" != xno; then
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
AC_SUBST(GTK_CFLAGS)
@ -85,8 +82,7 @@ if test x"$with_gnome" != xno; then
AC_SUBST(GNOMEKEYRING_LIBS)
fi
AC_CHECK_LIB(nm-util, nmu_dbus_dict_append_string_array)
PKG_CHECK_MODULES(NM_UTILS, NetworkManager)
PKG_CHECK_MODULES(NM_UTILS, NetworkManager >= 0.7.0 libnm-util)
AC_SUBST(NM_UTILS_CFLAGS)
AC_SUBST(NM_UTILS_LIBS)

6
vpn-daemons/vpnc/nm-vpnc-service.name.in
View file

@ -1,8 +1,8 @@
[VPN Connection]
name=vpnc
service=org.freedesktop.NetworkManager.vpnc
program=@bindir@/nm-vpnc-service
program=@BINDIR@/nm-vpnc-service
[GNOME]
auth-dialog=@libexecdir@/nm-vpnc-auth-dialog
properties=@prefix@/${LIB}/libnm-vpnc-properties
auth-dialog=@LIBEXECDIR@/nm-vpnc-auth-dialog
properties=@LIBDIR@/libnm-vpnc-properties

2
vpn-daemons/vpnc/properties/Makefile.am
View file

@ -15,7 +15,7 @@ libnm_vpnc_properties_la_CFLAGS = \
$(GTK_CFLAGS) \
$(GCONF_CFLAGS) \
$(LIBGNOMEUI_CFLAGS) \
$(NETWORK_MANAGER_CFLAGS) \
$(NM_UTILS_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DG_DISABLE_DEPRECATED \

6
vpn-daemons/vpnc/src/Makefile.am
View file

@ -3,8 +3,7 @@ INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/vpn-daemons/vpn
AM_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(NETWORK_MANAGER_CFLAGS) \
$(NM_UTILS_CFLAGS) \
$(NM_UTILS_CFLAGS) \
-Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \
@ -28,7 +27,8 @@ nm_vpnc_service_SOURCES = \
nm_vpnc_service_LDADD = \
$(DBUS_LIBS) \
$(GTHREAD_LIBS)
$(GTHREAD_LIBS) \
$(NM_UTILS_LIBS)
nm_vpnc_service_vpnc_helper_SOURCES = \