summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-06-18 23:03:27 +0200
committerDavid Seifert <soap@gentoo.org>2021-06-18 23:03:27 +0200
commit8d7c66e19dc3897f617c22e21db099c967dc670e (patch)
tree6ff930401edba65d3a06a957319e5a92d65c09be /app-misc/abook/files/abook-0.6.1-use-newer-macro-for-readline.patch
parentmedia-video/vdr: tidy up patch (diff)
downloadgentoo-8d7c66e19dc3897f617c22e21db099c967dc670e.tar.gz
gentoo-8d7c66e19dc3897f617c22e21db099c967dc670e.tar.bz2
gentoo-8d7c66e19dc3897f617c22e21db099c967dc670e.zip
app-misc/abook: fix ncurses, readline detection
* Use PKG_CHECK_MODULES (pkg-config) to detect ncurses as we shouldn't assume tinfo is _always_ split (although it usually is on Gentoo). It isn't on Prefix and it's best to be flexible. * Use more modern Autoconf Archive macro for readline which was also previously failing on Prefix (Darwin). Signed-off-by: Sam James <sam@gentoo.org> Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-misc/abook/files/abook-0.6.1-use-newer-macro-for-readline.patch')
-rw-r--r--app-misc/abook/files/abook-0.6.1-use-newer-macro-for-readline.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/app-misc/abook/files/abook-0.6.1-use-newer-macro-for-readline.patch b/app-misc/abook/files/abook-0.6.1-use-newer-macro-for-readline.patch
new file mode 100644
index 000000000000..1a35e636964d
--- /dev/null
+++ b/app-misc/abook/files/abook-0.6.1-use-newer-macro-for-readline.patch
@@ -0,0 +1,31 @@
+From: Sam James <sam@gentoo.org>
+Date: Wed, 21 Apr 2021 06:20:13 +0100
+Subject: Use more modern autoconf archive macro for readline
+
+The previous macro used was pretty obsolete and certainly didn't work
+on Gentoo Prefix on Darwin anyway.
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,19 +86,9 @@ dnl ------------------
+ dnl readline detection
+ dnl ------------------
+
+-abook_cv_readline=/usr
+-AC_ARG_WITH(readline, [ --with-readline=DIR Where readline is installed ],
+- [if test $withval != yes; then
+- abook_cv_readline=$withval
+- fi
+- if test x$abook_cv_readline != x/usr; then
+- LDFLAGS="-L${abook_cv_readline}/lib $LDFLAGS"
+- CPPFLAGS="$CPPFLAGS -I${abook_cv_readline}/include"
+- fi])
+-
+-AC_LIB_READLINE
+-
+-if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then
++AX_LIB_READLINE
++
++if test x$ax_cv_lib_readline = xno -o x$ax_cv_lib_readline_history = xno; then
+ AC_MSG_ERROR([*** readline library not found or it doesn't support history ***])
+ fi
+