Mercurial > emacs
comparison configure.in @ 96731:79339db0a32f
(with_kerberos, with_kerberos5, with_hesiod):
Fix tests for OPTION_DEFAULT_OFF (variables never unset).
(with_carbon): Remove dead code, since OPTION_DEFAULT_OFF means never unset.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Wed, 16 Jul 2008 07:55:50 +0000 |
parents | b9cd22789f50 |
children | c1059cece4e3 |
comparison
equal
deleted
inserted
replaced
96730:a5dd283d15b2 | 96731:79339db0a32f |
---|---|
73 AC_DEFINE(MAIL_USE_POP) | 73 AC_DEFINE(MAIL_USE_POP) |
74 fi | 74 fi |
75 AH_TEMPLATE(MAIL_USE_POP, [Define to support POP mail retrieval.])dnl | 75 AH_TEMPLATE(MAIL_USE_POP, [Define to support POP mail retrieval.])dnl |
76 | 76 |
77 OPTION_DEFAULT_OFF([kerberos],[support Kerberos-authenticated POP]) | 77 OPTION_DEFAULT_OFF([kerberos],[support Kerberos-authenticated POP]) |
78 if test "$with_kerberos" = yes; then | 78 if test "$with_kerberos" != no; then |
79 AC_DEFINE(KERBEROS) | 79 AC_DEFINE(KERBEROS) |
80 fi | 80 fi |
81 AH_TEMPLATE(KERBEROS, | 81 AH_TEMPLATE(KERBEROS, |
82 [Define to support Kerberos-authenticated POP mail retrieval.])dnl | 82 [Define to support Kerberos-authenticated POP mail retrieval.])dnl |
83 | 83 |
84 OPTION_DEFAULT_OFF([kerberos5],[support Kerberos version 5 authenticated POP]) | 84 OPTION_DEFAULT_OFF([kerberos5],[support Kerberos version 5 authenticated POP]) |
85 if test "${with_kerberos5}" = yes; then | 85 if test "${with_kerberos5}" != no; then |
86 if test "${with_kerberos}" != yes; then | 86 if test "${with_kerberos}" = no; then |
87 with_kerberos=yes | 87 with_kerberos=yes |
88 AC_DEFINE(KERBEROS) | 88 AC_DEFINE(KERBEROS) |
89 fi | 89 fi |
90 AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.]) | 90 AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.]) |
91 fi | 91 fi |
92 | 92 |
93 OPTION_DEFAULT_OFF([hesiod],[support Hesiod to get the POP server host]) | 93 OPTION_DEFAULT_OFF([hesiod],[support Hesiod to get the POP server host]) |
94 if test "$with_hesiod" = yes; then | 94 if test "$with_hesiod" != no; then |
95 AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.]) | 95 AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.]) |
96 fi | 96 fi |
97 | 97 |
98 OPTION_DEFAULT_ON([sound],[don't compile with sound support]) | 98 OPTION_DEFAULT_ON([sound],[don't compile with sound support]) |
99 | 99 |
1215 fi | 1215 fi |
1216 | 1216 |
1217 HAVE_CARBON=no | 1217 HAVE_CARBON=no |
1218 if test "${with_carbon}" != no; then | 1218 if test "${with_carbon}" != no; then |
1219 AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes) | 1219 AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes) |
1220 fi | 1220 test "${HAVE_CARBON}" = yes && window_system=mac |
1221 if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then | |
1222 if test "${with_carbon+set}" != set \ | |
1223 && test "${carbon_appdir_x+set}" != set; then | |
1224 for var in with_x with_x_toolkit with_xim \ | |
1225 with_xpm with_jpeg with_tiff with_gif with_png; do | |
1226 if eval test \"\${$var+set}\" = set; then | |
1227 HAVE_CARBON=no | |
1228 break | |
1229 fi | |
1230 done | |
1231 fi | |
1232 fi | |
1233 if test "${HAVE_CARBON}" = yes; then | |
1234 window_system=mac | |
1235 fi | 1221 fi |
1236 | 1222 |
1237 HAVE_NS=no | 1223 HAVE_NS=no |
1238 COCOA=no | 1224 COCOA=no |
1239 GNUSTEP=no | 1225 GNUSTEP=no |
2239 if test "$have_res_init" = yes; then | 2225 if test "$have_res_init" = yes; then |
2240 AC_DEFINE(HAVE_RES_INIT, 1, [Define to 1 if res_init is available.]) | 2226 AC_DEFINE(HAVE_RES_INIT, 1, [Define to 1 if res_init is available.]) |
2241 fi | 2227 fi |
2242 | 2228 |
2243 # Do we need the Hesiod library to provide the support routines? | 2229 # Do we need the Hesiod library to provide the support routines? |
2244 if test "$with_hesiod" = yes ; then | 2230 if test "$with_hesiod" != no ; then |
2245 # Don't set $LIBS here -- see comments above. | 2231 # Don't set $LIBS here -- see comments above. |
2246 AC_CHECK_FUNC(res_send, , [AC_CHECK_FUNC(__res_send, , | 2232 AC_CHECK_FUNC(res_send, , [AC_CHECK_FUNC(__res_send, , |
2247 [AC_CHECK_LIB(resolv, res_send, resolv=yes, | 2233 [AC_CHECK_LIB(resolv, res_send, resolv=yes, |
2248 [AC_CHECK_LIB(resolv, __res_send, resolv=yes)])])]) | 2234 [AC_CHECK_LIB(resolv, __res_send, resolv=yes)])])]) |
2249 if test "$resolv" = yes ; then | 2235 if test "$resolv" = yes ; then |
2262 AC_DEFINE(HAVE_LIBRESOLV, 1, | 2248 AC_DEFINE(HAVE_LIBRESOLV, 1, |
2263 [Define to 1 if you have the resolv library (-lresolv).]) | 2249 [Define to 1 if you have the resolv library (-lresolv).]) |
2264 fi | 2250 fi |
2265 | 2251 |
2266 # These tell us which Kerberos-related libraries to use. | 2252 # These tell us which Kerberos-related libraries to use. |
2267 if test "${with_kerberos+set}" = set; then | 2253 if test "${with_kerberos}" != no; then |
2268 AC_CHECK_LIB(com_err, com_err) | 2254 AC_CHECK_LIB(com_err, com_err) |
2269 AC_CHECK_LIB(k5crypto, mit_des_cbc_encrypt) | 2255 AC_CHECK_LIB(k5crypto, mit_des_cbc_encrypt) |
2270 AC_CHECK_LIB(crypto, mit_des_cbc_encrypt) | 2256 AC_CHECK_LIB(crypto, mit_des_cbc_encrypt) |
2271 AC_CHECK_LIB(krb5, krb5_init_context) | 2257 AC_CHECK_LIB(krb5, krb5_init_context) |
2272 if test "${with_kerberos5+set}" != set; then | 2258 if test "${with_kerberos5}" = no; then |
2273 AC_CHECK_LIB(des425, des_cbc_encrypt,, | 2259 AC_CHECK_LIB(des425, des_cbc_encrypt,, |
2274 [AC_CHECK_LIB(des, des_cbc_encrypt)]) | 2260 [AC_CHECK_LIB(des, des_cbc_encrypt)]) |
2275 AC_CHECK_LIB(krb4, krb_get_cred,, | 2261 AC_CHECK_LIB(krb4, krb_get_cred,, |
2276 [AC_CHECK_LIB(krb, krb_get_cred)]) | 2262 [AC_CHECK_LIB(krb, krb_get_cred)]) |
2277 fi | 2263 fi |
2278 | 2264 |
2279 if test "${with_kerberos5+set}" = set; then | 2265 if test "${with_kerberos5}" != no; then |
2280 AC_CHECK_HEADERS(krb5.h) | 2266 AC_CHECK_HEADERS(krb5.h) |
2281 else | 2267 else |
2282 AC_CHECK_HEADERS(des.h,, | 2268 AC_CHECK_HEADERS(des.h,, |
2283 [AC_CHECK_HEADERS(kerberosIV/des.h,, | 2269 [AC_CHECK_HEADERS(kerberosIV/des.h,, |
2284 [AC_CHECK_HEADERS(kerberos/des.h)])]) | 2270 [AC_CHECK_HEADERS(kerberos/des.h)])]) |