Re: [AD] Allegro 4.0.3 time-table

[Eric Botcazou <ebotcazou@xxxxxxxxxx>]

> This means that the branch is now frozen, except for documentation
> changes. And it will be completely frozen on Friday 20:00 UTC.

I could argue that the following patch is a documentation change, since it is 
related to the documentation building process, but that would be obviously 
far-fetched :-)

Nevertheless I've applied it to the branch: it's a backport of a patch that 
has been on mainline for a while (since Darwin support was added) and allows 
us to gracefully react when 'makeinfo' is not installed on the system.

Tested on a Sparc/Solaris7 box where 'makeinfo' is not installed and on my PC 
where it is. Now we produce the following message on the former:

echo ought to run makeinfo --no-split -o docs/info/allegro.info 
docs/texi/allegro.texi
ought to run makeinfo --no-split -o docs/info/allegro.info 
docs/texi/allegro.texi

-- 
Eric Botcazou

Index: configure.in
===================================================================
RCS file: /cvsroot/alleg/allegro/configure.in,v
retrieving revision 1.38.2.10
diff -u -r1.38.2.10 configure.in
--- configure.in	7 Feb 2003 13:35:42 -0000	1.38.2.10
+++ configure.in	11 Apr 2003 11:26:19 -0000
@@ -117,10 +117,13 @@
 AC_PROG_LN_S
 
 dnl LDCONFIG is used for installing shared libraries, in Linux/ELF at least
-AC_PATH_PROGS(LDCONFIG, ldconfig, [echo ought to run ldconfig], $PATH:/sbin:/usr/sbin)
+AC_PATH_PROG(LDCONFIG, ldconfig, [echo ought to run ldconfig], $PATH:/sbin:/usr/sbin)
 
+dnl MAKEINFO is needed for producing the info pages
+AC_PATH_PROG(MAKEINFO, makeinfo, [echo ought to run makeinfo], $PATH:/sbin/:/usr/bin)
+ 
 dnl INSTALL_INFO is needed for installing the info pages
-AC_PATH_PROGS(INSTALL_INFO, install-info, [echo ought to run install-info], $PATH:/sbin:/usr/sbin)
+AC_PATH_PROG(INSTALL_INFO, install-info, [echo ought to run install-info], $PATH:/sbin:/usr/sbin)
 
 dnl Test for asm support.
 ALLEGRO_ACTEST_SUPPORT_ASM
Index: makefile.in
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.in,v
retrieving revision 1.25.2.10
diff -u -r1.25.2.10 makefile.in
--- makefile.in	9 Apr 2003 07:22:33 -0000	1.25.2.10
+++ makefile.in	11 Apr 2003 11:26:19 -0000
@@ -43,7 +43,7 @@
 
 CC = @CC@
 CPP = @CPP@
-MAKEINFO = makeinfo --no-split
+MAKEINFO = @MAKEINFO@
 RANLIB = @RANLIB@
 AR = ar
 LIBS = @LIBS@
@@ -218,7 +218,7 @@
 	$(MAKEDOC) -texi $@ $<
 
 $(filter %.info,$(DOCS)): docs/info/%.info: docs/texi/%.texi $(MAKEDOC)
-	$(MAKEINFO) -o $@ $<
+	$(MAKEINFO) --no-split -o $@ $<
 
 $(filter %.html,$(DOCS)): docs/html/%.html: docs/src/%._tx $(MAKEDOC)
 	$(MAKEDOC) -html $@ $<