| From 3cf56b36db78679273f61ba78fbbf7f3fab52f68 Mon Sep 17 00:00:00 2001 |
| From: Marcin Juszkiewicz <hrw@openedhand.com> |
| Date: Fri, 8 Jun 2007 08:35:12 +0000 |
| Subject: [PATCH] mtools: imported from OE |
| |
| Upstream-Status: Inappropriate [licensing] |
| |
| --- |
| Makefile.in | 11 ++++++----- |
| configure.in | 27 +++++++++++++++++++++++++++ |
| 2 files changed, 33 insertions(+), 5 deletions(-) |
| |
| diff --git a/Makefile.in b/Makefile.in |
| index 616d59f..85b5b1d 100644 |
| --- a/Makefile.in |
| +++ b/Makefile.in |
| @@ -26,10 +26,11 @@ USERCFLAGS = |
| USERLDFLAGS = |
| USERLDLIBS = |
| |
| -MAKEINFO = makeinfo |
| -TEXI2DVI = texi2dvi |
| -TEXI2PDF = texi2pdf |
| -TEXI2HTML = texi2html |
| +MAKEINFO = @MAKEINFO@ |
| +TEXI2DVI = @TEXI2DVI@ |
| +TEXI2PDF = @TEXI2PDF@ |
| +TEXI2HTML = @TEXI2HTML@ |
| +DVI2PS = @DVI2PS@ |
| |
| |
| # do not edit below this line |
| @@ -199,7 +200,7 @@ dvi: mtools.dvi |
| |
| ps: mtools.ps |
| %.ps: %.dvi |
| - dvips -f < $< > $@ |
| + $(DVI2PS) -f < $< > $@ |
| |
| pdf: mtools.pdf |
| %.pdf: %.texi sysconfdir.texi |
| diff --git a/configure.in b/configure.in |
| index 5ff75c1..c0f7440 100644 |
| --- a/configure.in |
| +++ b/configure.in |
| @@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM |
| AC_C_CONST |
| AC_C_INLINE |
| |
| +AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, ) |
| +if test "x$MAKEINFO" = "x"; then |
| + MAKEINFO="@echo makeinfo missing; true" |
| +fi |
| +AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, ) |
| +if test "x$TEXI2DVI" = "x"; then |
| + TEXI2DVI="@echo texi2dvi missing; true" |
| +fi |
| +AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, ) |
| +if test "x$TEXI2PDF" = "x"; then |
| + TEXI2PDF="@echo texi2pdf missing; true" |
| +fi |
| +AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html, ) |
| +if test "x$TEXI2HTML" = "x"; then |
| + TEXI2HTML="@echo texi2html missing; true" |
| +fi |
| +AC_CHECK_PROG(DVI2PS, dvi2ps, dvi2ps, ) |
| +if test "x$DVI2PS" = "x"; then |
| + DVI2PS="@echo dvi2ps missing; true" |
| +fi |
| + |
| +AC_SUBST(MAKEINFO) |
| +AC_SUBST(TEXI2DVI) |
| +AC_SUBST(TEXI2PDF) |
| +AC_SUBST(TEXI2HTML) |
| +AC_SUBST(DVI2PS) |
| + |
| dnl Check for configuration options |
| dnl Enable OS/2 extended density format disks |
| AC_ARG_ENABLE(xdf, |