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

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

Browse source 
Patch from Helmut Schaa <hschaa@suse.de>

	* vpn-daemons/pptp/configure.in
	  vpn-daemons/pptp/Makefile.am
	  vpn-daemons/openvpn/configure.in
	  vpn-daemons/openvpn/Makefile.am
	  vpn-daemons/vpnc/configure.in
	  vpn-daemons/vpnc/Makefile.am
		- Add --without-gnome switch which disables building gnome bits




git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2316 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-02-13 02:50:10 +00:00
parent 7eeefaea40
commit 9a2e7384dd
7 changed files with 108 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2007-02-12 Dan Williams <dcbw@redhat.com>
Patch from Helmut Schaa <hschaa@suse.de>
* vpn-daemons/pptp/configure.in
vpn-daemons/pptp/Makefile.am
vpn-daemons/openvpn/configure.in
vpn-daemons/openvpn/Makefile.am
vpn-daemons/vpnc/configure.in
vpn-daemons/vpnc/Makefile.am
- Add --without-gnome switch which disables building gnome bits
2007-02-12 Tambet Ingo <tambet@ximian.com> 2007-02-12 Tambet Ingo <tambet@ximian.com>
* libnm-glib/nm-device.c (nm_device_get_use_dhcp): Remove. * libnm-glib/nm-device.c (nm_device_get_use_dhcp): Remove.

6
vpn-daemons/openvpn/Makefile.am
View file

@ -1,6 +1,10 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
if WITH_GNOME
SUBDIRS = src auth-dialog properties po SUBDIRS = src auth-dialog properties po
else
SUBDIRS = src
endif
dbusservicedir = $(sysconfdir)/dbus-1/system.d dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-openvpn-service.conf dbusservice_DATA = nm-openvpn-service.conf
@ -8,6 +12,7 @@ dbusservice_DATA = nm-openvpn-service.conf
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-openvpn-service.name nmvpnservice_DATA = nm-openvpn-service.name
if WITH_GNOME
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
desktop_in_files = nm-openvpn.desktop.in desktop_in_files = nm-openvpn.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@ -15,6 +20,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
icondir = $(datadir)/icons/hicolor/48x48/apps icondir = $(datadir)/icons/hicolor/48x48/apps
icon_DATA = gnome-mime-application-x-openvpn-settings.png icon_DATA = gnome-mime-application-x-openvpn-settings.png
endif
EXTRA_DIST = $(nmvpnservice_DATA) \ EXTRA_DIST = $(nmvpnservice_DATA) \
$(dbusservice_DATA) \ $(dbusservice_DATA) \

44
vpn-daemons/openvpn/configure.in
View file

@ -35,6 +35,12 @@ AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP AC_FUNC_MEMCMP
AC_CHECK_FUNCS(select socket uname) AC_CHECK_FUNCS(select socket uname)
dnl
dnl GNOME support
dnl
AC_ARG_WITH(gnome, AC_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]))
AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
GETTEXT_PACKAGE=NetworkManager-openvpn GETTEXT_PACKAGE=NetworkManager-openvpn
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
@ -54,29 +60,31 @@ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1)
AC_SUBST(NETWORK_MANAGER_CFLAGS) AC_SUBST(NETWORK_MANAGER_CFLAGS)
AC_SUBST(NETWORK_MANAGER_LIBS) AC_SUBST(NETWORK_MANAGER_LIBS)
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6) if test x"$with_gnome" != xno; then
AC_SUBST(GTK_CFLAGS) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
AC_SUBST(GTK_LIBS) AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0) PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
AC_SUBST(GDK_PIXBUF_CFLAGS) AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS) AC_SUBST(GDK_PIXBUF_LIBS)
PKG_CHECK_MODULES(GLADE, libglade-2.0) PKG_CHECK_MODULES(GLADE, libglade-2.0)
AC_SUBST(GLADE_CFLAGS) AC_SUBST(GLADE_CFLAGS)
AC_SUBST(GLADE_LIBS) AC_SUBST(GLADE_LIBS)
PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
AC_SUBST(LIBGNOMEUI_CFLAGS) AC_SUBST(LIBGNOMEUI_CFLAGS)
AC_SUBST(LIBGNOMEUI_LIBS) AC_SUBST(LIBGNOMEUI_LIBS)
PKG_CHECK_MODULES(GCONF, gconf-2.0) PKG_CHECK_MODULES(GCONF, gconf-2.0)
AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS) AC_SUBST(GCONF_LIBS)
PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1) PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
AC_SUBST(GNOMEKEYRING_CFLAGS) AC_SUBST(GNOMEKEYRING_CFLAGS)
AC_SUBST(GNOMEKEYRING_LIBS) AC_SUBST(GNOMEKEYRING_LIBS)
fi
AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir) AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)

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

