aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2007-06-13 20:43:37 +0000
committerJan Djärv2007-06-13 20:43:37 +0000
commit1ee86f21ec33f04daa3b4dc51d1bead5b95a2947 (patch)
treecf4c9314003153bf03aa4c1805347bae64228d76
parent141f0c038a2cbf9cc91fed54ca6aac76120d216d (diff)
downloademacs-1ee86f21ec33f04daa3b4dc51d1bead5b95a2947.tar.gz
emacs-1ee86f21ec33f04daa3b4dc51d1bead5b95a2947.zip
Exit with error if image libraries aren't found.
-rw-r--r--ChangeLog4
-rw-r--r--configure.in22
2 files changed, 26 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fee0379ac7d..635b8ea81fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12007-06-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * configure.in: Exit with error if image libraries aren't found.
4
12007-06-13 Michael Kifer <kifer@cs.stonybrook.edu> 52007-06-13 Michael Kifer <kifer@cs.stonybrook.edu>
2 6
3 * ediff-ptch.el (ediff-context-diff-label-regexp): partially undid 7 * ediff-ptch.el (ediff-context-diff-label-regexp): partially undid
diff --git a/configure.in b/configure.in
index 65e1e25dc4f..22e15d4a82f 100644
--- a/configure.in
+++ b/configure.in
@@ -2462,6 +2462,9 @@ no_return_alloc_pixels
2462 AC_MSG_RESULT(yes) 2462 AC_MSG_RESULT(yes)
2463 else 2463 else
2464 AC_MSG_RESULT(no) 2464 AC_MSG_RESULT(no)
2465 AC_MSG_ERROR([libXpm is required, but I didn't find it.
2466Maybe some development libraries/packages are missing?
2467Use --with-xpm=no if you don't wan't to link with libXpm])
2465 fi 2468 fi
2466 fi 2469 fi
2467 fi 2470 fi
@@ -2479,6 +2482,11 @@ if test "${HAVE_X11}" = "yes"; then
2479 dnl HAVE_STDLIB_H. 2482 dnl HAVE_STDLIB_H.
2480 AC_CHECK_HEADER(jerror.h, 2483 AC_CHECK_HEADER(jerror.h,
2481 AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes)) 2484 AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes))
2485 if test "${HAVE_JPEG}" != "yes"; then
2486 AC_MSG_ERROR([libjpeg is required, but I didn't find it.
2487Maybe some development libraries/packages are missing?
2488Use --with-jpeg=no if you don't wan't to link with libjpeg])
2489 fi
2482 fi 2490 fi
2483 2491
2484 AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl 2492 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
2504 if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" = yes ; then 2512 if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" = yes ; then
2505 AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm) 2513 AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm)
2506 fi 2514 fi
2515 if test "${HAVE_PNG}" != "yes"; then
2516 AC_MSG_ERROR([libpng is required, but I didn't find it.
2517Maybe some development libraries/packages are missing?
2518Use --with-png=no if you don't wan't to link with libpng])
2519 fi
2507 fi 2520 fi
2508 2521
2509 if test "${HAVE_PNG}" = "yes"; then 2522 if test "${HAVE_PNG}" = "yes"; then
@@ -2520,6 +2533,11 @@ if test "${HAVE_X11}" = "yes"; then
2520 # At least one tiff package requires the jpeg library. 2533 # At least one tiff package requires the jpeg library.
2521 if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi 2534 if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
2522 AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , $tifflibs)) 2535 AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , $tifflibs))
2536 if test "${HAVE_TIFF}" != "yes"; then
2537 AC_MSG_ERROR([libtiff is required, but I didn't find it.
2538Maybe some development libraries/packages are missing?
2539Use --with-tiff=no if you don't wan't to link with libtiff])
2540 fi
2523 fi 2541 fi
2524 2542
2525 if test "${HAVE_TIFF}" = "yes"; then 2543 if test "${HAVE_TIFF}" = "yes"; then
@@ -2551,6 +2569,10 @@ if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then
2551 2569
2552 if test "${HAVE_GIF}" = "yes"; then 2570 if test "${HAVE_GIF}" = "yes"; then
2553 AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif library (default -lungif; otherwise specify with LIBGIF).]) 2571 AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif library (default -lungif; otherwise specify with LIBGIF).])
2572 else
2573 AC_MSG_ERROR([libgif or libungif is required, but I didn't find it.
2574Maybe some development libraries/packages are missing?
2575Use --with-gif=no if you don't wan't to link with libgif/ungif])
2554 fi 2576 fi
2555fi 2577fi
2556 2578