[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/configure,v |
Date: |
Sat, 03 May 2008 20:17:14 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/05/03 20:17:13
Index: configure
===================================================================
RCS file: /sources/emacs/emacs/configure,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -b -r1.264 -r1.265
--- configure 3 May 2008 19:01:26 -0000 1.264
+++ configure 3 May 2008 20:17:10 -0000 1.265
@@ -1371,6 +1371,7 @@
--without-gpm don't use -lgpm for mouse support on a GNU/Linux
console
--without-dbus don't compile with D-Bus support
+ --without-makeinfo don't require makeinfo for building manuals
--with-pkg-config-prog=PATH
Path to pkg-config for finding GTK and librsvg
@@ -2104,6 +2105,17 @@
fi
+## For the times when you want to build Emacs but don't have
+## a suitable makeinfo, and can live without the manuals.
+
+# Check whether --with-makeinfo was given.
+if test "${with_makeinfo+set}" = set; then
+ withval=$with_makeinfo;
+else
+ with_makeinfo=yes
+fi
+
+
# Check whether --with-gtk was given.
if test "${with_gtk+set}" = set; then
@@ -5492,12 +5504,29 @@
MAKEINFO=no
fi
-if test "$MAKEINFO" = "no"; then
- { { echo "$as_me:$LINENO: error: makeinfo >= 4.6 is required " >&5
-echo "$as_me: error: makeinfo >= 4.6 is required " >&2;}
+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
+
+ { { echo "$as_me:$LINENO: 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. " >&5
+echo "$as_me: 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. " >&2;}
{ (exit 1); exit 1; }; }
-fi
+fi
if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
@@ -9292,6 +9321,7 @@
## Workaround for bug in autoconf <= 2.62.
## http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01551.html
## No need to do anything special for these standard directories.
+## This is an experiment, take it out if it causes problems.
if test -n "${x_libraries}" && test x"${x_libraries}" != xNONE; then
x_libraries=`echo :${x_libraries}: | sed -e 's|:/usr/lib64:|:|g' -e
's|:/lib64:|:|g' -e 's|^:||' -e 's|:$||'`
- [Emacs-diffs] Changes to emacs/configure,v, Glenn Morris, 2008/05/03
- [Emacs-diffs] Changes to emacs/configure,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/configure,v, Miles Bader, 2008/05/04
- [Emacs-diffs] Changes to emacs/configure,v, Glenn Morris, 2008/05/09
- [Emacs-diffs] Changes to emacs/configure,v, Kenichi Handa, 2008/05/13