diff options
| author | grant <grant> | 2004-05-31 09:55:36 +0000 |
|---|---|---|
| committer | grant <grant> | 2004-05-31 09:55:36 +0000 |
| commit | 4b3c4ef2fceec84a10e494ca2677bcbe9313c551 (patch) | |
| tree | db68291f4955e60f320d2db69c56230da6937969 | |
| parent | bd519651652786aa0d10eed7c47d9e5e02a47a23 (diff) | |
| download | pkgsrc-4b3c4ef2fceec84a10e494ca2677bcbe9313c551.tar.gz | |
also test for the readline.h header file when determining whether we
have builtin readline.
fixes a problem under Slackware 9.1 where the aaa_elflibs package (which
must be installed) provides shared libraries for base system programs
linked against them, but does not provide the .so symlink nor the header
files needed for development, so can't be used for pkgsrc.
| -rw-r--r-- | devel/readline/builtin.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/devel/readline/builtin.mk b/devel/readline/builtin.mk index 72d401b8294..4a572474fbc 100644 --- a/devel/readline/builtin.mk +++ b/devel/readline/builtin.mk @@ -1,11 +1,18 @@ -# $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:30 jlam Exp $ +# $NetBSD: builtin.mk,v 1.4 2004/05/31 09:55:36 grant Exp $ .if !defined(_BLNK_LIBREADLINE_FOUND) +_READLINE_H= /usr/include/readline.h +_READLINE_READLINE_H= /usr/include/readline/readline.h + _BLNK_LIBREADLINE_FOUND!= \ if [ "`${ECHO} /usr/lib/libreadline.*`" = "/usr/lib/libreadline.*" ]; then \ ${ECHO} "no"; \ else \ - ${ECHO} "yes"; \ + if [ "`${ECHO} ${_READLINE_H}* ${_READLINE_READLINE_H}*`" = "${_READLINE_H}* ${_READLINE_READLINE_H}*" ]; then \ + ${ECHO} "no"; \ + else \ + ${ECHO} "yes"; \ + fi \ fi BUILDLINK_VARS+= _BLNK_LIBREADLINE_FOUND .endif @@ -20,9 +27,6 @@ _BLNK_LIBEDIT_FOUND!= \ BUILDLINK_VARS+= _BLNK_LIBEDIT_FOUND .endif -_READLINE_H= /usr/include/readline.h -_READLINE_READLINE_H= /usr/include/readline/readline.h - .if !defined(IS_BUILTIN.readline) IS_BUILTIN.readline= no . if !empty(_BLNK_LIBREADLINE_FOUND:M[yY][eE][sS]) |