diff options
| author | Michael Vogt <mvo@debian.org> | 2014-07-08 13:37:11 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-07-08 13:37:11 +0200 |
| commit | 2830b8436ac8a6f2f3dac4ce2cd030c24eebce04 (patch) | |
| tree | dcdaba1119e595edc8842c2e8746acdf25af6260 /configure.ac | |
| parent | bcc352afa890788825dfbd1454847456748f511f (diff) | |
| parent | 521dd27dc33c8b2a6947a76872841f4254df4e58 (diff) | |
| download | apt-2830b8436ac8a6f2f3dac4ce2cd030c24eebce04.tar.gz | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/deb/deblistparser.cc
doc/po/apt-doc.pot
doc/po/de.po
doc/po/es.po
doc/po/fr.po
doc/po/it.po
doc/po/ja.po
doc/po/pl.po
doc/po/pt.po
doc/po/pt_BR.po
po/da.po
po/mr.po
po/vi.po
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 9ccf1238d..ec0c00b41 100644 --- a/configure.ac +++ b/configure.ac @@ -172,15 +172,12 @@ AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(normal)], [AC_MSG_ERROR("not found.")]) ]) -dnl Check for debiandoc -AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html) -AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) - dnl Check for doxygen AC_PATH_PROG(DOXYGEN, doxygen) dnl Check for the XSLTProc tool needed to build man pages together with po4a AC_PATH_PROG(XSLTPROC,xsltproc) +AC_PATH_PROG(W3M, w3m) dnl Check for the po4a tool needed to build man pages AC_PATH_PROG(PO4A,po4a) |