Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit d1b47175 d1b47175926427b620638af0a2860625829a0660 by Sergey Poznyakoff
Options

Moved Kerberos libs to SERV_AUTHLIBS.

1 parent f86463bd
Inline Side-by-side
Showing 1 changed file with 8 additions and 3 deletions
...@@ -94,6 +94,8 @@ case "${withval}" in ...@@ -94,6 +94,8 @@ case "${withval}" in
94 esac],[usereadline=yes]) 94 esac],[usereadline=yes])
95 95
96 AC_SUBST(IMAP_AUTHOBJS) 96 AC_SUBST(IMAP_AUTHOBJS)
97 AC_SUBST(SERV_AUTHLIBS)
98 AC_SUBST(SERV_AUTHINCS)
97 99
98 AC_ARG_WITH([gssapi], 100 AC_ARG_WITH([gssapi],
99 AC_HELP_STRING([--with-gssapi], 101 AC_HELP_STRING([--with-gssapi],
...@@ -107,8 +109,8 @@ if test "x$WITH_GSSAPI" != "xno"; then ...@@ -107,8 +109,8 @@ if test "x$WITH_GSSAPI" != "xno"; then
107 AC_CACHE_SAVE 109 AC_CACHE_SAVE
108 AC_MSG_RESULT([GSSAPI libraries not found]) 110 AC_MSG_RESULT([GSSAPI libraries not found])
109 else 111 else
110 AUTHLIBS="$AUTHLIBS $GSSAPI_LIBS" 112 SERV_AUTHLIBS="$SERV_AUTHLIBS $GSSAPI_LIBS"
111 AUTHINCS="$AUTHINCS $GSSAPI_CFLAGS" 113 SERV_AUTHINCS="$SERV_AUTHINCS $GSSAPI_CFLAGS"
112 IMAP_AUTHOBJS="$IMAP_AUTHOBJS auth_gss.o" 114 IMAP_AUTHOBJS="$IMAP_AUTHOBJS auth_gss.o"
113 AC_DEFINE(WITH_GSSAPI,1,[Define if mailutils is using GSSAPI]) 115 AC_DEFINE(WITH_GSSAPI,1,[Define if mailutils is using GSSAPI])
114 fi 116 fi
...@@ -502,7 +504,8 @@ if test x"$testpam" = x"yes"; then ...@@ -502,7 +504,8 @@ if test x"$testpam" = x"yes"; then
502 if test x"$ac_cv_header_security_pam_appl_h" = x"yes"; then 504 if test x"$ac_cv_header_security_pam_appl_h" = x"yes"; then
503 AC_CHECK_LIB(dl, dlopen, [LDL=-ldl], [LDL=]) 505 AC_CHECK_LIB(dl, dlopen, [LDL=-ldl], [LDL=])
504 AC_CHECK_LIB(pam, pam_start, 506 AC_CHECK_LIB(pam, pam_start,
505 AUTHLIBS="$AUTHLIBS -lpam $LDL" ac_cv_have_libpam="yes",, $LDL) 507 [AUTHLIBS="$AUTHLIBS -lpam $LDL"
508 ac_cv_have_libpam="yes"],, $LDL)
506 AC_DEFINE(USE_LIBPAM,1,[Enable use of PAM]) 509 AC_DEFINE(USE_LIBPAM,1,[Enable use of PAM])
507 fi 510 fi
508 fi 511 fi
...@@ -638,6 +641,7 @@ AC_SUBST(GUILE_SNARF_VERSION) ...@@ -638,6 +641,7 @@ AC_SUBST(GUILE_SNARF_VERSION)
638 AC_SUBST(GUIMB) 641 AC_SUBST(GUIMB)
639 AC_SUBST(MU_SCM) 642 AC_SUBST(MU_SCM)
640 AC_SUBST(LIBMU_SCM) 643 AC_SUBST(LIBMU_SCM)
644 AC_SUBST(LIBMU_SCM_DEPS)
641 AC_SUBST(GUILE_PKGDATA) 645 AC_SUBST(GUILE_PKGDATA)
642 AC_SUBST(GUILE_BUILT_SOURCES) 646 AC_SUBST(GUILE_BUILT_SOURCES)
643 647
...@@ -650,6 +654,7 @@ if test x"$useguile" = x"yes"; then ...@@ -650,6 +654,7 @@ if test x"$useguile" = x"yes"; then
650 GUIMB=guimb 654 GUIMB=guimb
651 MU_SCM=libmu_scm.la 655 MU_SCM=libmu_scm.la
652 LIBMU_SCM=../libmu_scm/libmu_scm.la 656 LIBMU_SCM=../libmu_scm/libmu_scm.la
657 LIBMU_SCM_DEPS="../mailbox/mbox/libmu_mbox.la ../mailbox/imap/libmu_imap.la ../mailbox/pop/libmu_pop.la ../mailbox/mh/libmu_mh.la"
653 GUILE_PKGDATA="guile-procedures.txt mailutils.scm" 658 GUILE_PKGDATA="guile-procedures.txt mailutils.scm"
654 GUILE_BUILT_SOURCES='$(DOT_X_FILES) $(DOT_DOC_FILES)' 659 GUILE_BUILT_SOURCES='$(DOT_X_FILES) $(DOT_DOC_FILES)'
655 case "$GUILE_VERSION" in 660 case "$GUILE_VERSION" in
......