@ -1,6 +1,10 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
if WITH_GNOME
SUBDIRS = src auth-dialog auth-dialog-general properties po SUBDIRS = src auth-dialog auth-dialog-general properties po
else
SUBDIRS = src
endif
dbusservicedir = $(sysconfdir)/dbus-1/system.d dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-ppp-starter.conf dbusservice_DATA = nm-ppp-starter.conf
@ -8,6 +12,7 @@ dbusservice_DATA = nm-ppp-starter.conf
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-ppp-starter.name nmvpnservice_DATA = nm-ppp-starter.name
if WITH_GNOME
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
desktop_in_files = nm-ppp.desktop.in desktop_in_files = nm-ppp.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@ -15,6 +20,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
icondir = $(datadir)/icons/hicolor/48x48/apps icondir = $(datadir)/icons/hicolor/48x48/apps
icon_DATA = gnome-mime-application-x-pptp-settings.png icon_DATA = gnome-mime-application-x-pptp-settings.png
endif
EXTRA_DIST = $(nmvpnservice_DATA) \ EXTRA_DIST = $(nmvpnservice_DATA) \
$(dbusservice_DATA) \ $(dbusservice_DATA) \

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

@ -91,6 +91,12 @@ AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP AC_FUNC_MEMCMP
AC_CHECK_FUNCS(select socket uname) AC_CHECK_FUNCS(select socket uname)
dnl
dnl GNOME support
dnl
AC_ARG_WITH(gnome, AC_HELP_STRING([--without-gnome], [Build NetworkManager-pptp without GNOME support, e.g. vpn service only]))
AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
GETTEXT_PACKAGE=NetworkManager-ppp_vpn GETTEXT_PACKAGE=NetworkManager-ppp_vpn
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
@ -110,30 +116,31 @@ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1)
AC_SUBST(NETWORK_MANAGER_CFLAGS) AC_SUBST(NETWORK_MANAGER_CFLAGS)
AC_SUBST(NETWORK_MANAGER_LIBS) AC_SUBST(NETWORK_MANAGER_LIBS)
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6) if test x"$with_gnome" != xno; then
AC_SUBST(GTK_CFLAGS) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
AC_SUBST(GTK_LIBS) AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0) PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
AC_SUBST(GDK_PIXBUF_CFLAGS) AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS) AC_SUBST(GDK_PIXBUF_LIBS)
PKG_CHECK_MODULES(GLADE, libglade-2.0) PKG_CHECK_MODULES(GLADE, libglade-2.0)
AC_SUBST(GLADE_CFLAGS) AC_SUBST(GLADE_CFLAGS)
AC_SUBST(GLADE_LIBS) AC_SUBST(GLADE_LIBS)
PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
AC_SUBST(LIBGNOMEUI_CFLAGS) AC_SUBST(LIBGNOMEUI_CFLAGS)
AC_SUBST(LIBGNOMEUI_LIBS) AC_SUBST(LIBGNOMEUI_LIBS)
PKG_CHECK_MODULES(GCONF, gconf-2.0) PKG_CHECK_MODULES(GCONF, gconf-2.0)
AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS) AC_SUBST(GCONF_LIBS)
PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
AC_SUBST(GNOMEKEYRING_CFLAGS)
AC_SUBST(GNOMEKEYRING_LIBS)
PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
AC_SUBST(GNOMEKEYRING_CFLAGS)
AC_SUBST(GNOMEKEYRING_LIBS)
fi
AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir) AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)

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

