Mercurial > emacs
comparison configure.in @ 52007:43cb913ddeef
Make XRegisterIMInstantiateCallback test depend on
HAVE_X11, not with_xim.
(HAVE_CRTIN): Provide template.
<with_png>: Test for png.h and libpng/png.h.
author | Dave Love <fx@gnu.org> |
---|---|
date | Tue, 22 Jul 2003 17:29:56 +0000 |
parents | 89677b4e4446 |
children | 64a5bcc93508 |
comparison
equal
deleted
inserted
replaced
52006:b1b3a648691c | 52007:43cb913ddeef |
---|---|
225 | 225 |
226 ## NetBSD ports | 226 ## NetBSD ports |
227 *-*-netbsd* ) | 227 *-*-netbsd* ) |
228 opsys=netbsd | 228 opsys=netbsd |
229 if test -f /usr/lib/crti.o; then] | 229 if test -f /usr/lib/crti.o; then] |
230 dnl Leave quotation here temporarily | 230 dnl The close and open brackets here are because this section is quoted -- |
231 AC_DEFINE(HAVE_CRTIN) | 231 dnl see the `changequote' comment above. |
232 AC_DEFINE(HAVE_CRTIN, [], [Define to 1 if you have /usr/lib/crti.o.]) | |
232 [ fi | 233 [ fi |
233 | 234 |
234 case "${canonical}" in | 235 case "${canonical}" in |
235 alpha*-*-netbsd*) machine=alpha ;; | 236 alpha*-*-netbsd*) machine=alpha ;; |
236 i[3456]86-*-netbsd*) machine=intel386 ;; | 237 i[3456]86-*-netbsd*) machine=intel386 ;; |
2061 [Define to 1 if we should use XIM, if it is available.]) | 2062 [Define to 1 if we should use XIM, if it is available.]) |
2062 late_CFLAGS=$CFLAGS | 2063 late_CFLAGS=$CFLAGS |
2063 if test "$GCC" = yes; then | 2064 if test "$GCC" = yes; then |
2064 CFLAGS="$CFLAGS --pedantic-errors" | 2065 CFLAGS="$CFLAGS --pedantic-errors" |
2065 fi | 2066 fi |
2067 fi | |
2068 if test "${HAVE_X11}" = "yes"; then | |
2066 AC_TRY_COMPILE([ | 2069 AC_TRY_COMPILE([ |
2067 #include <X11/Xlib.h> | 2070 #include <X11/Xlib.h> |
2068 #include <X11/Xresource.h>], | 2071 #include <X11/Xresource.h>], |
2069 [Display *display; | 2072 [Display *display; |
2070 XrmDatabase db; | 2073 XrmDatabase db; |
2083 [emacs_cv_arg6_star=yes]) | 2086 [emacs_cv_arg6_star=yes]) |
2084 AH_TEMPLATE(XRegisterIMInstantiateCallback_arg6, | 2087 AH_TEMPLATE(XRegisterIMInstantiateCallback_arg6, |
2085 [Define to the type of the 6th arg of XRegisterIMInstantiateCallback, | 2088 [Define to the type of the 6th arg of XRegisterIMInstantiateCallback, |
2086 either XPointer or XPointer*.])dnl | 2089 either XPointer or XPointer*.])dnl |
2087 if test "$emacs_cv_arg6_star" = yes; then | 2090 if test "$emacs_cv_arg6_star" = yes; then |
2088 AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer*]) | 2091 AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer*]) |
2089 else | 2092 else |
2090 AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer]) | 2093 AC_DEFINE(XRegisterIMInstantiateCallback_arg6, [XPointer]) |
2091 fi | 2094 fi |
2092 CFLAGS=$late_CFLAGS | 2095 CFLAGS=$late_CFLAGS |
2093 fi | 2096 fi |
2094 | 2097 |
2095 ### Use -lXpm if available, unless `--with-xpm=no'. | 2098 ### Use -lXpm if available, unless `--with-xpm=no'. |
2145 | 2148 |
2146 ### Use -lpng if available, unless `--with-png=no'. | 2149 ### Use -lpng if available, unless `--with-png=no'. |
2147 HAVE_PNG=no | 2150 HAVE_PNG=no |
2148 if test "${HAVE_X11}" = "yes"; then | 2151 if test "${HAVE_X11}" = "yes"; then |
2149 if test "${with_png}" != "no"; then | 2152 if test "${with_png}" != "no"; then |
2150 AC_CHECK_HEADER(png.h, | 2153 # Debian unstable as of July 2003 has multiple libpngs, and puts png.h |
2151 AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm)) | 2154 # in /usr/include/libpng. |
2155 AC_CHECK_HEADERS(png.h libpng/png.h) | |
2156 if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" = yes ; then | |
2157 AC_CHECK_LIB(png, png_get_channels, HAVE_PNG=yes, , -lz -lm) | |
2158 fi | |
2152 fi | 2159 fi |
2153 | 2160 |
2154 if test "${HAVE_PNG}" = "yes"; then | 2161 if test "${HAVE_PNG}" = "yes"; then |
2155 AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library (-lpng).]) | 2162 AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library (-lpng).]) |
2156 fi | 2163 fi |