[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Emacs can't be built without recent makeinfo
From: |
Glenn Morris |
Subject: |
Re: Emacs can't be built without recent makeinfo |
Date: |
Mon, 05 May 2008 14:31:21 -0400 |
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Eli Zaretskii wrote:
> I agree with Jason: for distributed tarballs, makeinfo should not be
> an obstacle. I don't see what's confusing, either; care to explain?
Patch with explanatory comments.
*** configure.in 3 May 2008 20:16:15 -0000 1.526
--- configure.in 5 May 2008 18:28:14 -0000
***************
*** 896,916 ****
MAKEINFO=no
fi
! if test "$MAKEINFO" = "no" && test "x${with_makeinfo}" != "xno"; then
!
! if test -e $srcdir/info/emacs; then
! gotinfo="seems"
! else
! gotinfo="does NOT seem"
! fi
!
! AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.6.
! You will not be able to build the Emacs manuals.
! In Emacs releases, they are prebuilt, so this might not be a problem.
! Your source tree $gotinfo to have manuals in the `info' directory.
Either install a suitable version of makeinfo, or re-run configure
! with the `--without-makeinfo' option.] )
!
fi
dnl Add our options to ac_link now, after it is set up.
--- 896,919 ----
MAKEINFO=no
fi
! ## Makeinfo is unusual. For a released Emacs, the manuals are
! ## pre-built, and not deleted by the normal clean rules. makeinfo is
! ## therefore in the category of "special tools" not normally required, which
! ## configure does not have to check for (eg autoconf itself).
! ## In a CVS checkout on the other hand, the manuals are not included.
! ## So makeinfo is a requirement to build from CVS, and configure
! ## should test for it as it does for any other build requirement.
! ## We use the presence of $srcdir/info/emacs to distinguish a release,
! ## with pre-built manuals, from a CVS checkout.
! if test "$MAKEINFO" = "no"; then
! if test "x${with_makeinfo}" = "xno"; then
! MAKEINFO=off
! elif ! test -e $srcdir/info/emacs; then
! AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.6, and your
! source tree does not seem to have pre-built manuals in the `info' directory.
Either install a suitable version of makeinfo, or re-run configure
! with the `--without-makeinfo' option to build without the manuals.] )
! fi
fi
dnl Add our options to ac_link now, after it is set up.
*** Makefile.in 3 May 2008 20:16:32 -0000 1.345
--- Makefile.in 5 May 2008 18:28:21 -0000
***************
*** 554,560 ****
fi; \
cd ${srcdir}/info ; \
for elt in $(INFO_FILES); do \
! test "$(MAKEINFO)" = "no" && ! test -e $$elt && continue; \
for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
chmod a+r $(DESTDIR)${infodir}/$$f; \
--- 554,560 ----
fi; \
cd ${srcdir}/info ; \
for elt in $(INFO_FILES); do \
! test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
chmod a+r $(DESTDIR)${infodir}/$$f; \
***************
*** 566,572 ****
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} &&
/bin/pwd)` ]; \
then \
for elt in $(INFO_FILES); do \
! test "$(MAKEINFO)" = "no" && ! test -e $$elt && continue; \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir}
$(DESTDIR)${infodir}/$$elt); \
done; \
--- 566,572 ----
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} &&
/bin/pwd)` ]; \
then \
for elt in $(INFO_FILES); do \
! test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir}
$(DESTDIR)${infodir}/$$elt); \
done; \
***************
*** 785,792 ****
# put the info files in $(srcdir),
# so we can do ok running make in the build dir.
info: force-info
! @if test "$(MAKEINFO)" = "no"; then \
! echo "Configured without makeinfo, not building manuals" ; \
else \
$(MAKE) $(MFLAGS) info-real ; \
fi
--- 785,795 ----
# put the info files in $(srcdir),
# so we can do ok running make in the build dir.
info: force-info
! @if test "$(MAKEINFO)" = "off"; then \
! echo "Configured --without-makeinfo, not building manuals" ; \
! elif test "$(MAKEINFO)" = "no"; then \
! echo "makeinfo is missing - cannot build manuals" ; \
! exit 1 ; \
else \
$(MAKE) $(MFLAGS) info-real ; \
fi
Re: Emacs can't be built without recent makeinfo, Nick Roberts, 2008/05/04