diff --git a/ChangeLog b/ChangeLog index 4f19d0fb7c..920ef2f094 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-02-12 Dan Williams + + Patch from Helmut Schaa + + * 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 * libnm-glib/nm-device.c (nm_device_get_use_dhcp): Remove. diff --git a/vpn-daemons/openvpn/Makefile.am b/vpn-daemons/openvpn/Makefile.am index 13c0657208..08c0ce761f 100644 --- a/vpn-daemons/openvpn/Makefile.am +++ b/vpn-daemons/openvpn/Makefile.am @@ -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 @@ dbusservice_DATA = nm-openvpn-service.conf 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 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) icondir = $(datadir)/icons/hicolor/48x48/apps icon_DATA = gnome-mime-application-x-openvpn-settings.png +endif EXTRA_DIST = $(nmvpnservice_DATA) \ $(dbusservice_DATA) \ diff --git a/vpn-daemons/openvpn/configure.in b/vpn-daemons/openvpn/configure.in index 74e819a478..faf7401fb4 100644 --- a/vpn-daemons/openvpn/configure.in +++ b/vpn-daemons/openvpn/configure.in @@ -35,6 +35,12 @@ AC_PROG_GCC_TRADITIONAL 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 @@ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1) 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) diff --git a/vpn-daemons/pptp/Makefile.am b/vpn-daemons/pptp/Makefile.am index 0b18d82611..61f8dd0be4 100644 --- a/vpn-daemons/pptp/Makefile.am +++ b/vpn-daemons/pptp/Makefile.am @@ -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 @@ dbusservice_DATA = nm-ppp-starter.conf 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 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) icondir = $(datadir)/icons/hicolor/48x48/apps icon_DATA = gnome-mime-application-x-pptp-settings.png +endif EXTRA_DIST = $(nmvpnservice_DATA) \ $(dbusservice_DATA) \ diff --git a/vpn-daemons/pptp/configure.in b/vpn-daemons/pptp/configure.in index c18b65224a..d2657d530b 100644 --- a/vpn-daemons/pptp/configure.in +++ b/vpn-daemons/pptp/configure.in @@ -91,6 +91,12 @@ AC_PROG_GCC_TRADITIONAL 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,30 +116,31 @@ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1) 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(GNOMEKEYRING, gnome-keyring-1) -AC_SUBST(GNOMEKEYRING_CFLAGS) -AC_SUBST(GNOMEKEYRING_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) +fi AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir) AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) diff --git a/vpn-daemons/vpnc/Makefile.am b/vpn-daemons/vpnc/Makefile.am index 8e2b450044..1477330d71 100644 --- a/vpn-daemons/vpnc/Makefile.am +++ b/vpn-daemons/vpnc/Makefile.am @@ -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 @@ dbusservice_DATA = nm-vpnc-service.conf 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 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) icondir = $(datadir)/icons/hicolor/48x48/apps icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png +endif EXTRA_DIST = $(nmvpnservice_DATA) \ $(dbusservice_DATA) \ diff --git a/vpn-daemons/vpnc/configure.in b/vpn-daemons/vpnc/configure.in index cb04fdc7d9..80ca663ffd 100644 --- a/vpn-daemons/vpnc/configure.in +++ b/vpn-daemons/vpnc/configure.in @@ -35,6 +35,12 @@ AC_PROG_GCC_TRADITIONAL 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 @@ AC_SUBST(DBUS_LIBS) 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)