procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert my most-recent change re Solaris.

Browse source
This commit is contained in:
Paul Eggert 2013-12-11 20:53:59 -08:00
parent f4f84024e6
commit 139f528442
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,13 +1,3 @@
2013-12-11 Paul Eggert <eggert@cs.ucla.edu>
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 <rgm@gnu.org>
* info/dir: Add octave-mode.

9
configure.ac
View file

@ -3106,8 +3106,7 @@ elif test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \
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 @@ if test "${HAVE_X11}" = "yes"; then
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