Mercurial > pidgin.yaz
changeset 1877:a333eccaae93
[gaim-migrate @ 1887]
svalente's patch for configure.in
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Tue, 22 May 2001 08:35:02 +0000 |
| parents | 8ebd3b0ff325 |
| children | 75643b9f4261 |
| files | ChangeLog configure.in plugins/zephyr/Makefile.am |
| diffstat | 3 files changed, 24 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue May 22 01:03:23 2001 +0000 +++ b/ChangeLog Tue May 22 08:35:02 2001 +0000 @@ -13,7 +13,8 @@ * MSN can now change your 'friendly name' (Thanks for the packet logs, aechols) * More IRC improvements [colors, etc] (Thanks Sean Egan) - * Improved proxy options for TOC, IRC, MSN, Jabber, Oscar + * Improved proxy options for TOC, IRC, MSN, Jabber, Oscar, + Napster * Fixed a small issue with HTML not being stripped from log files properly (Thanks, faceprint)
--- a/configure.in Tue May 22 01:03:23 2001 +0000 +++ b/configure.in Tue May 22 08:35:02 2001 +0000 @@ -213,30 +213,40 @@ dnl checks for zephyr AC_DEFINE(ZEPHYR_INT32, long) - if test "x$kerberos" != "xno" ; then - if test "x$kerberos" != "xyes" ; then - CFLAGS="$CFLAGS -I${kerberos}/include" + AC_SUBST(KRB4_CFLAGS) + AC_SUBST(KRB4_LDFLAGS) + AC_SUBST(KRB4_LIBS) + if test "$kerberos" != "no" ; then + if test "$kerberos" != "yes" ; then + KRB4_CFLAGS="-I${kerberos}/include" if test -d "$kerberos/include/kerberosIV" ; then - CFLAGS="$CFLAGS -I${kerberos}/include/kerberosIV" + KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV" fi - LDFLAGS="$LDFLAGS -L${kerberos}/lib" + KRB4_LDFLAGS="-L${kerberos}/lib" elif test -d /usr/local/include/kerberosIV ; then - CFLAGS="$CFLAGS -I/usr/local/include/kerberosIV" + KRB4_CFLAGS="-I/usr/local/include/kerberosIV" elif test -d /usr/include/kerberosIV ; then - CFLAGS="$CFLAGS -I/usr/include/kerberosIV" + KRB4_CFLAGS="-I/usr/include/kerberosIV" fi AC_DEFINE(ZEPHYR_USES_KERBEROS) + + orig_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $KRB4_LDFLAGS" AC_CHECK_LIB(krb4, krb_rd_req, - [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto"], + [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"], [AC_CHECK_LIB(krb, krb_rd_req, [KRB4_LIBS="-lkrb -ldes"], [AC_ERROR(Kerberos 4 libraries not found)], -ldes)], - -ldes425 -lkrb5 -lcrypto) + -ldes425 -lkrb5 -lk5crypto -lcom_err) + orig_LIBS="$LIBS" LIBS="$LIBS $KRB4_LIBS" AC_CHECK_FUNCS(krb_set_key krb_rd_req krb_get_lrealm) + AC_CHECK_FUNCS(krb_get_err_text krb_log) + LIBS="$orig_LIBS" + LDFLAGS="$orig_LDFLAGS" fi - AC_CHECK_FUNCS(gethostid krb_get_err_text krb_log lrand48) + AC_CHECK_FUNCS(gethostid lrand48) AC_CHECK_FUNCS(memcpy memmove random strchr strerror vprintf) AC_CHECK_HEADERS(malloc.h paths.h sgtty.h stdarg.h sys/cdefs.h) AC_CHECK_HEADERS(sys/file.h sys/filio.h sys/ioctl.h sys/msgbuf.h)
--- a/plugins/zephyr/Makefile.am Tue May 22 01:03:23 2001 +0000 +++ b/plugins/zephyr/Makefile.am Tue May 22 08:35:02 2001 +0000 @@ -1,5 +1,5 @@ -CFLAGS += -I\$(top_srcdir)/src -I\$(top_srcdir)/plugins -DCONFDIR=\"$(confdir)\" -LIBS += $(GTK_LIBS) +CFLAGS += -I\$(top_srcdir)/src -I\$(top_srcdir)/plugins -DCONFDIR=\"$(confdir)\" $(KRB4_CFLAGS) +LIBS += $(GTK_LIBS) $(KRB4_LDFLAGS) $(KRB4_LIBS) pkgdir = $(libdir)/gaim pkg_LTLIBRARIES = libzephyr.la