@ -1,6 +1,10 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
if WITH_GNOME
SUBDIRS = src auth-dialog properties po SUBDIRS = src auth-dialog properties po
else
SUBDIRS = src
endif
dbusservicedir = $(sysconfdir)/dbus-1/system.d dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-vpnc-service.conf dbusservice_DATA = nm-vpnc-service.conf
@ -8,6 +12,7 @@ dbusservice_DATA = nm-vpnc-service.conf
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservice_DATA = nm-vpnc-service.name nmvpnservice_DATA = nm-vpnc-service.name
if WITH_GNOME
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
desktop_in_files = nm-vpnc.desktop.in desktop_in_files = nm-vpnc.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@ -15,6 +20,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
icondir = $(datadir)/icons/hicolor/48x48/apps icondir = $(datadir)/icons/hicolor/48x48/apps
icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png
endif
EXTRA_DIST = $(nmvpnservice_DATA) \ EXTRA_DIST = $(nmvpnservice_DATA) \
$(dbusservice_DATA) \ $(dbusservice_DATA) \

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

@ -35,6 +35,12 @@ AC_PROG_GCC_TRADITIONAL
AC_FUNC_MEMCMP AC_FUNC_MEMCMP
AC_CHECK_FUNCS(select socket uname) AC_CHECK_FUNCS(select socket uname)
dnl
dnl GNOME support
dnl
AC_ARG_WITH(gnome, AC_HELP_STRING([--without-gnome], [Build NetworkManager-vpnc without GNOME support, e.g. vpn service only]))
AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
GETTEXT_PACKAGE=NetworkManager-vpnc GETTEXT_PACKAGE=NetworkManager-vpnc
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
@ -53,29 +59,31 @@ AC_SUBST(DBUS_LIBS)
PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1) PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1)
AC_SUBST(NETWORK_MANAGER_CFLAGS) AC_SUBST(NETWORK_MANAGER_CFLAGS)
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6) if test x"$with_gnome" != xno; then
AC_SUBST(GTK_CFLAGS) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
AC_SUBST(GTK_LIBS) AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0) PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
AC_SUBST(GDK_PIXBUF_CFLAGS) AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS) AC_SUBST(GDK_PIXBUF_LIBS)
PKG_CHECK_MODULES(GLADE, libglade-2.0) PKG_CHECK_MODULES(GLADE, libglade-2.0)
AC_SUBST(GLADE_CFLAGS) AC_SUBST(GLADE_CFLAGS)
AC_SUBST(GLADE_LIBS) AC_SUBST(GLADE_LIBS)
PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
AC_SUBST(LIBGNOMEUI_CFLAGS) AC_SUBST(LIBGNOMEUI_CFLAGS)
AC_SUBST(LIBGNOMEUI_LIBS) AC_SUBST(LIBGNOMEUI_LIBS)
PKG_CHECK_MODULES(GCONF, gconf-2.0) PKG_CHECK_MODULES(GCONF, gconf-2.0)
AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS) AC_SUBST(GCONF_LIBS)
PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1) PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
AC_SUBST(GNOMEKEYRING_CFLAGS) AC_SUBST(GNOMEKEYRING_CFLAGS)
AC_SUBST(GNOMEKEYRING_LIBS) AC_SUBST(GNOMEKEYRING_LIBS)
fi
AC_CHECK_LIB(nm-util, nmu_dbus_dict_append_string_array) AC_CHECK_LIB(nm-util, nmu_dbus_dict_append_string_array)
PKG_CHECK_MODULES(NM_UTILS, NetworkManager) PKG_CHECK_MODULES(NM_UTILS, NetworkManager)