Mercurial > emacs

comparison configure.in @ 80997:7bbedc92126a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* configure.in: Use HAVE_GPM instead of HAVE_GPM_H and implement it like others. * configure: Regenerate.
author Nick Roberts <nickrob@snap.net.nz>
date Sun, 20 May 2007 05:16:40 +0000
parents 72cdb7d8d8f0
children 1facbd04b199
comparison
equal deleted inserted replaced
80996:ddc80adae333 80997:7bbedc92126a
111 [ --with-tiff use -ltiff for displaying TIFF images]) 111 [ --with-tiff use -ltiff for displaying TIFF images])
112 AC_ARG_WITH(gif, 112 AC_ARG_WITH(gif,
113 [ --with-gif use -lungif for displaying GIF images]) 113 [ --with-gif use -lungif for displaying GIF images])
114 AC_ARG_WITH(png, 114 AC_ARG_WITH(png,
115 [ --with-png use -lpng for displaying PNG images]) 115 [ --with-png use -lpng for displaying PNG images])
116 AC_ARG_WITH(gpm,
117 [ --with-gpm use -lgpm for mouse support on a GNU/Linux console])
116 AC_ARG_WITH(gtk, 118 AC_ARG_WITH(gtk,
117 [ --with-gtk use GTK (same as --with-x-toolkit=gtk)]) 119 [ --with-gtk use GTK (same as --with-x-toolkit=gtk)])
118 AC_ARG_WITH(pkg-config-prog, 120 AC_ARG_WITH(pkg-config-prog,
119 [ --with-pkg-config-prog Path to pkg-config to use for finding GTK]) 121 [ --with-pkg-config-prog Path to pkg-config to use for finding GTK])
120 AC_ARG_WITH(toolkit-scroll-bars, 122 AC_ARG_WITH(toolkit-scroll-bars,
1628 dnl checks for header files 1630 dnl checks for header files
1629 AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \ 1631 AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
1630 linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ 1632 linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
1631 termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \ 1633 termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
1632 sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \ 1634 sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
1633 sys/utsname.h pwd.h gpm.h) 1635 sys/utsname.h pwd.h)
1634 1636
1635 AC_MSG_CHECKING(if personality LINUX32 can be set) 1637 AC_MSG_CHECKING(if personality LINUX32 can be set)
1636 AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)], 1638 AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)],
1637 emacs_cv_personality_linux32=yes, 1639 emacs_cv_personality_linux32=yes,
1638 emacs_cv_personality_linux32=no) 1640 emacs_cv_personality_linux32=no)
2505 if test "${HAVE_GIF}" = "yes"; then 2507 if test "${HAVE_GIF}" = "yes"; then
2506 AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have the ungif library (-lungif).]) 2508 AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have the ungif library (-lungif).])
2507 fi 2509 fi
2508 fi 2510 fi
2509 2511
2512 ### Use -lgpm if available, unless `--with-gpm=no'.
2513 HAVE_GPM=no
2514 if test "${with_gpm}" != "no"; then
2515 AC_CHECK_HEADER(gpm.h,
2516 AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes))
2517 fi
2518
2519 if test "${HAVE_GPM}" = "yes"; then
2520 AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).])
2521 fi
2522
2510 dnl Check for malloc/malloc.h on darwin 2523 dnl Check for malloc/malloc.h on darwin
2511 AC_CHECK_HEADER(malloc/malloc.h, AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.])) 2524 AC_CHECK_HEADER(malloc/malloc.h, AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.]))
2512 2525
2513 ### Use Mac OS X Carbon API to implement GUI. 2526 ### Use Mac OS X Carbon API to implement GUI.
2514 if test "${HAVE_CARBON}" = "yes"; then 2527 if test "${HAVE_CARBON}" = "yes"; then
2936 AC_DEFINE(REL_ALLOC, 1, 2949 AC_DEFINE(REL_ALLOC, 1,
2937 [Define REL_ALLOC if you want to use the relocating allocator for 2950 [Define REL_ALLOC if you want to use the relocating allocator for
2938 buffer space.]) 2951 buffer space.])
2939 fi 2952 fi
2940 2953
2941 AC_CHECK_LIB(gpm, Gpm_Open, LIBGPM=-lgpm)
2942 AC_SUBST(LIBGPM)
2943
2944 AH_TOP([/* GNU Emacs site configuration template file. 2954 AH_TOP([/* GNU Emacs site configuration template file.
2945 Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 2955 Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007
2946 Free Software Foundation, Inc. 2956 Free Software Foundation, Inc.
2947 2957
2948 This file is part of GNU Emacs. 2958 This file is part of GNU Emacs.
3268 echo " Does Emacs use -lXpm? ${HAVE_XPM}" 3278 echo " Does Emacs use -lXpm? ${HAVE_XPM}"
3269 echo " Does Emacs use -ljpeg? ${HAVE_JPEG}" 3279 echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
3270 echo " Does Emacs use -ltiff? ${HAVE_TIFF}" 3280 echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
3271 echo " Does Emacs use -lungif? ${HAVE_GIF}" 3281 echo " Does Emacs use -lungif? ${HAVE_GIF}"
3272 echo " Does Emacs use -lpng? ${HAVE_PNG}" 3282 echo " Does Emacs use -lpng? ${HAVE_PNG}"
3283 echo " Does Emacs use -lgpm? ${HAVE_GPM}"
3273 echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" 3284 echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
3274 echo 3285 echo
3275 3286
3276 if test $USE_XASSERTS = yes; then 3287 if test $USE_XASSERTS = yes; then
3277 echo " Compiling with asserts turned on." 3288 echo " Compiling with asserts turned on."