[24302] in Source-Commits
/svn/athena r23900 - trunk/third/moira/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Fri Jun 26 01:08:43 2009
Date: Fri, 26 Jun 2009 01:08:33 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200906260508.n5Q58X2J020523@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-06-26 01:08:33 -0400 (Fri, 26 Jun 2009)
New Revision: 23900
Modified:
trunk/third/moira/debian/changelog
trunk/third/moira/debian/rules
Log:
In moira:
* Universally stop building Moira with krb4 support.
Modified: trunk/third/moira/debian/changelog
===================================================================
--- trunk/third/moira/debian/changelog 2009-06-26 04:51:01 UTC (rev 23899)
+++ trunk/third/moira/debian/changelog 2009-06-26 05:08:33 UTC (rev 23900)
@@ -2,8 +2,9 @@
* New CVS snapshot.
* Drop krb4less-fix; it was incorporated upstream.
+ * Universally stop building Moira with krb4 support.
- -- Evan Broder <broder@mit.edu> Fri, 26 Jun 2009 00:50:42 -0400
+ -- Evan Broder <broder@mit.edu> Fri, 26 Jun 2009 00:51:28 -0400
debathena-moira (4.0.0+cvs20090618-0debathena1) unstable; urgency=low
Modified: trunk/third/moira/debian/rules
===================================================================
--- trunk/third/moira/debian/rules 2009-06-26 04:51:01 UTC (rev 23899)
+++ trunk/third/moira/debian/rules 2009-06-26 05:08:33 UTC (rev 23900)
@@ -4,14 +4,7 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-KRB5_VERSION=$(shell dpkg-query -W -f '$${Version}\n' libkrb5-dev)
-ifeq (yes,$(shell dpkg --compare-versions '$(KRB5_VERSION)' lt '1.6.dfsg.4~beta1-7' && echo yes))
- DEB_CONFIGURE_EXTRA_FLAGS += --with-krb4=$(shell krb5-config --prefix krb4)
-else
- DEB_CONFIGURE_EXTRA_FLAGS += --without-krb4
-endif
-
-DEB_CONFIGURE_EXTRA_FLAGS += --with-krb5 --with-hesiod --with-zephyr --with-com_err=/usr --without-oracle --without-afs --disable-rpath
+DEB_CONFIGURE_EXTRA_FLAGS += --without-krb4 --with-krb5 --with-hesiod --with-zephyr --with-com_err=/usr --without-oracle --without-afs --disable-rpath
DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
DEB_DH_STRIP_ARGS += --dbg-package=debathena-libmoira0
