commit: 258d621488916857113d5a765198d020783c766f
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 13:44:53 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:21:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=258d6214
net-print/cups-filters: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
net-print/cups-filters/Manifest | 2 -
.../cups-filters/cups-filters-1.28.10-r3.ebuild | 149 ---------------------
net-print/cups-filters/cups-filters-1.28.14.ebuild | 128 ------------------
...rs-1.28.2-make-missing-testfont-non-fatal.patch | 14 --
net-print/cups/files/cups-1.4.4-nostrip.patch | 14 --
.../cups/files/cups-2.2.6-fix-install-perms.patch | 18 ---
.../files/cups-2.3.3-enforcing-read-limits.patch | 29 ----
.../cups/files/cups-2.3.3-ipp-retry-validate.patch | 43 ------
net-print/cups/files/cups-2.3.3-manpage.patch | 23 ----
net-print/cups/files/cups-2.3.3-timeout.patch | 26 ----
net-print/cups/files/cups-2.3.3-user-AR.patch | 22 ---
11 files changed, 468 deletions(-)
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index bc649a3fb8b4..1093167a1966 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,3 +1 @@
-DIST cups-filters-1.28.10.tar.xz 1503924 BLAKE2B
b745ad9d35e375411d43acc8936a7be3197deda26d64c3fcdf792abf751452a83ab4e77b25336509a4d15a7db3dd142c94f3fd108f514d4956ac62f00310b263
SHA512
d6079633e10c3cfdc744491df03adc73d98dab0d9c0c6d3bc426b751545ae3434ea875e0841cec9358c19336347903f2832b5f801700b371cc1959e031bfa659
-DIST cups-filters-1.28.14.tar.xz 1510944 BLAKE2B
653f68a39ed16d3a8298e5784aebebead224a0ee08071add702bb02fc987f3c4d454793531db262d9a44618f4fe29a7ce0144cfb8fe77634e9b7c222de21fe62
SHA512
a128858ac582da1322edad1cfca02bb6e5a077a4d3ca61d9e33e07b83e5015bb1a11571d30c66069f503031a6b55a82d7867cd171a7090fa729d894441f7abdd
DIST cups-filters-1.28.15.tar.xz 1511452 BLAKE2B
2ed495f063197955456c07c6c06747093997afce53c15e19d081f2e53e6af9a76a41094d2356a1cd7533c3bb63bfb6257792b71ee14121a0daf5863b3b5cd76f
SHA512
cc8d43bba6edb2b839f3be5fcbcdeb7633ed0f0f0c2737bcc6957cf95fb4ded8ee412358cc95fdbf289ae897dd0b7f32e689f02d191a8f15930eb4d2deefd74c
diff --git a/net-print/cups-filters/cups-filters-1.28.10-r3.ebuild
b/net-print/cups-filters/cups-filters-1.28.10-r3.ebuild
deleted file mode 100644
index ac0eb472327d..000000000000
--- a/net-print/cups-filters/cups-filters-1.28.10-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git";
-else
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz";
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv
~s390 sparc x86"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters";
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff
zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils]
- >=app-text/qpdf-8.3.0:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- ldap? ( net-nds/openldap:= )
- pdf? ( app-text/mupdf )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/gdbus-codegen
- >=sys-devel/gettext-0.18.3
- virtual/pkgconfig
- test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
- local need_eautoreconf=
-
- default
-
- if ! use test ; then
- eapply
"${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch
- need_eautoreconf=yes
- elif [[ "${PV}" == "9999" ]] ; then
- need_eautoreconf=yes
- fi
-
- [[ -n ${need_eautoreconf} ]] && eautoreconf
-}
-
-src_configure() {
- # Bug #626800
- append-cxxflags -std=c++11
-
- local myeconfargs=(
- --enable-imagefilters
- --localstatedir="${EPREFIX}"/var
- --with-browseremoteprotocols=DNSSD,CUPS
- --with-cups-rundir="${EPREFIX}"/run/cups
- --with-fontdir="fonts/conf.avail"
- --with-pdftops=pdftops
- --with-rcdir=no
- --without-php
- --disable-static
- $(use_enable dbus)
- $(use_enable foomatic)
- $(use_enable ldap)
- $(use_enable pclm)
- $(use_enable pdf mutool)
- $(use_enable postscript ghostscript)
- $(use_enable zeroconf avahi)
- $(use_with jpeg)
- $(use_with png)
- $(use_with tiff)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null || die
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null || die
- fi
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null || die
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null || die
- fi
-
- if use postscript; then
- # workaround: some printer drivers still require pstoraster and
pstopxl, bug #383831
- dosym gstoraster /usr/libexec/cups/filter/pstoraster
- dosym gstopxl /usr/libexec/cups/filter/pstopxl
- fi
-
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
- cp "${FILESDIR}"/cups-browsed.init.d-r2 "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g'
"${T}"/cups-browsed || die
- sed -i -e 's:cups\.service
avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}"/utils/cups-browsed.service
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters.
Please do that ONLY if absolutely"
- ewarn "necessary. net-print/foomatic-filters as a replacement
is deprecated and unmaintained."
- fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.28.14.ebuild
b/net-print/cups-filters/cups-filters-1.28.14.ebuild
deleted file mode 100644
index 58faa6fecaac..000000000000
--- a/net-print/cups-filters/cups-filters-1.28.14.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL=no
-inherit perl-module systemd flag-o-matic
-
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters";
-SRC_URI="https://www.openprinting.org/download/${PN}/${P}.tar.xz";
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390
~sparc ~x86"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff
zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils]
- >=app-text/qpdf-8.3.0:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- ldap? ( net-nds/openldap:= )
- pdf? ( app-text/mupdf )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/gdbus-codegen
- >=sys-devel/gettext-0.18.3
- virtual/pkgconfig
- test? ( media-fonts/dejavu )
-"
-
-src_configure() {
- # Bug #626800
- append-cxxflags -std=c++11
-
- local myeconfargs=(
- --enable-imagefilters
- --localstatedir="${EPREFIX}"/var
- --with-browseremoteprotocols=DNSSD,CUPS
- --with-cups-rundir="${EPREFIX}"/run/cups
- --with-fontdir="fonts/conf.avail"
- --with-pdftops=pdftops
- --with-rcdir=no
- --without-php
- --disable-static
- $(use_enable dbus)
- $(use_enable foomatic)
- $(use_enable ldap)
- $(use_enable pclm)
- $(use_enable pdf mutool)
- $(use_enable postscript ghostscript)
- $(use_enable zeroconf avahi)
- $(use_with jpeg)
- $(use_with png)
- $(use_with tiff)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null || die
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null || die
- fi
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null || die
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null || die
- fi
-
- if use postscript; then
- # workaround: some printer drivers still require pstoraster and
pstopxl, bug #383831
- dosym gstoraster /usr/libexec/cups/filter/pstoraster
- dosym gstopxl /usr/libexec/cups/filter/pstopxl
- fi
-
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
- cp "${FILESDIR}"/cups-browsed.init.d-r2 "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g'
"${T}"/cups-browsed || die
- sed -i -e 's:cups\.service
avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}"/utils/cups-browsed.service
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters.
Please do that ONLY if absolutely"
- ewarn "necessary. net-print/foomatic-filters as a replacement
is deprecated and unmaintained."
- fi
-}
diff --git
a/net-print/cups-filters/files/cups-filters-1.28.2-make-missing-testfont-non-fatal.patch
b/net-print/cups-filters/files/cups-filters-1.28.2-make-missing-testfont-non-fatal.patch
deleted file mode 100644
index 8447929a5246..000000000000
---
a/net-print/cups-filters/files/cups-filters-1.28.2-make-missing-testfont-non-fatal.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- cups-filters-1.28.2/configure.ac
-+++ cups-filters-1.28.2/configure.ac
-@@ -790,7 +790,10 @@
- )
-
- AS_IF([test "x$cross_compiling" != "xyes" && ! test -f
"$with_test_font_path"],
-- [AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a
package providing it.)]
-+ [
-+ AC_MSG_WARN(DejaVuSans.ttf font file is missing. Expect test
failures!)]
-+ AC_DEFINE([TESTFONT])
-+ ]
- )
- AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used
in tests])
-
diff --git a/net-print/cups/files/cups-1.4.4-nostrip.patch
b/net-print/cups/files/cups-1.4.4-nostrip.patch
deleted file mode 100644
index cd2b07042cec..000000000000
--- a/net-print/cups/files/cups-1.4.4-nostrip.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Source: Gentoo
-
-diff -urN cups-1.4.4/config-scripts/cups-compiler.m4
cups-1.4.4.new/config-scripts/cups-compiler.m4
---- cups-1.4.4/config-scripts/cups-compiler.m4 2009-05-17 02:13:47.000000000
+0200
-+++ cups-1.4.4.new/config-scripts/cups-compiler.m4 2010-08-12
19:19:45.937020635 +0200
-@@ -30,7 +30,7 @@
- if test x$enable_debug = xyes; then
- OPTIM="-g"
- else
-- INSTALL_STRIP="-s"
-+ INSTALL_STRIP=""
- fi
-
- dnl Debug printfs can slow things down, so provide a separate option for that
diff --git a/net-print/cups/files/cups-2.2.6-fix-install-perms.patch
b/net-print/cups/files/cups-2.2.6-fix-install-perms.patch
deleted file mode 100644
index a8f007446f2d..000000000000
--- a/net-print/cups/files/cups-2.2.6-fix-install-perms.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cups-2.2.6/Makedefs.in
-+++ cups-2.2.6/Makedefs.in
-@@ -49,12 +49,12 @@
- #
-
- INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
@INSTALL_STRIP@
--INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@
- INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
--INSTALL_DATA = $(INSTALL) -c -m 444
-+INSTALL_DATA = $(INSTALL) -c -m 644
- INSTALL_DIR = $(INSTALL) -d
- INSTALL_LIB = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
@INSTALL_STRIP@
--INSTALL_MAN = $(INSTALL) -c -m 444
-+INSTALL_MAN = $(INSTALL) -c -m 644
- INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
-
- #
diff --git a/net-print/cups/files/cups-2.3.3-enforcing-read-limits.patch
b/net-print/cups/files/cups-2.3.3-enforcing-read-limits.patch
deleted file mode 100644
index 1782d122ae55..000000000000
--- a/net-print/cups/files/cups-2.3.3-enforcing-read-limits.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Zdenek Dohnal <zdoh...@redhat.com>
-Date: Tue, 13 Apr 2021 15:47:37 +0200
-Subject: backend/usb-libusb.c: Revert enforcing read limits
-
-This commit reverts the change introduced by 2.2.12 [1] - its
-implementation caused a regression with Lexmark filters.
-
-[1]
https://github.com/apple/cups/commit/35e927f83529cd9b4bc37bcd418c50e307fced35
-
-Origin: upstream, https://github.com/OpenPrinting/cups/pull/174
-Bug: https://github.com/OpenPrinting/cups/issues/72
----
- backend/usb-libusb.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
-index fbb0d9d..89b5182 100644
---- a/backend/usb-libusb.c
-+++ b/backend/usb-libusb.c
-@@ -1721,7 +1721,8 @@ static void *read_thread(void *reference)
- * Make sure this loop executes no more than once every 250 miliseconds...
- */
-
-- if ((g.wait_eof || !g.read_thread_stop))
-+ if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) &&
-+ (g.wait_eof || !g.read_thread_stop))
- usleep(250000);
- }
- while (g.wait_eof || !g.read_thread_stop);
diff --git a/net-print/cups/files/cups-2.3.3-ipp-retry-validate.patch
b/net-print/cups/files/cups-2.3.3-ipp-retry-validate.patch
deleted file mode 100644
index a677090cd91c..000000000000
--- a/net-print/cups/files/cups-2.3.3-ipp-retry-validate.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6e6999b1f74457b7fd6057a31f1d3606de19a05b Mon Sep 17 00:00:00 2001
-From: Michael R Sweet <michael.r.sw...@gmail.com>
-Date: Fri, 9 Apr 2021 10:20:04 -0400
-Subject: [PATCH] Retry Validate-Job once, if needed (Issue #132)
-
----
- CHANGES.md | 1 +
- backend/ipp.c | 14 +++++++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/backend/ipp.c b/backend/ipp.c
-index 63353a66d..020ab7fd4 100644
---- a/backend/ipp.c
-+++ b/backend/ipp.c
-@@ -256,6 +257,7 @@ main(int argc, /* I - Number
of command-line args */
- get_job_attrs = 0, /* Does printer support
Get-Job-Attributes? */
- send_document = 0, /* Does printer support Send-Document?
*/
- validate_job = 0, /* Does printer support Validate-Job? */
-+ validate_retried = 0, /* Was Validate-Job request retried? */
- copies, /* Number of copies for job */
- copies_remaining; /* Number of copies remaining */
- const char *content_type, /* CONTENT_TYPE environment variable */
-@@ -1559,7 +1561,17 @@ main(int argc, /* I - Number
of command-line args */
- ipp_status == IPP_STATUS_ERROR_BAD_REQUEST)
- break;
- else if (job_auth == NULL && ipp_status > IPP_STATUS_ERROR_BAD_REQUEST)
-+ {
-+ if (!validate_retried)
-+ {
-+ // Retry Validate-Job operation once, to work around known printer
bug...
-+ validate_retried = 1;
-+ sleep(10);
-+ continue;
-+ }
-+
- goto cleanup;
-+ }
- }
-
- /*
---
-2.26.3
-
diff --git a/net-print/cups/files/cups-2.3.3-manpage.patch
b/net-print/cups/files/cups-2.3.3-manpage.patch
deleted file mode 100644
index db22adeeec4d..000000000000
--- a/net-print/cups/files/cups-2.3.3-manpage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Didier Raboud <o...@debian.org>
-Date: Fri, 12 Feb 2021 13:47:22 +0100
-Subject: Let cups.1 point to client.conf.5, not client.conf.7
-
-Bug: https://github.com/OpenPrinting/cups/pull/92
-Closes: #982303
----
- man/cups.1 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/cups.1 b/man/cups.1
-index 706620d..751ad9a 100644
---- a/man/cups.1
-+++ b/man/cups.1
-@@ -125,7 +125,7 @@ Printers that do not support IPP can be supported using
applications such as
- .BR ippeveprinter (1).
- .SH SEE ALSO
- .BR cancel (1),
--.BR client.conf (7),
-+.BR client.conf (5),
- .BR cupsctl (8),
- .BR cupsd (8),
- .BR lp (1),
diff --git a/net-print/cups/files/cups-2.3.3-timeout.patch
b/net-print/cups/files/cups-2.3.3-timeout.patch
deleted file mode 100644
index 280f71f2fad2..000000000000
--- a/net-print/cups/files/cups-2.3.3-timeout.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Zdenek Dohnal <zdoh...@redhat.com>
-Date: Tue, 13 Apr 2021 15:44:14 +0200
-Subject: backend/usb-libusb.c: Use 60s timeout for reading at backchannel
-
-Some older models malfunction if timeout is too short.
-
-Origin: upstream, https://github.com/OpenPrinting/cups/pull/174
-Bug: https://github.com/OpenPrinting/cups/issues/160
-Bug-Debian: https://bugs.debian.org/989073
----
- backend/usb-libusb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
-index d6b0eb4..fbb0d9d 100644
---- a/backend/usb-libusb.c
-+++ b/backend/usb-libusb.c
-@@ -1704,7 +1704,7 @@ static void *read_thread(void *reference)
- readstatus = libusb_bulk_transfer(g.printer->handle,
- g.printer->read_endp,
- readbuffer, rbytes,
-- &rbytes, 250);
-+ &rbytes, 60000);
- if (readstatus == LIBUSB_SUCCESS && rbytes > 0)
- {
- fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n",
(int)rbytes);
diff --git a/net-print/cups/files/cups-2.3.3-user-AR.patch
b/net-print/cups/files/cups-2.3.3-user-AR.patch
deleted file mode 100644
index 0e52adb567d7..000000000000
--- a/net-print/cups/files/cups-2.3.3-user-AR.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-AC_PATH_PROG does not search tuple prefixes.
---- a/config-scripts/cups-common.m4
-+++ b/config-scripts/cups-common.m4
-@@ -37,15 +37,15 @@ AC_PROG_CC(clang cc gcc)
- AC_PROG_CPP
- AC_PROG_CXX(clang++ c++ g++)
- AC_PROG_RANLIB
--AC_PATH_PROG(AR,ar)
-+AC_CHECK_TOOL(AR,ar)
- AC_PATH_PROG(CHMOD,chmod)
- AC_PATH_PROG(GZIPPROG,gzip)
- AC_MSG_CHECKING(for install-sh script)
- INSTALL="`pwd`/install-sh"
- AC_SUBST(INSTALL)
- AC_MSG_RESULT(using $INSTALL)
--AC_PATH_PROG(LD,ld)
--AC_PATH_PROG(LN,ln)
-+AC_CHECK_TOOL(LD,ld)
-+AC_CHECK_TOOL(LN,ln)
- AC_PATH_PROG(MKDIR,mkdir)
- AC_PATH_PROG(MV,mv)
- AC_PATH_PROG(RM,rm)
