Re: networkmanager-vpnc without gnome

[Helmut Schaa <hschaa suse de>]

Hi,

Am Freitag, 2. Februar 2007 14:24 schrieb Thorsten Kolb:
> is it possible to install/compile networkmanager-vpnc without gnome linke
> you can do it with the NetworkManager "basepackage"? It asks me for
> libgnomeui everyime I try to compile it.
> I use NetworkManager with knetworkmanager under kde, so I do not want to
> install the gnome-dependencies.

Since KNetworkManager now supports native plugins the gnome applets for the 
VPN services are not required anymore when using KDE. I've attached a patch 
which adds a configure flag "--without-gnome" to disable building the applet. 
The first patch applies cleanly against trunk, the second against stable.

Dan, can you have a look at it?

Regards
Helmut

Index: vpn-daemons/pptp/configure.in
===================================================================
--- vpn-daemons/pptp/configure.in	(Revision 2289)
+++ vpn-daemons/pptp/configure.in	(Arbeitskopie)
@@ -35,6 +35,12 @@
 AC_FUNC_MEMCMP
 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)
+
 ALL_LINGUAS="da sv"
 AC_SUBST(ALL_LINGUAS)
 
@@ -48,12 +54,15 @@
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
 PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.30)
 PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1)
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
-PKG_CHECK_MODULES(GLADE, libglade-2.0)
-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
-PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
 
+if test x"$with_gnome" != xno; then
+	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+	PKG_CHECK_MODULES(GLADE, libglade-2.0)
+	PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
+	PKG_CHECK_MODULES(GCONF, gconf-2.0)
+	PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
+fi
+
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(DATADIR, $datadir)
Index: vpn-daemons/pptp/Makefile.am
===================================================================
--- vpn-daemons/pptp/Makefile.am	(Revision 2289)
+++ vpn-daemons/pptp/Makefile.am	(Arbeitskopie)
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
 
+if WITH_GNOME
 SUBDIRS = src auth-dialog properties po
+else
+SUBDIRS = src
+endif
 
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
 dbusservice_DATA = nm-pptp-service.conf
@@ -8,6 +12,7 @@
 nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
 nmvpnservice_DATA = nm-pptp-service.name
 
+if WITH_GNOME
 desktopdir = $(datadir)/applications
 desktop_in_files = nm-pptp.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -15,6 +20,7 @@
 
 icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = gnome-mime-application-x-pptp-settings.png
+endif
 
 EXTRA_DIST = $(nmvpnservice_DATA) \
              $(dbusservice_DATA)  \
Index: vpn-daemons/openvpn/configure.in
===================================================================
--- vpn-daemons/openvpn/configure.in	(Revision 2289)
+++ vpn-daemons/openvpn/configure.in	(Arbeitskopie)
@@ -38,6 +38,12 @@
 ALL_LINGUAS="cs da de es fi fr hu it ja pl pt_BR sv vi zh_CN zh_TW"
 AC_SUBST(ALL_LINGUAS)
 
+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
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
@@ -48,12 +54,15 @@
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
 PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.30)
 PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1)
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
-PKG_CHECK_MODULES(GLADE, libglade-2.0)
-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
-PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
 
+if test x"$with_gnome" != xno; then
+	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+	PKG_CHECK_MODULES(GLADE, libglade-2.0)
+	PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
+	PKG_CHECK_MODULES(GCONF, gconf-2.0)
+	PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
+fi
+
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(DATADIR, $datadir)
Index: vpn-daemons/openvpn/Makefile.am
===================================================================
--- vpn-daemons/openvpn/Makefile.am	(Revision 2289)
+++ vpn-daemons/openvpn/Makefile.am	(Arbeitskopie)
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
 
+if WITH_GNOME
 SUBDIRS = src auth-dialog properties po
+else
+SUBDIRS = src
+endif
 
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
 dbusservice_DATA = nm-openvpn-service.conf
@@ -8,6 +12,7 @@
 nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
 nmvpnservice_DATA = nm-openvpn-service.name
 
+if WITH_GNOME
 desktopdir = $(datadir)/applications
 desktop_in_files = nm-openvpn.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -15,6 +20,7 @@
 
 icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = gnome-mime-application-x-openvpn-settings.png
+endif
 
 EXTRA_DIST = $(nmvpnservice_DATA) \
              $(dbusservice_DATA)  \
Index: vpn-daemons/vpnc/configure.in
===================================================================
--- vpn-daemons/vpnc/configure.in	(Revision 2289)
+++ vpn-daemons/vpnc/configure.in	(Arbeitskopie)
@@ -38,6 +38,12 @@
 ALL_LINGUAS="cs da de es fi fr hu it ja pl pt_BR sv zh_CN zh_TW"
 AC_SUBST(ALL_LINGUAS)
 
