diff options
| author | Gerd Moellmann | 1999-08-07 16:01:14 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 1999-08-07 16:01:14 +0000 |
| commit | 495ccc04c3d34d9660f46746ffc3dab83e9d7160 (patch) | |
| tree | a7db8424e3c70fe9014821c88f9d44461986ec74 | |
| parent | 9f79084ca21a822b0c43aba7b4b478587ec0806c (diff) | |
| download | emacs-495ccc04c3d34d9660f46746ffc3dab83e9d7160.tar.gz emacs-495ccc04c3d34d9660f46746ffc3dab83e9d7160.zip | |
Change libtiff34 to libtiff.
| -rw-r--r-- | configure.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 525204d8ff9..a06a24710a6 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -71,7 +71,7 @@ AC_ARG_WITH(xpm, | |||
| 71 | AC_ARG_WITH(jpeg, | 71 | AC_ARG_WITH(jpeg, |
| 72 | [ --with-jpeg use -ljpeg for displaying JPEG images]) | 72 | [ --with-jpeg use -ljpeg for displaying JPEG images]) |
| 73 | AC_ARG_WITH(tiff, | 73 | AC_ARG_WITH(tiff, |
| 74 | [ --with-tiff use -ltiff34 for displaying TIFF images]) | 74 | [ --with-tiff use -ltiff for displaying TIFF images]) |
| 75 | AC_ARG_WITH(gif, | 75 | AC_ARG_WITH(gif, |
| 76 | [ --with-gif use -lungif for displaying GIF images]) | 76 | [ --with-gif use -lungif for displaying GIF images]) |
| 77 | AC_ARG_WITH(png, | 77 | AC_ARG_WITH(png, |
| @@ -1308,14 +1308,14 @@ if test "${HAVE_X11}" = "yes"; then | |||
| 1308 | fi | 1308 | fi |
| 1309 | fi | 1309 | fi |
| 1310 | 1310 | ||
| 1311 | ### Use -ltiff34 if available, unless `--with-tiff=no'. | 1311 | ### Use -ltiff if available, unless `--with-tiff=no'. |
| 1312 | HAVE_TIFF=no | 1312 | HAVE_TIFF=no |
| 1313 | if test "${HAVE_X11}" = "yes"; then | 1313 | if test "${HAVE_X11}" = "yes"; then |
| 1314 | if test "${with_tiff}" != "no"; then | 1314 | if test "${with_tiff}" != "no"; then |
| 1315 | old_c_flags="${CFLAGS}" | 1315 | old_c_flags="${CFLAGS}" |
| 1316 | CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" | 1316 | CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" |
| 1317 | AC_CHECK_HEADER(tiff34/tiffio.h, | 1317 | AC_CHECK_HEADER(tiff34/tiffio.h, |
| 1318 | AC_CHECK_LIB(tiff34, TIFFGetVersion, HAVE_TIFF=yes, , -lX11)) | 1318 | AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , -lX11)) |
| 1319 | CFLAGS="${old_c_flags}" | 1319 | CFLAGS="${old_c_flags}" |
| 1320 | fi | 1320 | fi |
| 1321 | 1321 | ||
| @@ -1957,7 +1957,7 @@ fi | |||
| 1957 | echo " Does Emacs use -lXaw3d? ${HAVE_XAW3D}" | 1957 | echo " Does Emacs use -lXaw3d? ${HAVE_XAW3D}" |
| 1958 | echo " Does Emacs use -lXpm? ${HAVE_XPM}" | 1958 | echo " Does Emacs use -lXpm? ${HAVE_XPM}" |
| 1959 | echo " Does Emacs use -ljpeg? ${HAVE_JPEG}" | 1959 | echo " Does Emacs use -ljpeg? ${HAVE_JPEG}" |
| 1960 | echo " Does Emacs use -ltiff34? ${HAVE_TIFF}" | 1960 | echo " Does Emacs use -ltiff? ${HAVE_TIFF}" |
| 1961 | echo " Does Emacs use -lungif? ${HAVE_GIF}" | 1961 | echo " Does Emacs use -lungif? ${HAVE_GIF}" |
| 1962 | echo " Does Emacs use -lpng? ${HAVE_PNG}" | 1962 | echo " Does Emacs use -lpng? ${HAVE_PNG}" |
| 1963 | echo | 1963 | echo |