Vinzenz Feenstra has uploaded a new change for review.
Change subject: agent: Add a configure option to disable SSO
......................................................................
agent: Add a configure option to disable SSO
We don't support SSO on all systems, therefore we should at least make
it possible to build the guest agent daemon for those systems
Change-Id: Ic00e4c781a47194bbf6eda62fe3b4f1f107bbbbe
Signed-off-by: Vinzenz Feenstra <vfeen...@redhat.com>
---
M Makefile.am
M configure.ac
2 files changed, 25 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-guest-agent
refs/changes/34/13334/1
diff --git a/Makefile.am b/Makefile.am
index 6093668..edf9103 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,15 @@
ACLOCAL_AMFLAGS=-I m4
SUBDIRS = \
- ovirt-guest-agent \
- pam-ovirt-cred \
+ ovirt-guest-agent
+
+if BUILD_SSO_MODULES
+SUBDIRS += \
+ pam-ovirt-cred \
gdm-plugin \
gdm2-plugin \
kdm-plugin
+endif
CLEANFILES = \
*~
diff --git a/configure.ac b/configure.ac
index ffde3af..39dbba4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,23 +13,32 @@
AC_PROG_CC
AC_PROG_CXX
+AM_PROG_AR
AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_PROG_MKDIR_P
AC_PROG_LN_S
AM_PATH_PYTHON
+AC_ARG_WITH(sso,
+ AS_HELP_STRING([--with-sso],
+ [If single sign on modules should be built,
default=yes]),
+ sso=${withval}, sso=yes)
+AC_SUBST(sso)
+AM_CONDITIONAL(BUILD_SSO_MODULES, [test -n "$sso" -a "x$sso" != xno ])
+
dnl ---------------------------------------------------------------------------
dnl needed for systemd detection
dnl ---------------------------------------------------------------------------
PKG_PROG_PKG_CONFIG
+if test "x$sso" == "xyes"; then
AC_CHECK_HEADERS([arpa/inet.h fcntl.h stdlib.h string.h sys/socket.h unistd.h])
-AC_CHECK_HEADERS([security/pam_ext.h security/pam_modules.h])
AC_CHECK_FUNCS([memset select socket strchr strerror strndup])
AC_CHECK_LIB([pam], [pam_get_user])
+fi
AC_TYPE_SIZE_T
AC_TYPE_PID_T
@@ -57,9 +66,12 @@
AC_MSG_WARN([python-pep8 not found])
fi
+
dnl ---------------------------------------------------------------------------
dnl - Dependencies
dnl ---------------------------------------------------------------------------
+
+if test "x$sso" == "xyes"; then
DBUS_GLIB_REQUIRED_VERSION=0.74
GDM_SIMPLE_GREETER_REQUIRED_VERSION=3.2.1.1
@@ -109,6 +121,8 @@
fi
AC_SUBST(GDM_SRC_DIR)
+
+fi # if sso enabled
dnl ---------------------------------------------------------------------------
dnl - Directory for PAM configuration files
@@ -180,6 +194,9 @@
ovirt-guest-agent/Makefile
ovirt-guest-agent/consoleapps/Makefile
ovirt-guest-agent/pam/Makefile
+])
+if test "x$sso" == "xyes"; then
+AC_CONFIG_FILES([
pam-ovirt-cred/Makefile
gdm-plugin/Makefile
gdm-plugin/icons/Makefile
@@ -188,5 +205,6 @@
gdm2-plugin/Makefile
kdm-plugin/Makefile
])
+fi
AC_OUTPUT
--
To view, visit http://gerrit.ovirt.org/13334
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic00e4c781a47194bbf6eda62fe3b4f1f107bbbbe
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-guest-agent
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeen...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