+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
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
@@ -48,12 +54,15 @@
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
 PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.30)
 PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1)
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
-PKG_CHECK_MODULES(GLADE, libglade-2.0)
-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
-PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
 
+if test x"$with_gnome" != xno; then
+	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+	PKG_CHECK_MODULES(GLADE, libglade-2.0)
+	PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
+	PKG_CHECK_MODULES(GCONF, gconf-2.0)
+	PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
+fi
+
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(DATADIR, $datadir)
Index: vpn-daemons/vpnc/Makefile.am
===================================================================
--- vpn-daemons/vpnc/Makefile.am	(Revision 2289)
+++ vpn-daemons/vpnc/Makefile.am	(Arbeitskopie)
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
 
+if WITH_GNOME
 SUBDIRS = src auth-dialog properties po
+else
+SUBDIRS = src
+endif
 
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
 dbusservice_DATA = nm-vpnc-service.conf
@@ -8,6 +12,7 @@
 nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
 nmvpnservice_DATA = nm-vpnc-service.name
 
+if WITH_GNOME
 desktopdir = $(datadir)/applications
 desktop_in_files = nm-vpnc.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -15,6 +20,7 @@
 
 icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png
+endif
 
 EXTRA_DIST = $(nmvpnservice_DATA) \
              $(dbusservice_DATA)  \

Index: vpn-daemons/pptp/configure.in
===================================================================
--- vpn-daemons/pptp/configure.in	(Revision 2289)
+++ vpn-daemons/pptp/configure.in	(Arbeitskopie)
@@ -91,6 +91,12 @@
 AC_FUNC_MEMCMP
 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
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
@@ -110,31 +116,32 @@
 AC_SUBST(NETWORK_MANAGER_CFLAGS)
 AC_SUBST(NETWORK_MANAGER_LIBS)
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
+if test x"$with_gnome" != xno; then
+	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+	AC_SUBST(GTK_CFLAGS)
+	AC_SUBST(GTK_LIBS)
 
-PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
-AC_SUBST(GDK_PIXBUF_CFLAGS)
-AC_SUBST(GDK_PIXBUF_LIBS)
+	PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
+	AC_SUBST(GDK_PIXBUF_CFLAGS)
+	AC_SUBST(GDK_PIXBUF_LIBS)
 
-PKG_CHECK_MODULES(GLADE, libglade-2.0)
-AC_SUBST(GLADE_CFLAGS)
-AC_SUBST(GLADE_LIBS)
+	PKG_CHECK_MODULES(GLADE, libglade-2.0)
+	AC_SUBST(GLADE_CFLAGS)
+	AC_SUBST(GLADE_LIBS)
 
