[dovecot-cvs] dovecot configure.in,1.277.2.66,1.277.2.67

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot
In directory talvi:/tmp/cvs-serv1622

Modified Files:
      Tag: branch_1_0
	configure.in 
Log Message:
Link dovecot-auth always with -lcrypto if it's needed for crypt(). It could
possibly be used with any passdb, so don't bother doing it only for a few of
them.



Index: configure.in
===================================================================
RCS file: /var/lib/cvs/dovecot/configure.in,v
retrieving revision 1.277.2.66
retrieving revision 1.277.2.67
diff -u -d -r1.277.2.66 -r1.277.2.67
--- configure.in	13 Mar 2007 18:52:45 -0000	1.277.2.66
+++ configure.in	16 Mar 2007 15:11:37 -0000	1.277.2.67
@@ -1374,12 +1374,10 @@
 dnl ** userdb and passdb checks
 dnl **
 
-need_crypt=no
 userdb=""
 passdb=""
 
 if test $want_static_userdb = yes; then
-	need_crypt=yes
         AC_DEFINE(USERDB_STATIC,, Build with static userdb support)
 	userdb="$userdb static"
 fi
@@ -1390,7 +1388,6 @@
 fi
 
 if test $want_passwd = yes; then
-	need_crypt=yes
         AC_DEFINE(USERDB_PASSWD,, Build with passwd support)
         AC_DEFINE(PASSDB_PASSWD,, Build with passwd support)
 	userdb="$userdb passwd"
@@ -1398,7 +1395,6 @@
 fi
 
 if test $want_passwd_file = yes; then
-	need_crypt=yes
         AC_DEFINE(USERDB_PASSWD_FILE,, Build with passwd-file support)
         AC_DEFINE(PASSDB_PASSWD_FILE,, Build with passwd-file support)
 	userdb="$userdb passwd-file"
@@ -1408,7 +1404,6 @@
 if test $want_shadow = yes; then
 	AC_CHECK_FUNC(getspnam, [
 		AC_CHECK_HEADER(shadow.h, [
-			need_crypt=yes
 			AC_DEFINE(PASSDB_SHADOW,, Build with shadow support)
 			passdb="$passdb shadow"
 		])
@@ -1659,7 +1654,6 @@
 
 	AC_MSG_CHECKING([for vpopmail configuration at $vpop_libdeps])
 	if test -f $vpop_libdeps; then
-		need_crypt=yes
 		AUTH_CFLAGS="$AUTH_CFLAGS `cat $vpopmail_home/etc/inc_deps` $CFLAGS"
 		AUTH_LIBS="$AUTH_LIBS `cat $vpop_libdeps`"
 		AC_DEFINE(USERDB_VPOPMAIL,, Build with vpopmail support)
@@ -1673,15 +1667,13 @@
 	fi
 fi
 
-if test $need_crypt = yes; then
-	AC_CHECK_LIB(crypt, crypt, [
-		AUTH_LIBS="-lcrypt $AUTH_LIBS"
-	], [
-		AC_CHECK_FUNC(crypt,, [
-			AC_MSG_ERROR([crypt() wasn't found])
-		])
+AC_CHECK_LIB(crypt, crypt, [
+	AUTH_LIBS="-lcrypt $AUTH_LIBS"
+], [
+	AC_CHECK_FUNC(crypt,, [
+		AC_MSG_ERROR([crypt() wasn't found])
 	])
-fi
+])
 
 dnl * dynamic modules?
 have_modules=no