pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/readline also test for the readline.h header fil...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef13cf5dc467
branches:  trunk
changeset: 475971:ef13cf5dc467
user:      grant <grant%pkgsrc.org@localhost>
date:      Mon May 31 09:55:36 2004 +0000

description:
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.

diffstat:

 devel/readline/builtin.mk |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r b0c7f40a0cbb -r ef13cf5dc467 devel/readline/builtin.mk
--- a/devel/readline/builtin.mk Mon May 31 09:50:35 2004 +0000
+++ b/devel/readline/builtin.mk Mon May 31 09:55:36 2004 +0000
@@ -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 @@
 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])



Home | Main Index | Thread Index | Old Index