Commit 78de6ffc authored by Liguros - Gitlab CI/CD [develop]'s avatar Liguros - Gitlab CI/CD [develop]
Browse files

updates

merged:

  xor: 3071bfd7fd0587e684f1606b81cceeb2c8555251
  cinnamon: b27bc38bfabe38ea79fafee91ba4545cd88bcaa0
  mate-desktop: ef8e1ff600fb0a12ee425227a0b1b250ed31bbac
  fusion809: 980e79b18b0fe0be32b2aa6ff06b7068ac7f2253
  steam: d6b161d6c28b026cc993320d43797097fa668746
  go-overlay: 435b13dcc2cdc2dc5b5fee57005d8deb2caa114c
  stefantalpalaru: 05a812d0618eb1ed02a01fec8068cad707507e92
  ports: 820b99d2d8e0a765022eeb8381531d6aac0b4df6
  gentoo-libressl: eea877be8b5f120e5ca67b3d0bf34acd908ae960
  gentoo-staging: 5cea88c76cae903b8ab8876fbd5d4440fab40052
  calculatelinux: c1377fb5b39bdf799497f694effd3ef6364ff476
  kit-fixups: 47fe44d990342fd949292326070d9c5b1fdb95a1
parent f2e3b5a4
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="person">
<email>chutzpah@gentoo.org</email>
<name>Patrick McLean</name>
</maintainer>
<origin>gentoo-staging</origin>
</pkgmetadata>
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-group
ACCT_GROUP_ID=357
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="person">
<email>chutzpah@gentoo.org</email>
<name>Patrick McLean</name>
</maintainer>
<origin>gentoo-staging</origin>
</pkgmetadata>
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit acct-user
DESCRIPTION="User for nss-pam-ldapd"
ACCT_USER_ID=357
ACCT_USER_GROUPS=( nslcd )
acct-user_add_deps
......@@ -12,7 +12,7 @@ SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="alsa ao +espeak flite nas pulseaudio python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
......
DIST Lmod-8.4.2.tar.gz 19905835 BLAKE2B cccb2688ae924e0a90f88ff4aa85091350a5549881450ace29c7f84658ccaf006001324589b0f370b78da05d4d5642e76d610f0d97394a9a35a64d9165d2547f SHA512 394680b11d7de0ddd3b794308fc702718233f799461a0f96f8515101d91d8ad2ddebfc449618bb6f1037ae3d3c9de4cffa679d7405ddb9be006b3d1f77975b21
DIST Lmod-8.4.3.tar.gz 19924936 BLAKE2B 0cb6986081e8cf273e23ff657a91f48a8722a33ae7f02df2269f3b697b2fc8001b9520f7df5b52791e6e3365e742ae66b3924abeba1f8fc0fff3b80a9c0d6c05 SHA512 cb6e91d4193155e43ab8145ee5dee166ddbdd66abff94b3c393c5e927c763b8ed401bbff9563c784be6e829108019dcfc6d0e5cf0cae6454c9b58f16e753eb57
DIST Lmod-8.4.4.tar.gz 19925952 BLAKE2B dd41227dce16d668dbcda40015b1c6b42f4bf57addc6fd116ae73bebbbb4f12bf014af5a1eace0d45d16777b41a80e2f853254a90715d5681cd0924ca40edef8 SHA512 a7342bcdac61c79b2c82fde4e98bac7bc2e182f9db9ff29ba34bd3e0583fc226833c276ddbedf1fcb7430ca4226f44f87fe68e44bb331a449cd61c6e396cfcde
DIST ansible-2.9.12.tar.gz 14260349 BLAKE2B 6d7fdc82489df755196b890b39c166e9639c94e4238b4bf33686a3ab17fcc92c6b3a05f80e1276795b966aaa318ec7d9003099950102c014adb1a5d730928633 SHA512 6c05c49e363d4d68516dfea448cead3e2c281d1288c9467a0b6dd083504f303df694ed1c5957ae6582b28acc937d12d13333254328e13bac430b9b7fa4354f23
DIST ansible-2.9.13.tar.gz 14261322 BLAKE2B 5de939a99cd703eaf240f536a9a4b707e3931364647782dde2bbebd5b755253594cbb1cf8c4e9f22a14fca85c9f018ee6ea26bce1cbe2145ba72e5f5ec313670 SHA512 cb08adf62df0f3650425a5d960baadd7439c7c1e95b8f9df3d08e7504f9622b9e5f7104b8700b0f1e9fe318d349a6a5728e9178f0193fb4a190456e30a2f1eb2
DIST ansible-base-2.10.0.tar.gz 5775091 BLAKE2B 2a087b1a9d675c5218e8700f5b455ff280a5dc6e66b575a47755b9936c54594300e3c22acadbe14acfd335c3be788e3d63f6ad3c5c51650cbc036c77ceec41ef SHA512 f9e9631f9ce77e55b06d01814422cbc0ca170e3fbbbd5886e4f87065b68b4d7eefe1c782f6dce14241cc548192c7b06ef778446636be02a342d4bd112000126e
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{5,6,7,8,9} )
inherit distutils-r1 eutils
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
HOMEPAGE="https://ansible.com/"
SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
IUSE="doc test"
RESTRICT="test"
RDEPEND="
dev-python/paramiko[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/netaddr[${PYTHON_USEDEP}]
dev-python/pexpect[${PYTHON_USEDEP}]
net-misc/sshpass
virtual/ssh
"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
doc? (
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
)
test? (
${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
dev-python/passlib[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/unittest2[${PYTHON_USEDEP}]
dev-vcs/git
)"
python_compile_all() {
if use doc; then
cd docs/docsite || die
export CPUS=4
emake -f Makefile.sphinx html
fi
}
python_test() {
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
}
python_install_all() {
use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
distutils-r1_python_install_all
dodoc -r examples
}
DIST apachetop-0.12.6.tar.gz 126930 BLAKE2B 06d12cc72791920c959fa4ef8e18aa90f1f29a616389329685abf445f416cde9ce6edd2db5aaadaba51488033148e8109245200086a11422436ffe0aab1b4a40 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a
DIST apachetop-0.17.4.tar.gz 128153 BLAKE2B 7601ce98618d041f6fc67e528775ce79b63a726b765ff298d1d74a1dd22a4451be6c36669c7ab9bf82fb8c120a6930d2bbf03823de02a216c558c358c53c07be SHA512 b5115048f79c694344fd341631fe7739567ba3ce6e18514d0be250cb6f42e04c54d35cc023dea5258725fcbfbb6debdaa51b91d64ae3120e70f5b78a7989a330
DIST apachetop-0.18.4.tar.gz 128849 BLAKE2B 912f060984da326b2e005cc0e3eb99c28182bc6a0930e6781d5a0a990dbbe56b5dbfe871baea1c86a5ac2bc02faa1e583ca104d3c8bd00cc3617599601b2d8bd SHA512 e32f94ab6223578aa5b8c11083de762e8f916ba6d057d93f99208333632a8362b421c41fff76bf60a52f0b377a70d69c17ed02abfb95f86474ad3719016e59f7
DIST apachetop-0.19.7.tar.gz 132665 BLAKE2B 248247c361d1585de68a0a9adae22f98db72991babfb4a75f01fa67ef28443a3c04cf1da9c1ea34ed923599955b58959528cc9e0a881fbb7b463b1d64c0cb7bd SHA512 40d546facee23a9914483c06323940e219602518751d80f729d835c4dbf991c7d1dd9bcebcaa4ca6a2d64799d48c8a00d421bc324afc2959691c962113386969
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools
DESCRIPTION="A realtime Apache log analyzer"
HOMEPAGE="https://github.com/tessus/apachetop"
SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 hppa ~mips ppc sparc x86"
IUSE="fam pcre"
RDEPEND="
sys-libs/ncurses:0=
sys-libs/readline:0=
fam? ( virtual/fam )
pcre? ( dev-libs/libpcre )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-gcc41.patch
"${FILESDIR}"/${P}-configure.patch
"${FILESDIR}"/${P}-maxpathlen.patch
"${FILESDIR}"/${P}-ac_config_header.patch
"${FILESDIR}"/${P}-ncurses.patch
)
src_prepare() {
default
eautoreconf
}
src_configure() {
econf \
--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
--without-adns \
$(use_with fam) \
$(use_with pcre)
}
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools
DESCRIPTION="A realtime Apache log analyzer"
HOMEPAGE="https://github.com/tessus/apachetop"
SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
IUSE="fam pcre"
RDEPEND="
sys-libs/ncurses:0=
sys-libs/readline:0=
fam? ( virtual/fam )
pcre? ( dev-libs/libpcre )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
default
eautoreconf
}
src_configure() {
econf \
--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
--without-adns \
$(use_with fam) \
$(use_with pcre)
}
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools
DESCRIPTION="A realtime Apache log analyzer"
HOMEPAGE="https://github.com/tessus/apachetop"
SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
IUSE="fam pcre"
RDEPEND="
sys-libs/ncurses:0=
sys-libs/readline:0=
fam? ( virtual/fam )
pcre? ( dev-libs/libpcre )"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-0.18.4-tinfo.patch
)
src_prepare() {
default
eautoreconf
}
src_configure() {
econf \
--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
--without-adns \
$(use_with fam) \
$(use_with pcre)
}
......@@ -9,7 +9,7 @@ SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 hppa ~mips ~ppc sparc x86"
KEYWORDS="amd64 hppa ~mips ppc sparc x86"
IUSE="fam pcre"
RDEPEND="
......
diff -uNr apachetop-0.12.6.orig/configure.ac apachetop-0.12.6/configure.ac
--- apachetop-0.12.6.orig/configure.ac 2013-07-09 14:06:14.000000000 -0400
+++ apachetop-0.12.6/configure.ac 2013-07-09 14:07:36.000000000 -0400
@@ -6,7 +6,7 @@
AC_CONFIG_AUX_DIR(config)
#AC_CONFIG_MACRO_DIR(m4) # 2.58
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
# Add non-standard directories to the include path
Index: apachetop-0.12.6/configure.ac
===================================================================
--- apachetop-0.12.6.orig/configure.ac
+++ apachetop-0.12.6/configure.ac
@@ -52,48 +52,60 @@ AC_FUNC_VPRINTF
AC_CHECK_FUNCS([inet_aton memset strchr strdup kqueue strerror strstr])
# pcre {{{
-AC_ARG_WITH(pcre,
- [ --with-pcre=<path> prefix of pcre installation (eg /usr/local)],
- [
- CPPFLAGS="$CPPFLAGS -I $withval/include"
- LDFLAGS="$LDFLAGS -L $withval/lib"
- ]
-)
-
-AC_CHECK_HEADERS(pcre.h,
- AC_SEARCH_LIBS([pcre_compile], [pcre]) ,
- AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre])
-)
+AC_ARG_WITH([pcre],
+ [ --with-pcre=<path> prefix of pcre installation (eg /usr/local)],
+ [case "${withval}" in
+ yes) with_pcre="/usr";;
+ no) with_pcre="no";;
+ *) with_pcre="/usr";;
+ esac],
+ [with_pcre="/usr"])
+
+if test x$with_pcre != xno; then
+ CPPFLAGS="$CPPFLAGS -I $withval/include"
+ LDFLAGS="$LDFLAGS -L $withval/lib"
+ AC_CHECK_HEADERS(pcre.h,
+ AC_SEARCH_LIBS([pcre_compile], [pcre]),
+ AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre]))
+fi
# }}}
# fam {{{
-AC_ARG_WITH(fam,
- [ --with-fam=<path> prefix of fam installation (eg /usr/local)],
- [
- CPPFLAGS="$CPPFLAGS -I $withval/include"
- LDFLAGS="$LDFLAGS -L $withval/lib"
- ]
-)
-
-AC_CHECK_HEADERS(fam.h,
- AC_SEARCH_LIBS([FAMOpen], [fam]) ,
- AC_MSG_WARN([*** fam.h not found -- consider using --with-fam])
-)
+AC_ARG_WITH([fam],
+ [ --with-fam=<path> prefix of fam installation (eg /usr/local)],
+ [case "${withval}" in
+ yes) with_fam="/usr";;
+ no) with_fam="no";;
+ *) with_fam="/usr";;
+ esac],
+ [with_fam="/usr"])
+
+if test x$with_fam != xno; then
+ CPPFLAGS="$CPPFLAGS -I $with_fam/include"
+ LDFLAGS="$LDFLAGS -L $with_fam/lib"
+ AC_CHECK_HEADERS(fam.h,
+ AC_SEARCH_LIBS([FAMOpen], [fam]),
+ AC_MSG_WARN([*** fam.h not found -- consider using --with-fam]))
+fi
# }}}
# adns {{{
-AC_ARG_WITH(adns,
- [ --with-adns=<path> prefix of adns installation (eg /usr/local)],
- [
- CPPFLAGS="$CPPFLAGS -I $withval/include"
- LDFLAGS="$LDFLAGS -L $withval/lib"
- ]
-)
-
-AC_CHECK_HEADERS(adns.h,
- AC_SEARCH_LIBS([adns_submit], [adns]) ,
- AC_MSG_WARN([*** adns.h not found -- consider using --with-adns])
-)
+AC_ARG_WITH([adns],
+ [ --with-adns=<path> prefix of adns installation (eg /usr/local)],
+ [case "${withval}" in
+ yes) with_adns="/usr";;
+ no) with_adns="no";;
+ *) with_adns="/usr";;
+ esac],
+ [with_adns="/usr"])
+
+if test x$with_adns != xno; then
+ CPPFLAGS="$CPPFLAGS -I $with_adns/include"
+ LDFLAGS="$LDFLAGS -L $with_adns/lib"
+ AC_CHECK_HEADERS(adns.h,
+ AC_SEARCH_LIBS([adns_submit], [adns]),
+ AC_MSG_WARN([*** adns.h not found -- consider using --with-adns]))
+fi
# }}}
# --with-logfile {{{
--- a/src/resolver.h
+++ b/src/resolver.h
@@ -10,8 +10,8 @@
class Resolver
{
public:
- Resolver::Resolver(void);
- Resolver::~Resolver(void);
+ Resolver(void);
+ ~Resolver(void);
int add_request(char *request, enum resolver_action act);
Patch by Robert Scheck <robert@fedoraproject.org> for apachetop <= 0.12.6, which
adds some includes in order to have a real change to get MAXPATHLEN defined with
a valid value. Once MAXPATHLEN really gets filled with 128, it will just cause a
buffer overflow.
See Red Hat Bugzilla #446199 (https://bugzilla.redhat.com/show_bug.cgi?id=446199)
for more information. This patch should solve the mentioned bug report and should
be sane enough to get included by upstream of apachetop for the next release. It
is important to run autoheader before ./configure to get these changes activated.
--- apachetop-0.12.6/configure.ac 2005-10-27 18:39:25.000000000 +0200
+++ apachetop-0.12.6/configure.ac.maxpathlen 2008-06-21 16:00:38.000000000 +0200
@@ -34,7 +34,8 @@
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h \
- string.h strings.h sys/socket.h time.h sys/time.h])
+ string.h strings.h sys/socket.h time.h sys/time.h \
+ limits.h sys/param.h])
# Checks for typedefs, structures, and compiler characteristics.
#AC_HEADER_STDBOOL # not in 2.53?
--- apachetop-0.12.6/src/apachetop.h 2005-10-15 18:10:01.000000000 +0200
+++ apachetop-0.12.6/src/apachetop.h.maxpatlen 2008-06-21 16:02:00.000000000 +0200
@@ -89,8 +89,12 @@
#define getMIN(a,b) (a < b ? a : b)
#define getMAX(a,b) (a > b ? a : b)
-#ifndef MAXPATHLEN
-# define MAXPATHLEN 128
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
+#if HAVE_LIMITS_H
+# include <limits.h>
#endif
/* upon startup, each input file is put into an element of this array,
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
AC_CONFIG_SRCDIR(src/apachetop.cc)
AC_CONFIG_AUX_DIR(config)
-#AC_CONFIG_MACRO_DIR(m4) # 2.58
+AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
@@ -29,7 +29,6 @@
#AC_PROG_CC
#AC_PROG_CPP
AC_PROG_CXX
-AC_LANG_CPLUSPLUS
# Checks for header files.
AC_HEADER_STDC
@@ -120,24 +119,9 @@
AC_SEARCH_LIBS([socket], [socket])
AC_SEARCH_LIBS([inet_addr], [nsl])
-AC_SEARCH_LIBS([attron], [ncurses])
-AC_SEARCH_LIBS([tgetstr], [termcap])
-AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
- [] ,
- [
- AC_MSG_ERROR([No useful curses library found!])
- ]
-)
-AC_SEARCH_LIBS([readline], [readline],
- [
- AC_DEFINE(HAVE_READLINE,1,[Define if you have readline library])
- AC_SUBST(HAVE_READLINE)
- ] ,
- [
- AC_MSG_ERROR(readline library not found)
- ]
-)
+PKG_CHECK_MODULES([NCURSES], [ncurses])
+AX_LIB_READLINE
# everything is in CPPFLAGS up to this point, now we move to CXXFLAGS
--- a/m4/ax_lib_readline.m4
+++ b/m4/ax_lib_readline.m4
@@ -0,0 +1,107 @@
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_lib_readline.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_LIB_READLINE
+#
+# DESCRIPTION
+#
+# Searches for a readline compatible library. If found, defines
+# `HAVE_LIBREADLINE'. If the found library has the `add_history' function,
+# sets also `HAVE_READLINE_HISTORY'. Also checks for the locations of the
+# necessary include files and sets `HAVE_READLINE_H' or
+# `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
+# 'HAVE_HISTORY_H' if the corresponding include files exists.
+#
+# The libraries that may be readline compatible are `libedit',
+# `libeditline' and `libreadline'. Sometimes we need to link a termcap
+# library for readline to work, this macro tests these cases too by trying
+# to link with `libtermcap', `libcurses' or `libncurses' before giving up.
+#
+# Here is an example of how to use the information provided by this macro
+# to perform the necessary includes or declarations in a C file:
+#
+# #ifdef HAVE_LIBREADLINE
+# # if defined(HAVE_READLINE_READLINE_H)
+# # include <readline/readline.h>
+# # elif defined(HAVE_READLINE_H)
+# # include <readline.h>
+# # else /* !defined(HAVE_READLINE_H) */
+# extern char *readline ();
+# # endif /* !defined(HAVE_READLINE_H) */
+# char *cmdline = NULL;
+# #else /* !defined(HAVE_READLINE_READLINE_H) */
+# /* no readline */
+# #endif /* HAVE_LIBREADLINE */
+#
+# #ifdef HAVE_READLINE_HISTORY
+# # if defined(HAVE_READLINE_HISTORY_H)
+# # include <readline/history.h>
+# # elif defined(HAVE_HISTORY_H)
+# # include <history.h>
+# # else /* !defined(HAVE_HISTORY_H) */
+# extern void add_history ();
+# extern int write_history ();
+# extern int read_history ();
+# # endif /* defined(HAVE_READLINE_HISTORY_H) */
+# /* no history */
+# #endif /* HAVE_READLINE_HISTORY */
+#
+# LICENSE
+#
+# Copyright (c) 2008 Ville Laurikari <vl@iki.fi>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 7
+
+AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE])
+AC_DEFUN([AX_LIB_READLINE], [
+ AC_CACHE_CHECK([for a readline compatible library],
+ ax_cv_lib_readline, [
+ ORIG_LIBS="$LIBS"
+ for readline_lib in readline edit editline; do
+ for termcap_lib in "" termcap curses ncurses; do
+ if test -z "$termcap_lib"; then
+ TRY_LIB="-l$readline_lib"
+ else
+ TRY_LIB="-l$readline_lib -l$termcap_lib"
+ fi
+ LIBS="$ORIG_LIBS $TRY_LIB"
+ AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB")
+ if test -n "$ax_cv_lib_readline"; then