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

Check for all image libraries before exiting.

Browse source
This commit is contained in:
Jan Djärv 2007-06-14 06:56:28 +00:00
parent 2c341244d1
commit bfa6fb7e87
2 changed files with 29 additions and 26 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-14 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* configure.in: Check for all image libraries before exiting.
2007-06-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* configure.in: Exit with error if image libraries aren't found.

51
configure.in
View file

@ -90,12 +90,7 @@ AC_ARG_WITH(x-toolkit,
a | at | ath | athe | athen | athena ) val=athena ;;
m | mo | mot | moti | motif ) val=motif ;;
g | gt | gtk ) val=gtk ;;
dnl These don't currently work.
dnl o | op | ope | open | open- | open-l | open-lo \
dnl | open-loo | open-look ) val=open-look ;;
* )
dnl AC_MSG_ERROR([the `--with-x-toolkit' option is supposed to have a value
dnl which is `yes', `no', `lucid', `athena', `motif' or `open-look'.])
AC_MSG_ERROR([`--with-x-toolkit=$withval' is invalid;
this option's value should be `yes', `no', `lucid', `athena', `motif' or `gtk'.
`yes' and `gtk' are synonyms. `athena' and `lucid' are synonyms.])
@ -2462,9 +2457,6 @@ 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
@ -2482,11 +2474,6 @@ 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
@ -2512,11 +2499,6 @@ 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
@ -2533,11 +2515,6 @@ 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
@ -2569,10 +2546,31 @@ 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.
fi
fi
dnl Check for required libraries.
if test "${HAVE_X11}" = "yes"; then
MISSING=""
WITH_NO=""
test "${with_xpm}" != "no" && test "${HAVE_XPM}" != "yes" &&
MISSING="libXpm" && WITH_NO="--with-xpm=no"
test "${with_jpeg}" != "no" && test "${HAVE_JPEG}" != "yes" &&
MISSING="$MISSING libjpeg" && WITH_NO="$WITH_NO --with-jpeg=no"
test "${with_png}" != "no" && test "${HAVE_PNG}" != "yes" &&
MISSING="$MISSING libpng" && WITH_NO="$WITH_NO --with-png=no"
test "${with_gif}" != "no" && test "${HAVE_GIF}" != "yes" &&
MISSING="$MISSING libgif/libungif" && WITH_NO="$WITH_NO --with-gif=no"
test "${with_tiff}" != "no" && test "${HAVE_TIFF}" != "yes" &&
MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
if test "X${MISSING}" != X; then
AC_MSG_ERROR([The following required libraries was not found:
$MISSING
Maybe some development libraries/packages are missing?
Use --with-gif=no if you don't wan't to link with libgif/ungif])
If you don't want to link with them give
$WITH_NO
as options to configure])
fi
fi
@ -3018,6 +3016,7 @@ if test "${REL_ALLOC}" = "yes" ; then
buffer space.])
fi
AH_TOP([/* GNU Emacs site configuration template file.
Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.