Mercurial > emacs
comparison configure.in @ 90789:c0409ee15cee
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 21 Mar 2007 13:33:07 +0000 |
parents | dd7c098af727 94c20495b575 |
children | 4ef881a120fe |
comparison
equal
deleted
inserted
replaced
90788:a12805fdabe8 | 90789:c0409ee15cee |
---|---|
52 fi], | 52 fi], |
53 AC_DEFINE(MAIL_USE_POP)) | 53 AC_DEFINE(MAIL_USE_POP)) |
54 AH_TEMPLATE(MAIL_USE_POP, [Define to support POP mail retrieval.])dnl | 54 AH_TEMPLATE(MAIL_USE_POP, [Define to support POP mail retrieval.])dnl |
55 AC_ARG_WITH(kerberos, | 55 AC_ARG_WITH(kerberos, |
56 [ --with-kerberos support Kerberos-authenticated POP], | 56 [ --with-kerberos support Kerberos-authenticated POP], |
57 [AC_DEFINE(KERBEROS)]) | 57 [if test "$withval" = yes; then |
58 AC_DEFINE(KERBEROS) | |
59 fi]) | |
58 AH_TEMPLATE(KERBEROS, | 60 AH_TEMPLATE(KERBEROS, |
59 [Define to support Kerberos-authenticated POP mail retrieval.])dnl | 61 [Define to support Kerberos-authenticated POP mail retrieval.])dnl |
60 AC_ARG_WITH(kerberos5, | 62 AC_ARG_WITH(kerberos5, |
61 [ --with-kerberos5 support Kerberos version 5 authenticated POP], | 63 [ --with-kerberos5 support Kerberos version 5 authenticated POP], |
62 [if test "${with_kerberos5+set}" = set; then | 64 [if test "${with_kerberos5+set}" = set; then |
63 if test "${with_kerberos+set}" != set; then | 65 if test "${with_kerberos+set}" != set; then |
64 with_kerberos=yes | 66 with_kerberos=yes |
65 AC_DEFINE(KERBEROS) | 67 AC_DEFINE(KERBEROS) |
66 fi | 68 fi |
67 fi | 69 AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.]) |
68 AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.])]) | 70 fi]) |
69 AC_ARG_WITH(hesiod, | 71 AC_ARG_WITH(hesiod, |
70 [ --with-hesiod support Hesiod to get the POP server host], | 72 [ --with-hesiod support Hesiod to get the POP server host], |
71 [AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.])]) | 73 [if test "$withval" = yes; then |
74 AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.]) | |
75 fi]) | |
72 | 76 |
73 AC_ARG_WITH(sound, | 77 AC_ARG_WITH(sound, |
74 [ --without-sound don't compile with sound support]) | 78 [ --without-sound don't compile with sound support]) |
75 | 79 |
76 dnl This should be the last --with option, because --with-x is | 80 dnl This should be the last --with option, because --with-x is |
286 ## OpenBSD ports | 290 ## OpenBSD ports |
287 *-*-openbsd* ) | 291 *-*-openbsd* ) |
288 opsys=openbsd | 292 opsys=openbsd |
289 case "${canonical}" in | 293 case "${canonical}" in |
290 alpha*-*-openbsd*) machine=alpha ;; | 294 alpha*-*-openbsd*) machine=alpha ;; |
291 i386-*-openbsd*) machine=intel386 ;; | 295 arm-*-openbsd*) machine=arm ;; |
292 x86_64-*-openbsd*) machine=amdx86-64 ;; | 296 hppa-*-openbsd*) machine=hp9000s300 ;; |
293 m68k-*-openbsd*) machine=hp9000s300 ;; | 297 i386-*-openbsd*) machine=intel386 ;; |
294 mipsel-*-openbsd*) machine=pmax ;; | 298 m68k-*-openbsd*) machine=hp9000s300 ;; |
295 ns32k-*-openbsd*) machine=ns32000 ;; | 299 m88k-*-openbsd*) machine=aviion ;; |
296 sparc-*-openbsd*) machine=sparc ;; | 300 mips64-*-openbsd*) machine=mips64 ;; |
297 vax-*-openbsd*) machine=vax ;; | 301 powerpc-*-openbsd*) machine=macppc ;; |
302 sh-*-openbsd*) machine=sh3el ;; | |
303 sparc*-*-openbsd*) machine=sparc ;; | |
304 vax-*-openbsd*) machine=vax ;; | |
305 x86_64-*-openbsd*) machine=amdx86-64 ;; | |
298 esac | 306 esac |
299 ;; | 307 ;; |
300 | 308 |
301 ## LynxOS ports | 309 ## LynxOS ports |
302 *-*-lynxos* ) | 310 *-*-lynxos* ) |
3271 echo " Compiling with asserts turned on." | 3279 echo " Compiling with asserts turned on." |
3272 CPPFLAGS="$CPPFLAGS -DXASSERTS=1" | 3280 CPPFLAGS="$CPPFLAGS -DXASSERTS=1" |
3273 echo | 3281 echo |
3274 fi | 3282 fi |
3275 | 3283 |
3284 if test "$USE_X_TOOLKIT" = GTK; then | |
3285 case "$canonical" in | |
3286 *cygwin*) | |
3287 echo "There are known problems with Emacs and Gtk+ on cygwin, so you | |
3288 will probably get a crash on startup. If this happens, please use another | |
3289 toolkit for Emacs. See etc/PROBLEMS for more information." | |
3290 ;; | |
3291 esac | |
3292 fi | |
3293 | |
3276 | 3294 |
3277 | 3295 |
3278 # Remove any trailing slashes in these variables. | 3296 # Remove any trailing slashes in these variables. |
3279 [test "${prefix}" != NONE && | 3297 [test "${prefix}" != NONE && |
3280 prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'` | 3298 prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'` |