[network-manager-openconnect/NM_0_8] Don't build auth-dialog if configured --without-gnome (cherry picked from commit 93899d2e971f38dabb8
- From: David Woodhouse <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openconnect/NM_0_8] Don't build auth-dialog if configured --without-gnome (cherry picked from commit 93899d2e971f38dabb8
- Date: Sat, 21 May 2011 13:40:24 +0000 (UTC)
commit 9d5aecbc19e8bc4da6fa0846f0a4d28b848f4d87
Author: David Woodhouse <David Woodhouse intel com>
Date: Sat May 21 14:39:07 2011 +0100
Don't build auth-dialog if configured --without-gnome
(cherry picked from commit 93899d2e971f38dabb890ce3ccc06bb125d58eec)
Makefile.am | 2 +-
configure.ac | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 08953ef..2c7d8a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,11 +4,11 @@ SUBDIRS = src
if WITH_GNOME
SUBDIRS += properties po
-endif
if WITH_AUTHDLG
SUBDIRS += auth-dialog
endif
+endif
dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-openconnect-service.conf
diff --git a/configure.ac b/configure.ac
index f75e8e6..3b4ae11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,12 +60,6 @@ PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74)
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
-if test x"$with_authdlg" != xno; then
- PKG_CHECK_MODULES(OPENCONNECT, openconnect)
- AC_SUBST(OPENCONNECT_CFLAGS)
- AC_SUBST(OPENCONNECT_LIBS)
-fi
-
if test x"$with_gnome" != xno; then
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
AC_SUBST(GTK_CFLAGS)
@@ -78,6 +72,12 @@ if test x"$with_gnome" != xno; then
PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
AC_SUBST(GNOMEKEYRING_CFLAGS)
AC_SUBST(GNOMEKEYRING_LIBS)
+
+ if test x"$with_authdlg" != xno; then
+ PKG_CHECK_MODULES(OPENCONNECT, openconnect)
+ AC_SUBST(OPENCONNECT_CFLAGS)
+ AC_SUBST(OPENCONNECT_LIBS)
+ fi
fi
PKG_CHECK_MODULES(NETWORKMANAGER,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]