emacs: configure.in comparison

comparison configure.in @ 35204:5ff35be3bb08

Don't reset LIBS at end of -lXmu test. Test for -lXext. (HAVE_XKBGETKEYBOARD): Fix reporting of result. (HAVE_LIBXP): Remove -lXt from AC_CHECK_LIB. (HAVE_XAW3D, HAVE_XPM, HAVE_JPEG, HAVE_PNG, HAVE_TIFF, HAVE_GIF): Don't frob CFLAGS. Remove extra X libs from AC_CHECK_LIB (now in $LIBS).

author	Gerd Moellmann <gerd@gnu.org>
date	Wed, 10 Jan 2001 15:18:48 +0000
parents	d5251a5c10ef
children	f67ec8c72036

comparison

equal deleted inserted replaced

-:dcf1f0621dbb
+:5ff35be3bb08
 dnl  Autoconf script for GNU Emacs
 dnl To rebuild the `configure' script from this, execute the command
 dnl 	autoconf
 dnl in the directory containing this script.
 dnl
-dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000 Free Software Foundation, Inc.
+dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001
+dnl  Free Software Foundation, Inc.
 dnl
 dnl  This file is part of GNU Emacs.
 dnl
 dnl  GNU Emacs is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
 AC_MSG_CHECKING(for Xkb)
 AC_TRY_LINK([#include <X11/Xlib.h>
 #include <X11/XKBlib.h>],
 	[XkbDescPtr kb = XkbGetKeyboard (0, XkbAllComponentsMask, XkbUseCoreKbd);],
 	emacs_xkb=yes, emacs_xkb=no)
-AC_MSG_CHECKING($emacs_xkb)
+AC_MSG_RESULT($emacs_xkb)
 if test $emacs_xkb = yes; then
 AC_DEFINE(HAVE_XKBGETKEYBOARD)
 fi
 AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \
 LIBS="-lXt -lSM -lICE $LIBS"
 else
 LIBS="-lXt $LIBS"
 fi
 AC_CHECK_LIB(Xmu, XmuConvertStandardSelection)
-LIBS="$OLDLIBS"
+test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS"
+fi
+# On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D.
+if test "${HAVE_X11}" = "yes"; then
+if test "${USE_X_TOOLKIT}" != "none"; then
+AC_CHECK_LIB(Xext, XShapeQueryExtension)
+fi
 fi
 if test "${USE_X_TOOLKIT}" = "MOTIF"; then
 AC_CACHE_CHECK(for Motif version 2.1, emacs_cv_motif_version_2_1,
 AC_TRY_COMPILE([#include <Xm/Xm.h>],
 emacs_cv_motif_version_2_1=yes, emacs_cv_motif_version_2_1=no))
 HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1
 if test $emacs_cv_motif_version_2_1 = yes; then
 HAVE_LIBXP=no
 AC_DEFINE(HAVE_MOTIF_2_1)
-AC_CHECK_LIB(Xp, XpCreateContext, HAVE_LIBXP=yes, , -lXext)
+AC_CHECK_LIB(Xp, XpCreateContext, HAVE_LIBXP=yes)
 if test ${HAVE_LIBXP} = yes; then
 AC_DEFINE(HAVE_LIBXP)
 fi
 fi
 fi
 ### Is -lXaw3d available?
 HAVE_XAW3D=no
 if test "${HAVE_X11}" = "yes"; then
 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))
+	AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, HAVE_XAW3D=yes))
-CFLAGS="${old_c_flags}"
 if test "${HAVE_XAW3D}" = "yes"; then
 	AC_DEFINE(HAVE_XAW3D)
 fi
 fi
 fi
 ### Use -lXpm if available, unless `--with-xpm=no'.
 HAVE_XPM=no
 if test "${HAVE_X11}" = "yes"; then
 if test "${with_xpm}" != "no"; then
-old_c_flags="${CFLAGS}"
-CFLAGS="${LD_SWITCH_X_SITE}"
 AC_CHECK_HEADER(X11/xpm.h,
 AC_CHECK_LIB(Xpm, XpmReadFileToPixmap, HAVE_XPM=yes, , -lX11))
 if test "${HAVE_XPM}" = "yes"; then
 AC_MSG_CHECKING(for XpmReturnAllocPixels preprocessor define)
 AC_EGREP_CPP(no_return_alloc_pixels,
 #ifndef XpmReturnAllocPixels
 no_return_alloc_pixels
 #endif
 	], HAVE_XPM=no, HAVE_XPM=yes)
 fi
-CFLAGS="${old_c_flags}"
 if test "${HAVE_XPM}" = "yes"; then
 AC_MSG_RESULT(yes)
 else
 AC_MSG_RESULT(no)
 fi
 ### Use -ljpeg if available, unless `--with-jpeg=no'.
 HAVE_JPEG=no
 if test "${HAVE_X11}" = "yes"; then
 if test "${with_jpeg}" != "no"; then
-old_c_flags="${CFLAGS}"
-CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}"
 dnl Checking for jpeglib.h can lose becsue of a redefinition of
 dnl  HAVE_STDLIB_H.
 AC_CHECK_HEADER(jerror.h,
-AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes, , -lX11))
+AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes))
-CFLAGS="${old_c_flags}"
 fi
 if test "${HAVE_JPEG}" = "yes"; then
 AC_DEFINE(HAVE_JPEG)
 fi
 ### Use -lpng if available, unless `--with-png=no'.
 HAVE_PNG=no
 if test "${HAVE_X11}" = "yes"; then
 if test "${with_png}" != "no"; then
-old_c_flags="${CFLAGS}"
-CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}"
 AC_CHECK_HEADER(png.h,
-AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lX11 -lz -lm))
+AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm))
-CFLAGS="${old_c_flags}"
 fi
 if test "${HAVE_PNG}" = "yes"; then
 AC_DEFINE(HAVE_PNG)
 fi
 ### Use -ltiff if available, unless `--with-tiff=no'.
 HAVE_TIFF=no
 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(tiffio.h,
-tifflibs="-lX11 -lz -lm"
+tifflibs="-lz -lm"
 # 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))
-CFLAGS="${old_c_flags}"
 fi
 if test "${HAVE_TIFF}" = "yes"; then
 AC_DEFINE(HAVE_TIFF)
 fi
 ### Use -lgif if available, unless `--with-gif=no'.
 HAVE_GIF=no
 if test "${HAVE_X11}" = "yes"; then
 if test "${with_gif}" != "no"; then
-old_c_flags="${CFLAGS}"
-CFLAGS="${LD_SWITCH_X_SITE} ${CFLAGS}"
 AC_CHECK_HEADER(gif_lib.h,
-AC_CHECK_LIB(ungif, DGifOpen, HAVE_GIF=yes, , -lX11))
+AC_CHECK_LIB(ungif, DGifOpen, HAVE_GIF=yes))
-CFLAGS="${old_c_flags}"
 fi
 if test "${HAVE_GIF}" = "yes"; then
 AC_DEFINE(HAVE_GIF)
 fi

Mercurial > emacs

comparison configure.in @ 35204:5ff35be3bb08