Detect >=heimdal-1.4 correctly - bug #389349. Thanks to Rafał Mużyło.
authorEray Aslan <eras@gentoo.org>
Sun, 6 Nov 2011 20:44:41 +0000 (20:44 +0000)
committerEray Aslan <eras@gentoo.org>
Sun, 6 Nov 2011 20:44:41 +0000 (20:44 +0000)
Package-Manager: portage-2.1.10.32/cvs/Linux x86_64

dev-libs/cyrus-sasl/ChangeLog
dev-libs/cyrus-sasl/Manifest
dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild [new file with mode: 0644]
dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch [new file with mode: 0644]

index 8cb6fd4e065b23431800f878b5b7965ef153f212..d6bbefaa840d511e1551f88bc71892ae4c433d51 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.231 2011/11/03 15:10:51 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.232 2011/11/06 20:44:41 eras Exp $
+
+*cyrus-sasl-2.1.23-r6 (06 Nov 2011)
+
+  06 Nov 2011; Eray Aslan <eras@gentoo.org> +cyrus-sasl-2.1.23-r6.ebuild,
+  +files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch:
+  Detect >=heimdal-1.4 correctly - bug #389349. Thanks to Rafał Mużyło.
 
   03 Nov 2011; Naohiro Aota <naota@gentoo.org> cyrus-sasl-2.1.23-r5.ebuild:
   Add ~x86-fbsd. Bug #372433
index e1221698bde24a56964a1fb5f07c915a98648db9..94e89000204e5af4c2b7c89862491df994979010 100644 (file)
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX cyrus-sasl-0001_versioned_symbols.patch 914 RMD160 dc3a5ed8dccc445aeec2567899667b63ee8ed6d9 SHA1 7e37dc17c2faa8ab85f9df5613f43ddbd2371f79 SHA256 d64669070f4d19d884eaeb7d2b3b66987a714c2dda462bbbc4bcf452b705c3e0
 AUX cyrus-sasl-0002_testsuite.patch 1055 RMD160 6567c8af51b9e0f14b2bc6c1f187a464dcdea3bb SHA1 5c2719c1644e482a384e73b6fb8c1794d7d733b7 SHA256 d7fff57482c2a9b148296ec680327d0cbd5254ed0a0bc99f46e2dc73758a6abc
@@ -21,6 +21,7 @@ AUX cyrus-sasl-2.1.22-gcc44.patch 540 RMD160 42889604f03e88d88204e5ab27fe82f7b06
 AUX cyrus-sasl-2.1.22-qa.patch 525 RMD160 9c8c5c1be5711b96f822e7192db8456a7b8eb1ae SHA1 17f07fb21a3ca01f8cf9c3ee7aa18632cf0dbb29 SHA256 56dbdc290871f3a42e507fe0be90431de15a832da7cf99bf3c21fb5aef05c8ac
 AUX cyrus-sasl-2.1.23+db-5.0.patch 1009 RMD160 35ecdbbc216f24982436fd0ff7d5c0701243424e SHA1 6d28d951106c7ece4133bb4785f68bbf968da686 SHA256 6570d4ff7668a7df47b457ebf38c232bcd9b7034db37d23effa5a18b735dc38e
 AUX cyrus-sasl-2.1.23-authd-fix.patch 829 RMD160 93161e6f36a3718bf92186a2d16967fa79ed4ad3 SHA1 7355bfc5ee53c69385ddd8da9710a17d4257bba3 SHA256 8732176e4a493b6b1548dc4799bf6866b9c324f5ecaafc9d9beffe0ac423d43d
