From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Emacs can't be built without recent makeinfo Date: Mon, 05 May 2008 14:31:21 -0400 Message-ID: References: <18449.25073.494568.381521@kahikatea.snap.net.nz> <18450.1350.18815.221139@a1ihome1.kph.uni-mainz.de> <18450.21976.563496.841851@kahikatea.snap.net.nz> <1k8wyr16sx.fsf@fencepost.gnu.org> <481CD427.5050207@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1210012356 11634 80.91.229.12 (5 May 2008 18:32:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 5 May 2008 18:32:36 +0000 (UTC) Cc: nickrob@snap.net.nz, emacs-devel@gnu.org, ulm@gentoo.org, monnier@iro.umontreal.ca, jasonr@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 05 20:33:10 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Jt5UV-0002Zu-UQ for ged-emacs-devel@m.gmane.org; Mon, 05 May 2008 20:32:48 +0200 Original-Received: from localhost ([127.0.0.1]:58607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jt5To-00015p-7L for ged-emacs-devel@m.gmane.org; Mon, 05 May 2008 14:32:04 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jt5Ti-00015b-DM for emacs-devel@gnu.org; Mon, 05 May 2008 14:31:58 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jt5Tg-00015P-U8 for emacs-devel@gnu.org; Mon, 05 May 2008 14:31:57 -0400 Original-Received: from [199.232.76.173] (port=50649 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jt5Tg-00015M-OB for emacs-devel@gnu.org; Mon, 05 May 2008 14:31:56 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Jt5Tg-0005hW-Cp for emacs-devel@gnu.org; Mon, 05 May 2008 14:31:56 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1Jt5T7-0007sb-L8; Mon, 05 May 2008 14:31:21 -0400 X-Spook: DES corporate security Al-Qaeda Nazi Sundevil weapons of X-Ran: P*GjO'X7VYwoHO)@4$0IOE3v0?W2\#*?lw1\og]m1u;ih]0/?yH1X (Eli Zaretskii's message of "Sun, 04 May 2008 06:55:49 +0300") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:96521 Archived-At: 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