Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 1 | From 3cf56b36db78679273f61ba78fbbf7f3fab52f68 Mon Sep 17 00:00:00 2001 |
| 2 | From: Marcin Juszkiewicz <hrw@openedhand.com> |
| 3 | Date: Fri, 8 Jun 2007 08:35:12 +0000 |
| 4 | Subject: [PATCH] mtools: imported from OE |
| 5 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 6 | Upstream-Status: Inappropriate [licensing] |
| 7 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 8 | --- |
| 9 | Makefile.in | 11 ++++++----- |
| 10 | configure.in | 27 +++++++++++++++++++++++++++ |
| 11 | 2 files changed, 33 insertions(+), 5 deletions(-) |
| 12 | |
| 13 | diff --git a/Makefile.in b/Makefile.in |
| 14 | index 616d59f..85b5b1d 100644 |
| 15 | --- a/Makefile.in |
| 16 | +++ b/Makefile.in |
| 17 | @@ -26,10 +26,11 @@ USERCFLAGS = |
| 18 | USERLDFLAGS = |
| 19 | USERLDLIBS = |
| 20 | |
| 21 | -MAKEINFO = makeinfo |
| 22 | -TEXI2DVI = texi2dvi |
| 23 | -TEXI2PDF = texi2pdf |
| 24 | -TEXI2HTML = texi2html |
| 25 | +MAKEINFO = @MAKEINFO@ |
| 26 | +TEXI2DVI = @TEXI2DVI@ |
| 27 | +TEXI2PDF = @TEXI2PDF@ |
| 28 | +TEXI2HTML = @TEXI2HTML@ |
| 29 | +DVI2PS = @DVI2PS@ |
| 30 | |
| 31 | |
| 32 | # do not edit below this line |
| 33 | @@ -199,7 +200,7 @@ dvi: mtools.dvi |
| 34 | |
| 35 | ps: mtools.ps |
| 36 | %.ps: %.dvi |
| 37 | - dvips -f < $< > $@ |
| 38 | + $(DVI2PS) -f < $< > $@ |
| 39 | |
| 40 | pdf: mtools.pdf |
| 41 | %.pdf: %.texi sysconfdir.texi |
| 42 | diff --git a/configure.in b/configure.in |
| 43 | index 5ff75c1..c0f7440 100644 |
| 44 | --- a/configure.in |
| 45 | +++ b/configure.in |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 46 | @@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 47 | AC_C_CONST |
| 48 | AC_C_INLINE |
| 49 | |
| 50 | +AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, ) |
| 51 | +if test "x$MAKEINFO" = "x"; then |
| 52 | + MAKEINFO="@echo makeinfo missing; true" |
| 53 | +fi |
| 54 | +AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, ) |
| 55 | +if test "x$TEXI2DVI" = "x"; then |
| 56 | + TEXI2DVI="@echo texi2dvi missing; true" |
| 57 | +fi |
| 58 | +AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, ) |
| 59 | +if test "x$TEXI2PDF" = "x"; then |
| 60 | + TEXI2PDF="@echo texi2pdf missing; true" |
| 61 | +fi |
| 62 | +AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html, ) |
| 63 | +if test "x$TEXI2HTML" = "x"; then |
| 64 | + TEXI2HTML="@echo texi2html missing; true" |
| 65 | +fi |
| 66 | +AC_CHECK_PROG(DVI2PS, dvi2ps, dvi2ps, ) |
| 67 | +if test "x$DVI2PS" = "x"; then |
| 68 | + DVI2PS="@echo dvi2ps missing; true" |
| 69 | +fi |
| 70 | + |
| 71 | +AC_SUBST(MAKEINFO) |
| 72 | +AC_SUBST(TEXI2DVI) |
| 73 | +AC_SUBST(TEXI2PDF) |
| 74 | +AC_SUBST(TEXI2HTML) |
| 75 | +AC_SUBST(DVI2PS) |
| 76 | + |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 77 | dnl Check for configuration options |
| 78 | dnl Enable OS/2 extended density format disks |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 79 | AC_ARG_ENABLE(xdf, |