From: cantor Date: Mon, 13 Aug 2007 19:17:52 +0000 (+0000) Subject: Toggle for ADFS build. X-Git-Tag: 2.4~797 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=2c5cf94ea9f0c2ea3c88540f7966944f533d4c90 Toggle for ADFS build. git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2411 cb58f699-b61c-0410-a6fe-9272a202ed29 --- diff --git a/configure.ac b/configure.ac index 67b47dc..f517be1 100644 --- a/configure.ac +++ b/configure.ac @@ -230,11 +230,28 @@ AC_SUBST(LITE_LIBS) AC_SUBST(XMLSEC_LIBS) # output the underlying makefiles -WANT_SUBDIRS="doc schemas configs shibsp shibd adfs util" +WANT_SUBDIRS="doc schemas configs shibsp shibd util" AC_CONFIG_FILES([Makefile doc/Makefile schemas/Makefile \ configs/Makefile shibsp/Makefile shibd/Makefile \ adfs/Makefile util/Makefile selinux/Makefile]) +## ADFS? +AC_CONFIG_FILES([adfs/Makefile]) +AC_ARG_ENABLE([adfs], + AC_HELP_STRING([--disable-adfs], [don't build the ADFS module]), + [adfs_enabled=$enableval], [adfs_enabled=yes]) +if test "x$adfs_enabled" = "x" ; then + adfs_enabled=yes +fi +AC_MSG_CHECKING(whether to build the ADFS module) +if test "$adfs_enabled" = "no" ; then + AC_MSG_RESULT(no) +else + AC_MSG_RESULT(yes) + WANT_SUBDIRS="$WANT_SUBDIRS adfs" +fi + + # # Build NSAPI module? # diff --git a/shibboleth.spec.in b/shibboleth.spec.in index 27dce5a..1f41794 100644 --- a/shibboleth.spec.in +++ b/shibboleth.spec.in @@ -75,7 +75,7 @@ installed. %setup -q %build -%configure %{?shib_options} +%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?shib_options} make #make -C selinux