pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/heimdal The configure script checks for some ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/52cdd6bc1bd9
branches:  trunk
changeset: 480569:52cdd6bc1bd9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Sep 15 04:53:21 2004 +0000

description:
The configure script checks for some libraries the wrong order, since
-lreadline also needs either -ltermcap, -lcurses, -lncurses in the link
command to resolve all symbols used in the readline library.  Cause one
of these libraries to automatically be added whenever "-lreadline"
appears on the command line.  This is a generalization of the change in
revision 1.6 to work on more operating systems.

diffstat:

 security/heimdal/Makefile |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 9663d6cdf536 -r 52cdd6bc1bd9 security/heimdal/Makefile
--- a/security/heimdal/Makefile Wed Sep 15 04:11:11 2004 +0000
+++ b/security/heimdal/Makefile Wed Sep 15 04:53:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/09/14 14:41:34 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2004/09/15 04:53:21 jlam Exp $
 
 DISTNAME=      heimdal-0.6.3
 CATEGORIES=    security
@@ -26,13 +26,21 @@
 CONFIGURE_ARGS+=       --without-x
 CONFIGURE_ARGS+=       --without-krb4
 
+.include "../../mk/bsd.prefs.mk"
+
 # Heimdal's configure script expects to find the readline.h header as
-# <readline.h>.
+# <readline.h>.  Also, the configure script checks for some libraries
+# in the wrong order, since -lreadline also needs either -ltermcap,
+# -lcurses, -lncurses in the link command to resolve all symbols used
+# in the readline library.
 #
 BUILDLINK_INCDIRS.readline=    include/readline
+BUILDLINK_TRANSFORM+=          l:readline:readline:${READLINE_TERMLIB}
 .include "../../devel/readline/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.readline}
-LIBS.SunOS=            -ltermcap
+OPSYSVARS+=                    READLINE_TERMLIB
+READLINE_TERMLIB.Linux=                curses
+READLINE_TERMLIB.*=            termcap
 
 CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
 .include "../../security/openssl/buildlink3.mk"



Home | Main Index | Thread Index | Old Index