blob: 364baaa0001395607a98064fde34894d262ad543 [file] [log] [blame]
Andrew Geisslerf103a7f2021-05-07 16:09:40 -05001From b71eb384522b5ce4629dee6e8be257fb4880fef3 Mon Sep 17 00:00:00 2001
2From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08003Date: Thu, 20 Apr 2017 14:25:18 +0200
4
5---
Andrew Geisslerf103a7f2021-05-07 16:09:40 -05006 Makefile.am | 1 -
7 configure.ac | 17 -----------------
8 2 files changed, 18 deletions(-)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08009
10diff --git a/Makefile.am b/Makefile.am
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050011index 4a3ead6..a12cb98 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080012--- a/Makefile.am
13+++ b/Makefile.am
14@@ -2,7 +2,6 @@ SUBDIRS = \
15 src \
16 data \
17 etc \
18- docs \
19 m4macros \
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050020 tests \
21 scripts
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080022diff --git a/configure.ac b/configure.ac
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050023index 3849383..9f3a633 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080024--- a/configure.ac
25+++ b/configure.ac
Andrew Geissler78b72792022-06-14 06:47:25 -050026@@ -179,18 +179,6 @@ AC_SUBST(CPPFLAGS)
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050027 AC_SUBST(LIBS)
28 AC_SUBST(ADDITIONAL_OBJECTS)
Brad Bishop6e60e8b2018-02-01 10:27:11 -050029
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050030-if test x"$manpage_support_enabled" = x"yes"; then
31-AC_PATH_PROG(POD2MAN, pod2man, no)
Brad Bishop6e60e8b2018-02-01 10:27:11 -050032-
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050033-if test "x$POD2MAN" = "xno" && \
34- ! test -e docs/man5/tinyproxy.conf.5 -a -e docs/man8/tinyproxy.8 ; then
35-AC_MSG_ERROR([
36- manpage generation requested, but neither pod2man
37- nor pre-generated manpages found.
38- Use --disable-manpage-support if you want to compile anyway.])
39-fi
40-fi #manpage_support_enabled
41-
42 AM_CONDITIONAL(HAVE_POD2MAN, test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno")
43
44 AC_PATH_PROG(GPERF, gperf, no)
Andrew Geissler78b72792022-06-14 06:47:25 -050045@@ -216,11 +204,6 @@ src/Makefile
Brad Bishop6e60e8b2018-02-01 10:27:11 -050046 data/Makefile
47 data/templates/Makefile
48 etc/Makefile
49-docs/Makefile
50-docs/man5/Makefile
51-docs/man5/tinyproxy.conf.txt
52-docs/man8/Makefile
53-docs/man8/tinyproxy.txt
54 m4macros/Makefile
55 tests/Makefile
56 tests/scripts/Makefile
Andrew Geisslerf103a7f2021-05-07 16:09:40 -050057--
582.25.1
59