summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-09-15 04:53:21 +0000
committerjlam <jlam@pkgsrc.org>2004-09-15 04:53:21 +0000
commitb7ebacaf825f010409b9aecb92b1dec36c113d6a (patch)
tree4b8708e3d8d126f7361d6dea202ab87ef29b6a7f /security
parentd19adcd53e4df2e906c42bbe4620d9fcdf441083 (diff)
downloadpkgsrc-b7ebacaf825f010409b9aecb92b1dec36c113d6a.tar.gz
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 (limited to 'security')
-rw-r--r--security/heimdal/Makefile14
1 files changed, 11 insertions, 3 deletions
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 27318984d67..54f428ff80b 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -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+= --includedir=${PREFIX}/include/krb5
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"