From 45568d1b0c3dc1ee2ef4ba6d124f7537ac38da6f Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 20 May 2007 04:59:04 +0000 Subject: [PATCH] * Go back to using krb5-config. The dependency problem has now been fixed on all platforms in the krb5 package and this is the preferred upstream method. --- debian/changelog | 8 ++++++++ debian/rules | 8 +++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08c86763b..bb5a51e90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +openafs (1.4.4.dfsg1-4) UNRELEASED; urgency=low + + * Go back to using krb5-config. The dependency problem has now been + fixed on all platforms in the krb5 package and this is the preferred + upstream method. + + -- Russ Allbery Sat, 19 May 2007 22:01:00 -0700 + openafs (1.4.4.dfsg1-3) unstable; urgency=low * Always generate a UUID on client startup even if for some reason we diff --git a/debian/rules b/debian/rules index f52311d8f..f03a84f5e 100755 --- a/debian/rules +++ b/debian/rules @@ -85,22 +85,20 @@ get-orig-source: rm -r openafs_$(DEBVERS).orig gzip -9 openafs_$(DEBVERS).orig.tar -# Manually set --with-krb5 and the environment variables since krb5-config -# adds a variety of other stuff we don't want. This may soon be fixed in -# Debian unstable, but this is the most reliable approach. configure: configure-stamp configure-stamp: @if test x"$(SYS_NAME)" = x"UNKNOWN" ; then exit 1 ; fi dh_testdir sh regen.sh afslogsdir=/var/log/openafs afslocaldir=/etc/openafs/server-local \ - KRB5CFLAGS=' ' KRB5LIBS='-lkrb5 -lcom_err' sh configure \ + sh configure \ --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \ --prefix=/usr --mandir=\$${prefix}/share/man \ --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var/lib --enable-supergroups \ --enable-largefile-fileserver --enable-debug --enable-lwp-debug \ - --with-krb5 $(DEBIAN_OPT_FLAGS) $(SYSTEM) + --with-krb5-conf=/usr/bin/krb5-config \ + $(DEBIAN_OPT_FLAGS) $(SYSTEM) chmod a+x src/libafs/make_kbuild_makefile.pl touch configure-stamp -- 2.39.5