+AUX cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch 782 RMD160 930990ff787097cbf9622b6fe6adc4c336fec3b1 SHA1 9077cad924c696e267563576326186725c13cc20 SHA256 672fce3a1b0a45f7e91e8ed8aaad953b70118f74cf10bfb966aa65d052017b0f
 AUX cyrus-sasl-2.1.23-rimap-loop.patch 783 RMD160 782c5ce77301810082c691c92a93e801a4aeb9ea SHA1 8d59617754aa100ff1e1af4c15429c75e60f63ac SHA256 1d07d64b79960f026bbf271222a985bbe39ad465dab157f0cd5fbffde5622a5d
 AUX java.README.gentoo 934 RMD160 53369bc85186e7be3e86a98d19a0a19ca4535c2b SHA1 8ddb577ffe968d4ff3cda27402ce21988c55519a SHA256 aeb733ab6371c1fe50e413e8469dcd11f0750b5afff489408c45f118857fc3fe
 AUX pwcheck.rc6 518 RMD160 fdb7e3310803e82232932b2d69d9c1d50844a360 SHA1 90e2051951a1f7375ddd241c7912a99436462e25 SHA256 3e4999ec0671b21845b12229b48b21a24d7ee73fe27d6b1432f2f26482a0371d
@@ -34,12 +35,23 @@ EBUILD cyrus-sasl-2.1.23-r2.ebuild 8574 RMD160 9b2b68789188a4c4f4d22537344398bde
 EBUILD cyrus-sasl-2.1.23-r3.ebuild 8797 RMD160 cebad70f960d8af747f97edfa9691320a06afe9f SHA1 cb7100675e052769aef126cd090cbf8b523c06e7 SHA256 0298bd8d3f046c6b5a9dedf17fd1b067b2a45970d04a50c1301dfbd53d173a48
 EBUILD cyrus-sasl-2.1.23-r4.ebuild 8807 RMD160 4f98323bb919e9e430b234126c802d08ccb25985 SHA1 b7a2be292909f542f67ba14a093954aac0e574f5 SHA256 c6203849a72e8ce8ac47bce99b30deca77b12b27a9290ad5cab67b27dd8ddc6b
 EBUILD cyrus-sasl-2.1.23-r5.ebuild 8882 RMD160 af8382e41ac63a672840122a275aa4cb7b658f05 SHA1 2205fded4b4d8a2fa8c94247911729b9a10ab3cd SHA256 ad9d3754b7edd0d6cd43f964f0d79494680b4061dbf3b15d5bb311ad099f4ccb
