[26148] in Source-Commits
Re: /svn/athena r25419 - trunk/athena/bin/quota/debian
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Sat Oct 22 20:11:48 2011
Date: Sat, 22 Oct 2011 20:11:44 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201110202000.p9KK0GVM023236@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1110222008480.882@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
On Thu, 20 Oct 2011, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2011-10-20 16:00:16 -0400 (Thu, 20 Oct 2011)
> New Revision: 25419
>
> Modified:
> trunk/athena/bin/quota/debian/changelog
> trunk/athena/bin/quota/debian/rules
> Log:
> In quota:
> * Don't use /usr/lib/afs/libcom_err.a if it doesn't exist
>
>
> Modified: trunk/athena/bin/quota/debian/changelog
> ===================================================================
> --- trunk/athena/bin/quota/debian/changelog 2011-10-17 03:11:38 UTC (rev 25418)
> +++ trunk/athena/bin/quota/debian/changelog 2011-10-20 20:00:16 UTC (rev 25419)
> @@ -1,3 +1,9 @@
> +debathena-quota (10.0.1-0debathena2) unstable; urgency=low
> +
> + * Don't use /usr/lib/afs/libcom_err.a if it doesn't exist
> +
> + -- Jonathan Reed <jdreed@mit.edu> Thu, 20 Oct 2011 15:58:43 -0400
> +
> debathena-quota (10.0.1-0debathena1) unstable; urgency=low
>
> * Add a configure-time option to tear the NFS (and therefore the krb4)
>
> Modified: trunk/athena/bin/quota/debian/rules
> ===================================================================
> --- trunk/athena/bin/quota/debian/rules 2011-10-17 03:11:38 UTC (rev 25418)
> +++ trunk/athena/bin/quota/debian/rules 2011-10-20 20:00:16 UTC (rev 25419)
> @@ -4,7 +4,7 @@
> include /usr/share/cdbs/1/rules/debhelper.mk
> include /usr/share/cdbs/1/class/autotools.mk
>
> -DEB_CONFIGURE_EXTRA_FLAGS += --with-afs=/usr --disable-nfs --with-hesiod --with-zephyr LIBS=/usr/lib/afs/libcom_err.a
> +DEB_CONFIGURE_EXTRA_FLAGS += --with-afs=/usr --disable-nfs --with-hesiod --with-zephyr $(if $(wildcard /usr/lib/afs/libcom_err.a),LIBS=/usr/lib/afs/libcom_err.a)
oneiric has openafs 1.6.0, which renamed its com_err library to afscom_err
(at my prodding). I guess (but didn't check) that quota wants AFS's
com_err to decode errors from an AFS utility, so the desire for the
library is not spurious. In that case, we should also check for
/usr/lib/afs/libafscom_err.a -- is the best way to do so just another $(if
$(wildcard ...)) stanza with LIBS+= ?
-Ben
