Commit 84e70f78 authored by Ken Raeburn's avatar Ken Raeburn

fix build problems with krb5 and hesiod support

parent 7d8177cf
2001-10-24 Ken Raeburn <raeburn@gnu.org>
* configure.in: If --with-hesiod is given, look for
hes_getmailhost and res_send or __res_send; check hesiod and
resolv libraries respectively if system libraries don't supply
them.
2001-10-24 Gerd Moellmann <gerd@gnu.org>
* configure.in: Use $MAKE for `make' if set.
......
This diff is collapsed.
......@@ -1962,6 +1962,23 @@ AC_CHECK_FUNCS(getpt)
# than to expect to find it in ncurses.
AC_CHECK_LIB(ncurses, tparm)
# Do we need the Hesiod library to provide the support routines?
if test "$with_hesiod" = yes ; then
# Don't set $LIBS here -- see comments above.
resolv=no
AC_CHECK_FUNC(res_send, , [AC_CHECK_FUNC(__res_send, ,
[AC_CHECK_LIB(resolv, res_send, resolv=yes,
[AC_CHECK_LIB(resolv, __res_send, resolv=yes)])])])
if test "$resolv" = yes ; then
RESOLVLIB=-lresolv
AC_DEFINE(HAVE_LIBRESOLV)
else
RESOLVLIB=
fi
AC_CHECK_FUNC(hes_getmailhost, , [AC_CHECK_LIB(hesiod, hes_getmailhost,
AC_DEFINE(HAVE_LIBHESIOD), :, $RESOLVLIB)])
fi
# These tell us which Kerberos-related libraries to use.
if test "${with_kerberos+set}" = set; then
AC_CHECK_LIB(com_err, com_err)
......
2001-10-24 Ken Raeburn <raeburn@gnu.org>
* Makefile.in (HESIODLIB) [HAVE_LIBHESIOD]: Set to include
-lhesiod and maybe -lresolv.
(CRYPTOLIB) [HAVE_LIBK5CRYPTO]: Use -lk5crypto for Kerberos
support if it's available.
2001-10-21 Miles Bader <miles@gnu.org>
* make-docfile.c (struct rcsoc_state): New type.
......
......@@ -201,8 +201,12 @@ MOVE_FLAGS=
# ifdef HAVE_LIBKRB5
KRB5LIB = -lkrb5
# endif
# ifdef HAVE_LIBCRYPTO
# ifdef HAVE_LIBK5CRYPTO
CRYPTOLIB = -lk5crypto
# else
# ifdef HAVE_LIBCRYPTO
CRYPTOLIB = -lcrypto
# endif
# endif
# ifdef HAVE_LIBCOM_ERR
COM_ERRLIB = -lcom_err
......@@ -210,7 +214,13 @@ MOVE_FLAGS=
#endif /* KERBEROS */
/* If HESIOD is defined, set this to "-lhesiod". */
HESIODLIB=
#ifdef HAVE_LIBHESIOD
# ifdef HAVE_LIBRESOLV
HESIODLIB= -lhesiod -lresolv
# else
HESIODLIB= -lhesiod
# endif
#endif
MOVE_LIBS=$(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) $(HESIODLIB)
......
......@@ -132,6 +132,7 @@ Boston, MA 02111-1307, USA. */
/* Define to support using a Hesiod database to find the POP server. */
#undef HESIOD
#undef HAVE_LIBHESIOD
/* Header for Voxware or PCM sound card driver. */
#undef HAVE_MACHINE_SOUNDCARD_H
......@@ -199,6 +200,7 @@ Boston, MA 02111-1307, USA. */
#undef HAVE_LIBDES425
#undef HAVE_LIBKRB5
#undef HAVE_LIBCRYPTO
#undef HAVE_LIBK5CRYPTO
#undef HAVE_LIBCOM_ERR
/* header files */
#undef HAVE_KRB5_H
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment