[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115480: Revert my most-recent change re Solaris.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r115480: Revert my most-recent change re Solaris. |
Date: |
Thu, 12 Dec 2013 04:54:02 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115480
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-11 20:53:59 -0800
message:
Revert my most-recent change re Solaris.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-12-11 22:31:02 +0000
+++ b/ChangeLog 2013-12-12 04:53:59 +0000
@@ -1,13 +1,3 @@
-2013-12-11 Paul Eggert <address@hidden>
-
- Make 'configure' work out-of-the-box on Solaris.
- * configure.ac: Work even if libgif etc. are missing. Emacs works
- without these libraries even if its default GUI is harmed, so they
- are not strictly necessary. Another possibility would be to
- disable X11 if these libraries are missing. The point is that a
- plain 'configure' should not fail on platforms like Solaris 11
- where one or more image libraries are not installed by default.
-
2013-12-11 Glenn Morris <address@hidden>
* info/dir: Add octave-mode.
=== modified file 'configure.ac'
--- a/configure.ac 2013-12-11 22:31:02 +0000
+++ b/configure.ac 2013-12-12 04:53:59 +0000
@@ -3106,8 +3106,7 @@
fi
AC_SUBST(LIBGIF)
-dnl If using X11, warn if image libraries are missing.
-dnl It's not fatal if they're absent, though the UI may suffer.
+dnl Check for required libraries.
if test "${HAVE_X11}" = "yes"; then
MISSING=""
WITH_NO=""
@@ -3123,12 +3122,12 @@
MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
if test "X${MISSING}" != X; then
- AC_MSG_WARN([X11 used, but the following libraries were not found:
+ AC_MSG_ERROR([The following required libraries were not found:
$MISSING
Maybe some development libraries/packages are missing?
-Emacs will be built without them. To silence this warning, give
+If you don't want to link with them give
$WITH_NO
-as options to 'configure'.])
+as options to configure])
fi
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115480: Revert my most-recent change re Solaris.,
Paul Eggert <=