-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
-AC_SUBST(LIBGNOMEUI_CFLAGS)
-AC_SUBST(LIBGNOMEUI_LIBS)
+	PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
+	AC_SUBST(LIBGNOMEUI_CFLAGS)
+	AC_SUBST(LIBGNOMEUI_LIBS)
 
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
+	PKG_CHECK_MODULES(GCONF, gconf-2.0)
+	AC_SUBST(GCONF_CFLAGS)
+	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(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(DATADIR, $datadir)
Index: vpn-daemons/pptp/Makefile.am
===================================================================
--- vpn-daemons/pptp/Makefile.am	(Revision 2289)
+++ vpn-daemons/pptp/Makefile.am	(Arbeitskopie)
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
 
+if WITH_GNOME
 SUBDIRS = src auth-dialog auth-dialog-general properties po
+else
+SUBDIRS = src
+endif
 
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
 dbusservice_DATA = nm-ppp-starter.conf
@@ -8,6 +12,7 @@
 nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
 nmvpnservice_DATA = nm-ppp-starter.name
 
+if WITH_GNOME
 desktopdir = $(datadir)/applications
 desktop_in_files = nm-ppp.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -15,6 +20,7 @@
 
 icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = gnome-mime-application-x-pptp-settings.png
+endif
 
 EXTRA_DIST = $(nmvpnservice_DATA) \
              $(dbusservice_DATA)  \
Index: vpn-daemons/openvpn/configure.in
===================================================================
--- vpn-daemons/openvpn/configure.in	(Revision 2289)
+++ vpn-daemons/openvpn/configure.in	(Arbeitskopie)
@@ -35,6 +35,12 @@
 AC_FUNC_MEMCMP
 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
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
@@ -54,29 +60,31 @@
 AC_SUBST(NETWORK_MANAGER_CFLAGS)
 AC_SUBST(NETWORK_MANAGER_LIBS)
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
+if test x"$with_gnome" != xno; then
+	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+	AC_SUBST(GTK_CFLAGS)
+	AC_SUBST(GTK_LIBS)
 
-PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
-AC_SUBST(GDK_PIXBUF_CFLAGS)
-AC_SUBST(GDK_PIXBUF_LIBS)
+	PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
+	AC_SUBST(GDK_PIXBUF_CFLAGS)
+	AC_SUBST(GDK_PIXBUF_LIBS)
 
-PKG_CHECK_MODULES(GLADE, libglade-2.0)
-AC_SUBST(GLADE_CFLAGS)
-AC_SUBST(GLADE_LIBS)
+	PKG_CHECK_MODULES(GLADE, libglade-2.0)
+	AC_SUBST(GLADE_CFLAGS)
+	AC_SUBST(GLADE_LIBS)
 
-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
-AC_SUBST(LIBGNOMEUI_CFLAGS)
-AC_SUBST(LIBGNOMEUI_LIBS)
+	PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
+	AC_SUBST(LIBGNOMEUI_CFLAGS)
+	AC_SUBST(LIBGNOMEUI_LIBS)
 
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
+	PKG_CHECK_MODULES(GCONF, gconf-2.0)
+	AC_SUBST(GCONF_CFLAGS)
+	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(SYSCONFDIR, $sysconfdir)
Index: vpn-daemons/openvpn/Makefile.am
===================================================================
--- vpn-daemons/openvpn/Makefile.am	(Revision 2289)
+++ vpn-daemons/openvpn/Makefile.am	(Arbeitskopie)
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
 
+if WITH_GNOME
 SUBDIRS = src auth-dialog properties po
+else
+SUBDIRS = src
+endif
 
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
 dbusservice_DATA = nm-openvpn-service.conf
@@ -8,6 +12,7 @@
 nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
 nmvpnservice_DATA = nm-openvpn-service.name
 
+if WITH_GNOME
 desktopdir = $(datadir)/applications
 desktop_in_files = nm-openvpn.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -15,6 +20,7 @@
 
 icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = gnome-mime-application-x-openvpn-settings.png
+endif
 
 EXTRA_DIST = $(nmvpnservice_DATA) \
              $(dbusservice_DATA)  \
Index: vpn-daemons/vpnc/configure.in
===================================================================
--- vpn-daemons/vpnc/configure.in	(Revision 2289)
+++ vpn-daemons/vpnc/configure.in	(Arbeitskopie)
@@ -35,6 +35,12 @@
 AC_FUNC_MEMCMP
 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
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
@@ -53,29 +59,31 @@
 PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1)
 AC_SUBST(NETWORK_MANAGER_CFLAGS)
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
+if test x"$with_gnome" != xno; then
+	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+	AC_SUBST(GTK_CFLAGS)
+	AC_SUBST(GTK_LIBS)
 
-PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
-AC_SUBST(GDK_PIXBUF_CFLAGS)
-AC_SUBST(GDK_PIXBUF_LIBS)
+	PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
+	AC_SUBST(GDK_PIXBUF_CFLAGS)
+	AC_SUBST(GDK_PIXBUF_LIBS)
 
-PKG_CHECK_MODULES(GLADE, libglade-2.0)
-AC_SUBST(GLADE_CFLAGS)
-AC_SUBST(GLADE_LIBS)
+	PKG_CHECK_MODULES(GLADE, libglade-2.0)
+	AC_SUBST(GLADE_CFLAGS)
+	AC_SUBST(GLADE_LIBS)
 
-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
-AC_SUBST(LIBGNOMEUI_CFLAGS)
-AC_SUBST(LIBGNOMEUI_LIBS)
+	PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
+	AC_SUBST(LIBGNOMEUI_CFLAGS)
+	AC_SUBST(LIBGNOMEUI_LIBS)
 
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
+	PKG_CHECK_MODULES(GCONF, gconf-2.0)
+	AC_SUBST(GCONF_CFLAGS)
+	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
 
 AC_CHECK_LIB(nm-util, nmu_dbus_dict_append_string_array)
 PKG_CHECK_MODULES(NM_UTILS, NetworkManager)
Index: vpn-daemons/vpnc/Makefile.am
===================================================================
--- vpn-daemons/vpnc/Makefile.am	(Revision 2289)
+++ vpn-daemons/vpnc/Makefile.am	(Arbeitskopie)
@@ -1,6 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
 
+if WITH_GNOME
 SUBDIRS = src auth-dialog properties po
+else
+SUBDIRS = src
+endif
 
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
 dbusservice_DATA = nm-vpnc-service.conf
@@ -8,6 +12,7 @@
 nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
 nmvpnservice_DATA = nm-vpnc-service.name
 
+if WITH_GNOME
 desktopdir = $(datadir)/applications
 desktop_in_files = nm-vpnc.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -15,6 +20,7 @@
 
 icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png
+endif
 
 EXTRA_DIST = $(nmvpnservice_DATA) \
              $(dbusservice_DATA)  \