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

Exit with error if image libraries aren't found.

Browse source
This commit is contained in:
Jan Djärv 2007-06-13 20:43:37 +00:00
parent 141f0c038a
commit 1ee86f21ec
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2007-06-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* configure.in: Exit with error if image libraries aren't found.
2007-06-13 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-ptch.el (ediff-context-diff-label-regexp): partially undid

22
configure.in
View file

@ -2462,6 +2462,9 @@ no_return_alloc_pixels
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AC_MSG_ERROR([libXpm is required, but I didn't find it.
Maybe some development libraries/packages are missing?
Use --with-xpm=no if you don't wan't to link with libXpm])
fi
fi
fi
@ -2479,6 +2482,11 @@ if test "${HAVE_X11}" = "yes"; then
dnl HAVE_STDLIB_H.
AC_CHECK_HEADER(jerror.h,
AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes))
if test "${HAVE_JPEG}" != "yes"; then
AC_MSG_ERROR([libjpeg is required, but I didn't find it.
Maybe some development libraries/packages are missing?
Use --with-jpeg=no if you don't wan't to link with libjpeg])
fi
fi
AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl
@ -2504,6 +2512,11 @@ if test "${HAVE_X11}" = "yes"; then
if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" = yes ; then
AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm)
fi
if test "${HAVE_PNG}" != "yes"; then
AC_MSG_ERROR([libpng is required, but I didn't find it.
Maybe some development libraries/packages are missing?
Use --with-png=no if you don't wan't to link with libpng])
fi
fi
if test "${HAVE_PNG}" = "yes"; then
@ -2520,6 +2533,11 @@ if test "${HAVE_X11}" = "yes"; then
# At least one tiff package requires the jpeg library.
if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , $tifflibs))
if test "${HAVE_TIFF}" != "yes"; then
AC_MSG_ERROR([libtiff is required, but I didn't find it.
Maybe some development libraries/packages are missing?
Use --with-tiff=no if you don't wan't to link with libtiff])
fi
fi
if test "${HAVE_TIFF}" = "yes"; then
@ -2551,6 +2569,10 @@ if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then
if test "${HAVE_GIF}" = "yes"; then
AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif library (default -lungif; otherwise specify with LIBGIF).])
else
AC_MSG_ERROR([libgif or libungif is required, but I didn't find it.
Maybe some development libraries/packages are missing?
Use --with-gif=no if you don't wan't to link with libgif/ungif])
fi
fi