[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in,v |
Date: |
Sat, 03 May 2008 20:16:17 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/05/03 20:16:16
Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -b -r1.525 -r1.526
--- configure.in 3 May 2008 18:59:31 -0000 1.525
+++ configure.in 3 May 2008 20:16:15 -0000 1.526
@@ -148,6 +148,11 @@
OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux
console])
OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
+## For the times when you want to build Emacs but don't have
+## a suitable makeinfo, and can live without the manuals.
+dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html
+OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals])
+
dnl Can remove these in Emacs 24.
AC_ARG_WITH([gtk],,
AC_MSG_ERROR([--with-gtk has been removed. Use --with-x-toolkit to
@@ -891,10 +896,22 @@
MAKEINFO=no
fi
-if test "$MAKEINFO" = "no"; then
- AC_MSG_ERROR( [makeinfo >= 4.6 is required] )
-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.
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2008/05/03
- [Emacs-diffs] Changes to emacs/configure.in,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/configure.in,v, Miles Bader, 2008/05/04
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2008/05/07
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2008/05/07
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2008/05/09
- [Emacs-diffs] Changes to emacs/configure.in,v, Kenichi Handa, 2008/05/13