summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-11-15 14:56:36 +0000
committerjlam <jlam@pkgsrc.org>2004-11-15 14:56:36 +0000
commitaf1ad06c8bab286e1c23bbe437f07d6e4f51b743 (patch)
treef45be3a3dd24df5bbf4145c2071de1827909533a /security
parentfc0994b112907b89661c400c248cfa128254828e (diff)
downloadpkgsrc-af1ad06c8bab286e1c23bbe437f07d6e4f51b743.tar.gz
Add a new variable BROKEN_READLINE_DETECTION which should be set to
yes/no by a package Makefile, depending on whether the configure process properly detects the additional libraries needed to link against -lreadline (typically, you need either "-lreadline -ltermcap", or "-lreadline -lcurses" to properly link against -lreadline). If this variable is set to "yes", then we automatically expand "-lreadline" into "-lreadline -l<termcap functions library>". BROKEN_READLINE_DETECTION defaults to "no". Set BROKEN_READLINE_DETECTION to "yes" in security/heimdal and remove the custom logic that did the same work.
Diffstat (limited to 'security')
-rw-r--r--security/heimdal/Makefile14
1 files changed, 4 insertions, 10 deletions
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index ae417a78e25..135199c0784 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/11/09 19:48:52 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2004/11/15 14:56:36 jlam Exp $
DISTNAME= heimdal-0.6.3
PKGREVISION= 1
@@ -30,18 +30,12 @@ CONFIGURE_ARGS+= --without-krb4
.include "../../mk/bsd.prefs.mk"
# Heimdal's configure script expects to find the readline.h header as
-# <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.
+# <readline.h>.
#
+CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
BUILDLINK_INCDIRS.readline= include/readline
-BUILDLINK_TRANSFORM+= l:readline:readline:${READLINE_TERMLIB}
+BROKEN_READLINE_DETECTION= yes
.include "../../devel/readline/buildlink3.mk"
-CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
-OPSYSVARS+= READLINE_TERMLIB
-READLINE_TERMLIB.Linux= curses
-READLINE_TERMLIB.*= termcap
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
.include "../../security/openssl/buildlink3.mk"