[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in
From: |
Dave Love |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in |
Date: |
Tue, 22 Jul 2003 13:29:56 -0400 |
Index: emacs/configure.in
diff -c emacs/configure.in:1.345 emacs/configure.in:1.346
*** emacs/configure.in:1.345 Sun Jul 20 19:38:20 2003
--- emacs/configure.in Tue Jul 22 13:29:56 2003
***************
*** 227,234 ****
*-*-netbsd* )
opsys=netbsd
if test -f /usr/lib/crti.o; then]
! dnl Leave quotation here temporarily
! AC_DEFINE(HAVE_CRTIN)
[ fi
case "${canonical}" in
--- 227,235 ----
*-*-netbsd* )
opsys=netbsd
if test -f /usr/lib/crti.o; then]
! dnl The close and open brackets here are because this section is quoted --
! dnl see the `changequote' comment above.
! AC_DEFINE(HAVE_CRTIN, [], [Define to 1 if you have /usr/lib/crti.o.])
[ fi
case "${canonical}" in
***************
*** 2063,2068 ****
--- 2064,2071 ----
if test "$GCC" = yes; then
CFLAGS="$CFLAGS --pedantic-errors"
fi
+ fi
+ if test "${HAVE_X11}" = "yes"; then
AC_TRY_COMPILE([
#include <X11/Xlib.h>
#include <X11/Xresource.h>],
***************
*** 2085,2093 ****
[Define to the type of the 6th arg of XRegisterIMInstantiateCallback,
either XPointer or XPointer*.])dnl
if test "$emacs_cv_arg6_star" = yes; then
! AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer*])
else
! AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer])
fi
CFLAGS=$late_CFLAGS
fi
--- 2088,2096 ----
[Define to the type of the 6th arg of XRegisterIMInstantiateCallback,
either XPointer or XPointer*.])dnl
if test "$emacs_cv_arg6_star" = yes; then
! AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer*])
else
! AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer])
fi
CFLAGS=$late_CFLAGS
fi
***************
*** 2147,2154 ****
HAVE_PNG=no
if test "${HAVE_X11}" = "yes"; then
if test "${with_png}" != "no"; then
! AC_CHECK_HEADER(png.h,
! AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm))
fi
if test "${HAVE_PNG}" = "yes"; then
--- 2150,2161 ----
HAVE_PNG=no
if test "${HAVE_X11}" = "yes"; then
if test "${with_png}" != "no"; then
! # Debian unstable as of July 2003 has multiple libpngs, and puts png.h
! # in /usr/include/libpng.
! AC_CHECK_HEADERS(png.h libpng/png.h)
! 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
fi
if test "${HAVE_PNG}" = "yes"; then
- [Emacs-diffs] Changes to emacs/configure.in, Richard M. Stallman, 2003/07/12
- [Emacs-diffs] Changes to emacs/configure.in, Stefan Monnier, 2003/07/13
- [Emacs-diffs] Changes to emacs/configure.in, Andreas Schwab, 2003/07/15
- [Emacs-diffs] Changes to emacs/configure.in, Markus Rost, 2003/07/20
- [Emacs-diffs] Changes to emacs/configure.in,
Dave Love <=
- [Emacs-diffs] Changes to emacs/configure.in, Andreas Schwab, 2003/07/23
- [Emacs-diffs] Changes to emacs/configure.in, Dave Love, 2003/07/28
- [Emacs-diffs] Changes to emacs/configure.in, Juanma Barranquero, 2003/07/28
- [Emacs-diffs] Changes to emacs/configure.in, Richard M. Stallman, 2003/07/29
- [Emacs-diffs] Changes to emacs/configure.in, Richard M. Stallman, 2003/07/29