diff options
| author | Peter Williams <peterw@src.gnome.org> | 2000-09-06 01:32:11 +0800 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2000-09-06 01:32:11 +0800 |
| commit | 699f00049570b6024ba520505a68fdb355b2106d (patch) | |
| tree | afa89932591cd0feee63c25eb775a7827d27cccd | |
| parent | fb9da2712b83262475e7a015adadd644d4bc33cb (diff) | |
| download | gsoc2013-evolution-699f00049570b6024ba520505a68fdb355b2106d.tar.gz gsoc2013-evolution-699f00049570b6024ba520505a68fdb355b2106d.tar.zst gsoc2013-evolution-699f00049570b6024ba520505a68fdb355b2106d.zip | |
Improve the Kerberos checks further (check for Sun kerb; check for sendauth proto)
svn path=/trunk/; revision=5197
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | acconfig.h | 1 | ||||
| -rw-r--r-- | configure.in | 33 |
3 files changed, 34 insertions, 8 deletions
@@ -21,6 +21,14 @@ * configure.in: Add default_user/local/Sentbox/Makefile to the list of makefiles to output +2000-08-31 Peter Williams <peterw@helixcode.com> + + * configure.in (kerberos): Check and see if krb_sendauth needs + prototyping. (#define NEED_KRB_SENDAUTH_PROTO). Also check + for a libkrb that doesn't need -ldes. + + * acconfig.h: #undef it + 2000-08-30 Lauris Kaplinski <lauris@helixcode.com> * configure.in: AC_DEFINE(USING_GNOME_PRINT_0_20) diff --git a/acconfig.h b/acconfig.h index 1f4ba79def..f99c947ca7 100644 --- a/acconfig.h +++ b/acconfig.h @@ -21,6 +21,7 @@ #undef PGP5_PATH #undef PGP_PATH #undef USING_GNOME_PRINT_0_20 +#undef NEED_KRB_SENDAUTH_PROTO /* Define this if you want to build against the development gtk */ #undef HAVE_DEVGTK diff --git a/configure.in b/configure.in index c56a600e02..17146fd674 100644 --- a/configure.in +++ b/configure.in @@ -417,25 +417,42 @@ fi if test x${with_krb4:=no} != xno; then CFLAGS_save="$CFLAGS" LDFLAGS_save="$LDFLAGS" - CFLAGS="-I$with_krb4/include -I$with_krb4/include/kerberosIV" + CFLAGS="-I$with_krb4/include/kerberosIV -I$with_krb4/include/kerberos" + test -f "$with_krb4/include/krb.h" && \ + CFLAGS="$CFLAGS -I$with_krb4/include" + test -f "$with_krb4/include/port-sockets.h" && \ + CFLAGS="$CFLAGS -I$with_krb4/include" + LDFLAGS="-L$with_krb4/lib" AC_CHECK_LIB(krb, krb_mk_req, [ AC_DEFINE(HAVE_KRB4) KRB4_CFLAGS="$CFLAGS" - KRB4_LDFLAGS="$LDFLAGS -lkrb -ldes" + KRB4_LDFLAGS="$LDFLAGS -lkrb" ],[ - AC_CHECK_LIB(krb4, krb_mk_req, + AC_CHECK_LIB(krb, krb_mk_req, [ AC_DEFINE(HAVE_KRB4) KRB4_CFLAGS="$CFLAGS" - KRB4_LDFLAGS="$LDFLAGS -lkrb4 -ldes425 $KRB5_LDFLAGS" + KRB4_LDFLAGS="$LDFLAGS -lkrb -ldes" ],[ - AC_MSG_WARN([A sample Kerberos 4 program could not be compiled with the + AC_CHECK_LIB(krb4, krb_mk_req, + [ + AC_DEFINE(HAVE_KRB4) + KRB4_CFLAGS="$CFLAGS" + KRB4_LDFLAGS="$LDFLAGS -lkrb4 -ldes425 $KRB5_LDFLAGS" + ],[ + AC_MSG_WARN([A sample Kerberos 4 program could not be compiled with the Kerberos found in $with_krb4. Please verify that the prefix is correct.]) - with_krb4=no - ],[-ldes425 $KRB5_LDFLAGS]) - ], [-ldes]) + with_krb4=no + ],[-ldes425 $KRB5_LDFLAGS]) + ],[-ldes]) + ]) + + AC_TRY_COMPILE([#include "krb.h" + int krb_sendauth; + ],[return 0],[AC_DEFINE(NEED_KRB_SENDAUTH_PROTO)],) + CFLAGS="$CFLAGS_save" LDFLAGS="$LIBS_save" else |