* Makefile.in, configure.in: added --enable-icq flag; made checks for

	  authentication libraries more intelligent.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index eb66d5ae8ec8aa9df5f11291767c16d0bf0cc8f3..fc5ac45cc2f14208314b8bb44b1a90f9d2937f24 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 1.393  1999/10/24 19:22:51  nbryant
+       * Makefile.in, configure.in: added --enable-icq flag; made checks for
+         authentication libraries more intelligent.
+
 Revision 1.392  1999/10/23 03:39:12  ajc
 * Finished moving vCard functionality to the new message base functions.
 
@@ -1343,3 +1347,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
+

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 06705a1b39018181d1753a4d1ff41e59f098baeb..861ef8c89fd398da680ac7b18f141a68f53eba59 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -21,12 +21,13 @@ all: $(TARGETS)
 
 EXEEXT=@EXEEXT@
 SO=@SO@
+SERV_ICQ=@SERV_ICQ@
 
 CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT)
 SERVER_TARGETS=citserver setup $(CHKPWD)
 SERV_MODULES=modules/serv_chat$(SO) modules/serv_vcard$(SO) \
        modules/serv_upgrade$(SO) \
-       modules/serv_expire$(SO) modules/serv_icq$(SO)
+       modules/serv_expire$(SO) $(SERV_ICQ)
 UTIL_TARGETS=aidepost netmailer netproc netsetup msgform readlog rcit \
        stats citmail netpoll mailinglist userlist sendcommand \
        base64 qpdecode

diff --git a/citadel/configure.in b/citadel/configure.in
index 4d5817618b78ec958d6a7863b11e1aa5ed54910e..ea76c1973c9a2c3ab9d1975a4d86ec8a1a08a2e9 100644 (file)
--- a/citadel/configure.in
+++ b/citadel/configure.in
@@ -11,6 +11,12 @@ fi
 
 AC_ARG_ENABLE(autologin, [  --disable-autologin     disable autologin (default is enabled if possible)])
 AC_ARG_ENABLE(chkpwd, [  --disable-chkpwd        don't build 'chkpwd'])
+
+AC_ARG_ENABLE(icq, [  --enable-icq            include server ICQ support], [
+       if test "x$enableval" = xyes; then
+               SERV_ICQ='modules/serv_icq$(SO)'
+       fi])
+
 AC_ARG_WITH(pam, [  --with-pam              use PAM if present (see PAM.txt before you try this)])
 AC_ARG_WITH(kthread, [  --with-kthread          use kernel threads (on FreeBSD) (not recommended yet)])
 
@@ -108,7 +114,7 @@ fi
 
 if test "$ac_cv_func_dlopen" = no; then
         AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"
-               chkpwd_LIBS=-ldl])
+               test "$with_pam" = yes && chkpwd_LIBS="-ldl $chkpwd_LIBS"])
 fi
 
 dnl Determine the system's authentication capabilities, if autologin is
@@ -123,9 +129,15 @@ if test "$enable_autologin" != no; then
                test "$enable_chkpwd" != no && LIBS=$save_LIBS
        fi
        if test "$ac_cv_func_pam_start" = no -o "$with_pam" != yes; then
-               AC_CHECK_LIB(shadow, getspnam)
+               save_LIBS=$LIBS
+               AC_SEARCH_LIBS(getspnam, shadow, [
+                       if test "$ac_cv_search_getspnam" = -lshadow; then
+                               chkpwd_LIBS="-lshadow $chkpwd_LIBS"
+                       fi])
+               test "$enable_chkpwd" != no && LIBS=$save_LIBS
                if test "$ac_cv_func_crypt" = no; then
-                       AC_CHECK_LIB(crypt, crypt, [chkpwd_LIBS=-lcrypt
+                       AC_CHECK_LIB(crypt, crypt, [
+                               chkpwd_LIBS="-lcrypt $chkpwd_LIBS"
                                test "$enable_chkpwd" = no && \
                                        LIBS="-lcrypt $LIBS"])
                fi
@@ -258,6 +270,7 @@ AC_SUBST(NETLIBS)
 AC_SUBST(chkpwd_LIBS)
 AC_SUBST(TARGETS)
 AC_SUBST(SERVER_LDFLAGS)
+AC_SUBST(SERV_ICQ)
 AC_SUBST(PICFLAGS)
 AC_SUBST(LINK_SHARED)
 AC_SUBST(PTHREAD_DEFS)