diff options
author | Bruno Haible <bruno@clisp.org> | 2001-04-17 21:02:27 +0000 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2001-04-17 21:02:27 +0000 |
commit | 683f768b49e98f38004b89a360f68a5f9a6f32f3 (patch) | |
tree | 377ebd83f532bbfde46fcd8416225e924f93a5fa | |
parent | 66d0d2997e9c7b0684ed5e756c6d68b6abb66f74 (diff) | |
download | external_gettext-683f768b49e98f38004b89a360f68a5f9a6f32f3.zip external_gettext-683f768b49e98f38004b89a360f68a5f9a6f32f3.tar.gz external_gettext-683f768b49e98f38004b89a360f68a5f9a6f32f3.tar.bz2 |
Don't fail if texi2html is not found.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.in | 7 | ||||
-rw-r--r-- | doc/ChangeLog | 23 | ||||
-rw-r--r-- | doc/Makefile.am | 14 |
4 files changed, 36 insertions, 12 deletions
@@ -1,5 +1,9 @@ 2001-04-17 Bruno Haible <haible@clisp.cons.org> + * configure.in: Check for dvips, texi2pdf, texi2html. + +2001-04-17 Bruno Haible <haible@clisp.cons.org> + * configure.in: Bump version number to 0.10.37. (RELEASE_DATE): Bump. diff --git a/configure.in b/configure.in index f5afb1c..bf5795d 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.13) -AC_REVISION($Revision: 1.23 $) +AC_REVISION($Revision: 1.24 $) AC_INIT(src/msgfmt.c) AM_INIT_AUTOMAKE(gettext, 0.10.37) RELEASE_DATE=2001-04-17 dnl in "date +%Y-%m-%d" format @@ -89,6 +89,11 @@ AC_SUBST(ACLOCAL_VERSION) aclocaldir='${datadir}/aclocal' AC_SUBST(aclocaldir) +dnl Check for tools needed for formatting the documentation. +ac_aux_dir_abs=`cd $ac_aux_dir && pwd` +AC_PATH_PROG(DVIPS, dvips, $ac_aux_dir_abs/missing dvips) +AC_PATH_PROG(TEXI2PDF, texi2pdf, $ac_aux_dir_abs/missing texi2pdf) +AC_PATH_PROG(TEXI2HTML, texi2html, $ac_aux_dir_abs/missing texi2html) dnl Generate the version information file in the intl/ directory. test -d intl || mkdir intl diff --git a/doc/ChangeLog b/doc/ChangeLog index 91a0917..f5ed73e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,10 +1,21 @@ -2001-04-19 Bruno Haible <haible@clisp.cons.org> +2001-04-17 Bruno Haible <haible@clisp.cons.org> + + * Makefile.am (DVIPS): Use @DVIPS@. If dvips is missing, the + gettext.ps target will fail. + (TEXI2PDF): Use @TEXI2PDF@. If texi2pdf is missing, the gettext.pdf + target will fail. + (TEXI2HTML): Use @TEXI2HTML@. If texi2html is missing, the gettext.html + target will fail. + (gettext_toc.html): Rewrite so it will do nothing but not fail, if + texi2html is missing. + +2001-04-17 Bruno Haible <haible@clisp.cons.org> * Makefile.am (install-html-split): Install into correct directory. Don't use $<. (RM): New variable. -2001-04-19 Bruno Haible <haible@clisp.cons.org> +2001-04-17 Bruno Haible <haible@clisp.cons.org> * ISO_3166: New file. * iso-3166.sed: New file. @@ -19,18 +30,18 @@ * gettext.texi (End Users): Likewise. (Country Codes): New node. -2001-04-19 Bruno Haible <haible@clisp.cons.org> +2001-04-17 Bruno Haible <haible@clisp.cons.org> * gettext.texi: Many tweaks by Philipp Thomas <pthomas@suse.de>. -2001-04-19 Bruno Haible <haible@clisp.cons.org> +2001-04-17 Bruno Haible <haible@clisp.cons.org> * gettext.texi (Plural forms): Add section about Lithuanian, reported by Ricardas Cepas <rch@richard.eu.org>. Fix formula for Slovenian, reported by Roman Maurer <roman.maurer@amis.net>. Ukrainian is like Russian, reported by Andy Rysin <arysin@yahoo.com>. -2001-04-19 Bruno Haible <haible@clisp.cons.org> +2001-04-17 Bruno Haible <haible@clisp.cons.org> * gettext.texi (config.guess): New node. (aclocal): Update list of macros to include. @@ -38,7 +49,7 @@ (Makefile): Add reminder to put intl in front of other directories. (src/Makefile): Add reminder to define LOCALEDIR. -2001-04-19 Bruno Haible <haible@clisp.cons.org> +2001-04-17 Bruno Haible <haible@clisp.cons.org> * ISO_639: Add Avestan, Bosnian, Chechen, Chamorro, Church Slavic, Chuvash, Manx, Hiri Motu, Herero, Kikuyu, Kuanyama, Komi, Cornish, diff --git a/doc/Makefile.am b/doc/Makefile.am index 6bf2ae6..474bca7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -82,7 +82,7 @@ uninstall-dvi: # Documentation in Postscript format. -DVIPS = dvips -D600 +DVIPS = @DVIPS@ -D600 ps: gettext.ps @@ -102,7 +102,7 @@ uninstall-ps: # Documentation in Portable Document Format. -TEXI2PDF = texi2pdf +TEXI2PDF = @TEXI2PDF@ SUFFIXES = .pdf pdf: gettext.pdf @@ -124,7 +124,7 @@ uninstall-pdf: # Documentation in HTML format. -TEXI2HTML = texi2html +TEXI2HTML = @TEXI2HTML@ html-monolithic: gettext.html html-split: gettext_toc.html @@ -133,8 +133,12 @@ gettext.html: gettext.texi version.texi $(gettext_TEXINFOS) $(TEXI2HTML) -expandinfo -number -monolithic $< gettext_toc.html: gettext.texi version.texi $(gettext_TEXINFOS) - $(RM) gettext_*.html - $(TEXI2HTML) -expandinfo -number -split_chapter $< + case "$(TEXI2HTML)" in \ + *"/missing texi2html") \ + $(TEXI2HTML) -expandinfo -number -split_chapter $< || exit 0 ;; \ + *) $(RM) gettext_*.html ; \ + $(TEXI2HTML) -expandinfo -number -split_chapter $< ;; \ + esac install-html-monolithic: gettext.html $(mkinstalldirs) $(DESTDIR)$(htmldir) |