From owner-freebsd-current  Mon Sep 21 12:46:08 1998
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id MAA19502
          for freebsd-current-outgoing; Mon, 21 Sep 1998 12:46:08 -0700 (PDT)
          (envelope-from owner-freebsd-current@FreeBSD.ORG)
Received: from mail.HiWAAY.net (fly.HiWAAY.net [208.147.154.56])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id MAA19451;
          Mon, 21 Sep 1998 12:45:38 -0700 (PDT)
          (envelope-from sprice@hiwaay.net)
Received: from localhost (sprice@localhost)
	by mail.HiWAAY.net (8.9.0/8.9.0) with SMTP id OAA24686;
	Mon, 21 Sep 1998 14:44:31 -0500 (CDT)
Date: Mon, 21 Sep 1998 14:44:30 -0500 (CDT)
From: Steve Price <sprice@hiwaay.net>
To: Mark Murray <mark@grondar.za>
cc: ports@FreeBSD.ORG, current@FreeBSD.ORG
Subject: Re: Patch to build XFree86 w/ Krb4 in an ELF world 
In-Reply-To: <199809211917.VAA00798@gratis.grondar.za>
Message-ID: <Pine.OSF.4.02.9809211437240.750-100000@fly.HiWAAY.net>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

On Mon, 21 Sep 1998, Mark Murray wrote:

[...]
@@ -250,7 +258,11 @@
 answ=NO
 cpkb=NO
 if [ $answ = YES ]; then
-    LIBKRB=/usr/lib/libkrb.a
+    if [ $ELF = yes ]; then
+      LIBKRB=/usr/lib/libkrb.a
+    else
+      LIBKRB=/usr/lib/aout/libkrb.a
+    fi
     K4PATCH=$FILESDIR/kerberos4.diffs
     K4XDM="$FILESDIR/krb4auth.c $FILESDIR/krb4auth.h"
     XDMDIR=$WRKDIR/xc/programs/xdm/
[...]

How about something along these lines:

if [ $ELF = yes ]; then
  LIBKRB=/usr/lib/libkrb.a
elif [ -d /usr/lib/aout ]; then
  LIBKRB=/usr/lib/aout/libkrb.a
else
  LIBKRB=/usr/lib/libkrb.a
fi

I don't know that this one matters, but it does catch the
corner case where world is still a.out and /usr/lib/aout
doesn't exist yet.

Steve


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message