-MISC ChangeLog 38693 RMD160 c63b4366e338c5374bc17ae3f40080797995d56c SHA1 1d52c1769c713e5a8b67417674c353cf57f92426 SHA256 7640eba186223591ce91e658ee8fb15ff436228e7437de41cc8659659c44be39
+EBUILD cyrus-sasl-2.1.23-r6.ebuild 8949 RMD160 a5282cea890c0e6aac0d3a8ec838339e630634b6 SHA1 389810839adb2be0c4fea6ed17566d3c75e6a59b SHA256 0eb0216feeec73a76452fa4275cf0e7da4a64e6ab776c95d5a524de551ffae52
+MISC ChangeLog 38940 RMD160 4e38759803f2ba44dd20a6b4e4372926e5a88759 SHA1 efe0ce2439edb5d40961d15f367ef0f328533ce9 SHA256 a23230c778c4f67aeb714088ba9025ca0d6236226083ae59f8b02a4d5b209831
 MISC metadata.xml 707 RMD160 d1c8a74ccb59cba03b368c20a2ba552433b6bcc9 SHA1 b4aab11da0b0134b8ff09c5a7ce62118a3aeeac1 SHA256 730550801b9f8672610c1764da2fb1ed1e3e61c8d8535e735afbcccc93637272
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6yrwAACgkQGpDnPLSHuMCCrgCgjFm/6ykV4whqx7tGYFRYqe59
-ycIAoMuC74jZVWxoG97DANM4PYOfGV8E
-=X0Gb
+iQIcBAEBCAAGBQJOtvG/AAoJEHfx8XVYajsfEpIP/jHzb0UsboXwkLTYM5/w4ERo
+JMnNG7CrQ8neSQ/Z2T7kNxq0fZ5tw3v3Pso+Ig2NYJBKFSYHjUpD9jGyk4/T5bjP
+8lPwPfaE2mpZXoa3nrvqpFl3DUmpfuL3uFj49uDN3leVM8DvpuDAqN6ffui6crWk
+x/r5g6MdFzTuWrcke4do6lxF17NV27FNAUWhVmeV7ZCglaKbBrbZO2xy+xB4GFZy
+pB3JilzZSr5SJte9WecqRJ0VBu0pyJ3ip0xbfguzWseiifimK2dGGd9vQEzIM1ya
+khnmhywcBO20FBEPFFv6c+VAQRWbvwTvZ1IHr5f+DbtPqdB0ycFIWYrTYkgAfUbK
+KixosrqC4cMl0uNbA2f+yGa8+5ZoFpqu4q6R6g/oQqJl2WHxyzZT9poULvsNbjVt
+LEsPsDmOGFK7lSNVc8VLPRgcxj3eNIdYLfhQzBsU7mqOHcU59sigPXD4uuYq3LzO
+dvQViz8lMximr81gpHf0gNTGzMy2YzdM4M+JjThDAR6+f1fwUD7oFMh/6gi2S7/3
+vT6hvU4iYK5mBmzKlQtRVetzXr25dkjKltLDg+wzlFufGYUIjiqZDiaD7LyFS8n8
+gA+jgAXCySqalltOdsZYZMI/JPJknsrV87fRuxZXnvdfYX3zh6jsw59nlnsjbRqK
+YtBApF63JBfFKAGjhA4T
+=MPS9
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild
new file mode 100644 (file)
index 0000000..5160fce
--- /dev/null
@@ -0,0 +1,252 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild,v 1.1 2011/11/06 20:44:41 eras Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
+
+ntlm_patch="${P}-ntlm_impl-spnego.patch.gz"
+SASLAUTHD_CONF_VER="2.1.21"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
+HOMEPAGE="http://asg.web.cmu.edu/sasl/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
+       ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
+
+LICENSE="as-is"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="authdaemond berkdb crypt gdbm kerberos openldap mysql ntlm_unsupported_patch pam postgres sample srp ssl urandom"
+
+DEPEND="authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) )
+       berkdb? ( >=sys-libs/db-3.2 )
+       gdbm? ( >=sys-libs/gdbm-1.8.0 )
+       kerberos? ( virtual/krb5 )
+       openldap? ( >=net-nds/openldap-2.0.25 )
+       mysql? ( virtual/mysql )
+       ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )
+       pam? ( virtual/pam )
+       postgres? ( dev-db/postgresql-base )
+       ssl? ( >=dev-libs/openssl-0.9.6d )
+       java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+       if use gdbm && use berkdb ; then
+               echo
+               elog "You have both 'gdbm' and 'berkdb' USE flags enabled."
+               elog "gdbm will be selected."
+               echo
+       fi
+       java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+       # Fix default port name for rimap auth mechanism.
+       sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \
+               -i saslauthd/auth_rimap.c || die "sed failed"
+
+       # UNSUPPORTED ntlm patch #81342
+       use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
+       epatch "${FILESDIR}"/${PN}-2.1.17-pgsql-include.patch
+       use crypt && epatch "${FILESDIR}"/${PN}-2.1.19-checkpw.c.patch #45181
+       epatch "${FILESDIR}"/${PN}-2.1.22-as-needed.patch
+       epatch "${FILESDIR}/${PN}-2.1.21-keytab.patch"
+       epatch "${FILESDIR}"/${PN}-2.1.22-crypt.patch #152544
+       epatch "${FILESDIR}"/${PN}-2.1.22-qa.patch
+       epatch "${FILESDIR}/${PN}-2.1.22-gcc44.patch" #248738
+       epatch "${FILESDIR}"/${P}-authd-fix.patch
+       epatch "${FILESDIR}"/${P}+db-5.0.patch
+       epatch "${FILESDIR}/${PN}-0001_versioned_symbols.patch"
+       epatch "${FILESDIR}/${PN}-0002_testsuite.patch"
+       epatch "${FILESDIR}/${PN}-0006_library_mutexes.patch"
+       epatch "${FILESDIR}/${PN}-0008_one_time_sasl_set_alloc.patch"
+       epatch "${FILESDIR}/${PN}-0010_maintainer_mode.patch"
+       epatch "${FILESDIR}/${PN}-0011_saslauthd_ac_prog_libtool.patch"
+       epatch "${FILESDIR}/${PN}-0012_xopen_crypt_prototype.patch"
+       epatch "${FILESDIR}/${PN}-0014_avoid_pic_overwrite.patch"
+       epatch "${FILESDIR}/${PN}-0016_pid_file_lock_creation_mask.patch"
+       epatch "${FILESDIR}/${PN}-0026_drop_krb5support_dependency.patch"
+       epatch "${FILESDIR}"/${P}-rimap-loop.patch #381427
+       epatch "${FILESDIR}"/${P}-gss_c_nt_hostbased_service.patch #389349
+
+       sed -i -e '/for dbname in/s:db-4.* db:'$(db_libname)':' \
+               "${S}"/cmulocal/berkdb.m4
+
+       # Upstream doesn't even honor their own configure options... grumble
+       sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+               "${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+       # make sure to use common plugin ldflags
+       sed -i '/_la_LDFLAGS = /s:=:= $(AM_LDFLAGS) :' plugins/Makefile.am || die
+
+       # Recreate configure.
+       rm -f "${S}/config/libtool.m4" || die "rm libtool.m4 failed"
+       AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
+}
+
+src_configure() {
+       # Fix QA issues.
+       append-flags -fno-strict-aliasing
+       append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+
+       # Java support.
+       use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+       local myconf
+
+       # Add authdaemond support (bug #56523).
+       if use authdaemond ; then
+               myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
+       fi
+
+       # Fix for bug #59634.
+       if ! use ssl ; then
+               myconf="${myconf} --without-des"
+       fi
+
+       if use mysql || use postgres ; then
+               myconf="${myconf} --enable-sql"
+       else
+               myconf="${myconf} --disable-sql"
+       fi
+
+       # Default to GDBM if both 'gdbm' and 'berkdb' are present.
+       if use gdbm ; then
+               einfo "Building with GNU DB as database backend for your SASLdb"
+               myconf="${myconf} --with-dblib=gdbm"
+       elif use berkdb ; then
+               einfo "Building with BerkeleyDB as database backend for your SASLdb"
+               myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
+       else
+               einfo "Building without SASLdb support"
+               myconf="${myconf} --with-dblib=none"
+       fi
+
+       # Use /dev/urandom instead of /dev/random (bug #46038).
+       use urandom && myconf="${myconf} --with-devrandom=/dev/urandom"
+
+       econf \
+               --enable-login \
+               --enable-ntlm \
+               --enable-auth-sasldb \
+               --disable-krb4 \
+               --disable-otp \
+               --without-sqlite \
+               --with-saslauthd=/var/lib/sasl2 \
+               --with-pwcheck=/var/lib/sasl2 \
+               --with-configdir=/etc/sasl2 \
+               --with-plugindir=/usr/$(get_libdir)/sasl2 \
+               --with-dbpath=/etc/sasl2/sasldb2 \
+               $(use_with ssl openssl) \
+               $(use_with pam) \
+               $(use_with openldap ldap) \
+               $(use_enable openldap ldapdb) \
+               $(use_enable sample) \
+               $(use_enable kerberos gssapi) \
+               $(use_enable java) \
+               $(use_with java javahome ${JAVA_HOME}) \
+               $(use_with mysql) \
+               $(use_with postgres pgsql) \
+               $(use_enable srp) \
+               ${myconf}
+}
+
+src_compile() {
+       # We force -j1 for bug #110066.
+       emake -j1 || die "emake failed"
+
+       # Default location for java classes breaks OpenOffice (bug #60769).
+       # Thanks to axxo@gentoo.org for the solution.
+       cd "${S}"
+       if use java ; then
+               jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+       fi
+
+       # Add testsaslauthd (bug #58768).
+       cd "${S}/saslauthd"
+       emake testsaslauthd || die "emake testsaslauthd failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "emake install failed"
+       keepdir /var/lib/sasl2 /etc/sasl2
+
+       # Install everything necessary so users can build sample
+       # client/server (bug #64733).
+       if use sample ; then
+               insinto /usr/share/${PN}-2/examples
+               doins aclocal.m4 config.h config.status configure.in
+               dosym /usr/include/sasl /usr/share/${PN}-2/examples/include
+               exeinto /usr/share/${PN}-2/examples
+               doexe libtool
+               insinto /usr/share/${PN}-2/examples/sample
+               doins sample/*.{c,h} sample/*Makefile*
+               insinto /usr/share/${PN}-2/examples/sample/.deps
+               doins sample/.deps/*
+               dodir /usr/share/${PN}-2/examples/lib
+               dosym /usr/$(get_libdir)/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la
+               dodir /usr/share/${PN}-2/examples/lib/.libs
+               dosym /usr/$(get_libdir)/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so
+       fi
+
+       # Default location for java classes breaks OpenOffice (bug #60769).
+       if use java ; then
+               java-pkg_dojar ${PN}.jar
+               java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
+               # hackish, don't wanna dig through makefile
+               rm -Rf "${D}/usr/$(get_libdir)/java"
+               docinto "java"
+               dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+               dodir "/usr/share/doc/${PF}/java/Test"
+               insinto "/usr/share/doc/${PF}/java/Test"
+               doins "${S}"/java/Test/*.java || die "Failed to copy java files to /usr/share/doc/${PF}/java/Test"
+       fi
+
+       docinto ""
+       dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
+       newdoc pwcheck/README README.pwcheck
+       dohtml doc/*.html
+
+       docinto "saslauthd"
+       dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
+
+       newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd || die "Failed to install saslauthd to /etc/pam.d"
+
+       newinitd "${FILESDIR}/pwcheck.rc6" pwcheck || die "Failed to install pwcheck to /etc/init.d"
+
+       newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd || die "Failed to install saslauthd to /etc/init.d"
+       newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd || die "Failed to install saslauthd to /etc/conf.d"
+
+       exeinto /usr/sbin
+       newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || die "Failed to install testsaslauthd"
+}
+
+pkg_postinst () {
+       # Generate an empty sasldb2 with correct permissions.
+       if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
+               einfo "Generating an empty sasldb2 with correct permissions ..."
+               echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
+                       || die "Failed to generate sasldb2"
+               "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
+                       || die "Failed to delete temp user"
+               chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
+                       || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
+               chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
+                       || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
+       fi
+
+       if use sample ; then
+               elog "You have chosen to install sources for the example client and server."
+               elog "To build these, please type:"
+               elog "\tcd /usr/share/${PN}-2/examples/sample && make"
+       fi
+
+       if use authdaemond ; then
+               elog "You need to add a user running a service using Courier's"
+               elog "authdaemon to the 'mail' group. For example, do:"
+               elog "  gpasswd -a postfix mail"
+               elog "to add the 'postfix' user to the 'mail' group."
+       fi
+}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch
new file mode 100644 (file)
index 0000000..9eeab1b
--- /dev/null
@@ -0,0 +1,16 @@
+Gentoo bug #389349
+--- cmulocal/sasl2.m4  2009-04-28 17:09:13.000000000 +0200
++++ cmulocal/sasl2.m4  2011-11-02 17:55:24.000000000 +0100
+@@ -217,7 +217,11 @@
+                  [AC_WARN([Cybersafe define not found])])
+ 
+   elif test "$ac_cv_header_gssapi_h" = "yes"; then
+-    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
++    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
++                 [#include <gssapi.h>
++                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
++                    hostbased_service_gss_nt_yes
++                  #endif],
+                     [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
+                                [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])])
+   elif test "$ac_cv_header_gssapi_gssapi_h"; then