diff options
author | Gerd Moellmann <gerd@gnu.org> | 1999-08-20 19:30:09 +0000 |
---|---|---|
committer | Gerd Moellmann <gerd@gnu.org> | 1999-08-20 19:30:09 +0000 |
commit | 9f8118075db1eb08599eb6692b911231c6827f78 (patch) | |
tree | 7d63b2e52b81b44b6eb814a149f7e6c00abe2e51 /configure.in | |
parent | 965a811c6d8a89615dc71f022c0c150586cfe47b (diff) | |
download | emacs-9f8118075db1eb08599eb6692b911231c6827f78.tar.gz |
(HAVE_TIFF): Remove tiff34 prefix from tiffio.h.
(HAVE_XAW3D): Don't check for Xaw3d if USE_X_TOOLKIT=none.
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 96faa5c875c..5c313a6c595 100644 --- a/configure.in +++ b/configure.in @@ -1251,14 +1251,16 @@ esac ### Is -lXaw3d available? HAVE_XAW3D=no if test "${HAVE_X11}" = "yes"; then - old_c_flags="${CFLAGS}" - CFLAGS="${LD_SWITCH_X_SITE}" - AC_CHECK_HEADER(X11/Xaw3d/Scrollbar.h, - AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, HAVE_XAW3D=yes, , -lX11)) - CFLAGS="${old_c_flags}" - - if test "${HAVE_XAW3D}" = "yes"; then - AC_DEFINE(HAVE_XAW3D) + if test "${USE_X_TOOLKIT}" != "none"; then + old_c_flags="${CFLAGS}" + CFLAGS="${LD_SWITCH_X_SITE}" + AC_CHECK_HEADER(X11/Xaw3d/Scrollbar.h, + AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, HAVE_XAW3D=yes, , -lX11)) + CFLAGS="${old_c_flags}" + + if test "${HAVE_XAW3D}" = "yes"; then + AC_DEFINE(HAVE_XAW3D) + fi fi fi @@ -1316,7 +1318,7 @@ if test "${HAVE_X11}" = "yes"; then if test "${with_tiff}" != "no"; then old_c_flags="${CFLAGS}" CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}" - AC_CHECK_HEADER(tiff34/tiffio.h, + AC_CHECK_HEADER(tiffio.h, AC_CHECK_LIB(tiff, TIFFGetVersion, HAVE_TIFF=yes, , -lX11)) CFLAGS="${old_c_flags}" fi |