X-Git-Url: https://git.hcoop.net/hcoop/debian/courier-authlib.git/blobdiff_plain/dd184caf1b0d37f50ea0ddcc68822bd38da32105..c8ffd9086f0b8cab7764e7affc843fc4429c0242:/configure.in

diff --git a/configure.in b/configure.in
index f607787..d3b4b0d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl $Id: configure.in,v 1.152 2007/10/07 18:33:22 mrsam Exp $
+dnl $Id: configure.in,v 1.165 2008/07/12 19:15:05 mrsam Exp $
 dnl
-dnl Copyright 1998 - 2007 Double Precision, Inc.  See COPYING for
+dnl Copyright 1998 - 2008 Double Precision, Inc.  See COPYING for
 dnl distribution information.
 
 AC_PREREQ(2.59)
-AC_INIT(courier-authlib, 0.60.1, [courier-users@lists.sourceforge.net])
+AC_INIT(courier-authlib, 0.61.0, [courier-imap@lists.sourceforge.net])
 
 AC_CONFIG_SRCDIR([courierauth.h])
 AM_CONFIG_HEADER([courier_auth_config.h])
@@ -116,78 +116,6 @@ AC_ARG_WITH(pkgconfdir,
      [pkgconfdir="$withval"],
      [pkgconfdir="$sysconfdir/authlib"])
 
-SASL_LIST="SASL(\"PLAIN\", authsasl_plain, authsaslclient_plain) SASL(\"LOGIN\", authsasl_login, authsaslclient_login)"
-
-dnl #########################################################################
-
-dnl Check if the MD5 library is available
-
-dnl #########################################################################
-
-
-if test -d ${srcdir}/md5
-then
-	MD5=1
-	AC_DEFINE_UNQUOTED(HAVE_MD5LIB, 1,
-			[ Whether we have the MD5 library available ])
-	MD5LIB=md5/libmd5.la
-	if test -d ${srcdir}/md5
-	then
-		SASL_LIST="SASL(\"CRAM-MD5\", authsasl_cram, authsaslclient_crammd5) $SASL_LIST"
-	fi
-else
-	MD5LIB=""
-	MD5=0
-fi
-AC_SUBST(MD5LIB)
-AM_CONDITIONAL(HAVE_MD5, test "$MD5" = 1)
-
-dnl #########################################################################
-
-dnl Check if the SHA1 library is available
-
-dnl #########################################################################
-
-
-if test -d ${srcdir}/sha1
-then
-	SHA1=1
-	AC_DEFINE_UNQUOTED(HAVE_SHA1LIB, 1,
-			[ Whether we have the SHA1 library available ])
-	SHA1LIB=sha1/libsha1.la
-	if test -d ${srcdir}/sha1
-	then
-		SASL_LIST="SASL(\"CRAM-SHA1\", authsasl_cram, authsaslclient_cramsha1) $SASL_LIST"
-		SASL_LIST="SASL(\"CRAM-SHA256\", authsasl_cram, authsaslclient_cramsha256) $SASL_LIST"
-	fi
-else
-	SHA1LIB=""
-	SHA1=0
-fi
-AC_SUBST(SHA1LIB)
-AM_CONDITIONAL(HAVE_SHA1, test "$SHA1" = 1)
-
-
-
-dnl #########################################################################
-
-dnl Check if the HMAC library is available
-
-dnl #########################################################################
-
-if test -d ${srcdir}/libhmac
-then
-	HMAC=1
-	AC_DEFINE_UNQUOTED(HAVE_HMACLIB, 1,
-			 [ Whether we have the HMAC library available ])
-	HMACLIB=libhmac/libhmac.la
-else
-	HMACLIB=""
-	HMAC=0
-fi
-AC_SUBST(HMACLIB)
-AM_CONDITIONAL(HAVE_HMACLIB, test "$HMAC" = 1)
-
 saveLIBS="$LIBS"
 NETLIBS=""
 USENSL=no
@@ -289,7 +217,6 @@ if test "$HAVE_GDBM" = "y"
 then
 	LIBDB=""
 	USE_GDBM=1
-	DBSUBDIR=gdbmobj
 	if test "$needs_withdb" = 1
 	then
 		ac_configure_args="$ac_configure_args --with-db=gdbm"
@@ -298,7 +225,6 @@ then
 else
 	LIBGDBM=""
 	USE_DB=1
-	DBSUBDIR=bdbobj
 	if test "$needs_withdb" = 1
 	then
 		ac_configure_args="$ac_configure_args --with-db=db"
@@ -306,11 +232,8 @@ else
 	dblibrary=bdbobj/libbdbobj.la
 fi
 
-AC_SUBST(DBSUBDIR)
 AC_SUBST(USE_GDBM)
 AC_SUBST(USE_DB)
-AC_SUBST(LIBDB)
-AC_SUBST(LIBGDBM)
 
 AC_ARG_WITH(authuserdb,
 [ --without-authuserdb               Do not include the authuserdb module ],
@@ -569,82 +492,6 @@ AC_SUBST(LIBAUTHPWD)
 
 dnl #########################################################################
 
-dnl Prepare authvchkpw module if vchkpw is installed.
-
-dnl #########################################################################
-
-changequote(<<,>>)
-
-vpopmail_home=`$PERL -e '@a=getpwnam("vpopmail"); print "$a[7]";'`
-
-changequote([,])
-
-AC_ARG_WITH(authvchkpw,
-[ --without-authvchkpw               Do not include the authvchkpw module ],
-	doauthvchkpw="$withval",
-	doauthvchkpw=no
-	if test "$vpopmail_home" != ""
-	then
-		doauthvchkpw=yes
-	fi)
-
-if test "$doauthvchkpw" = "no"
-then
-	HAVE_VCHKPW=0
-	vpopmail_home=.
-else
-	HAVE_VCHKPW=1
-
-
-	cat  <<EOF
-----------------------------------------------------
-                     NOTE
-
-
-All questions regarding ANY vpopmail-related problems,
-such as compiling/building failures, or login errors
-should be referred to the vpopmail mailing list.
-Vpopmail questions sent to the Courier mailing lists
-will be IGNORED.
-----------------------------------------------------
-
-EOF
-	sleep 5
-
-	if test -f ${vpopmail_home}/etc/lib_deps
-	then
-		CFLAGS="`cat ${vpopmail_home}/etc/inc_deps` $CFLAGS"
-		VPOPMAILLIBS="`cat ${vpopmail_home}/etc/lib_deps`"
-	else
-		AC_MSG_ERROR(${vpopmail_home}/etc/lib_deps does not exist - upgrade vpopmail to the current version or fix the permissions on this file)
-	fi
-fi
-AC_SUBST(vpopmail_home)
-AC_SUBST(VPOPMAILLIBS)
-
-LIBAUTHVCHKPW=""
-if test "$HAVE_VCHKPW" = 1
-then
-	LIBAUTHVCHKPW="libauthvchkpw.la"
-	HAVE_VCHKPW="1"
-
-dnl Check if vpopmail has open_smtp_relay() function
-
-	_SAVE_LIBS=$LIBS
-	LIBS="$VPOPMAILLIBS $CRYPTLIBS $LIBS"
-	AC_CHECK_FUNC(open_smtp_relay, 
-		AC_DEFINE(HAVE_OPEN_SMTP_RELAY, 1,
-		[ Whether -lvpopmail has the open_smtp_relay() function ]) )
-	AC_CHECK_FUNC(vset_lastauth,
-		AC_DEFINE(HAVE_VSET_LASTAUTH, 1,
-		[ Whether -lvpopmail has the vset_lastauth() function ]))
-	LIBS=$_SAVE_LIBS
-fi
-
-AC_SUBST(LIBAUTHVCHKPW)
-
-dnl #########################################################################
-
 dnl Prepare authpgsql module
 
 dnl #########################################################################
@@ -898,12 +745,8 @@ AC_SUBST(authdaemonvar)
 
 AC_SUBST(LIBM)
 
-AC_DEFINE_UNQUOTED(SASL_LIST,$SASL_LIST,
-	[ This macro is used to build the list of SASL modules ])
-
 rm -f authdaemonrc.h authldaprc.h authmysqlrc.h authpgsqlrc.h vpopmail_config.h
 
-
 dnl
 dnl Need to settle on our uid/gids here
 dnl
@@ -914,7 +757,7 @@ if test -x "$COURIERCONFIG"
 then
 	$COURIERCONFIG >conftest.out || exit 1
 	sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
-	. conftest2.out
+	. ./conftest2.out
 	rm -f conftest.out conftest2.out
 
 	cmailuser="$mailuser"
@@ -926,7 +769,7 @@ if test -x "$bindir/courierauthconfig"
 then
 	$bindir/courierauthconfig --configfiles >conftest.out || exit 1
 	sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
-	. conftest2.out
+	. ./conftest2.out
 	rm -f conftest.out conftest2.out
 
 	cmailuser="$mailuser"
@@ -1072,19 +915,12 @@ else
 	AC_DEFINE_UNQUOTED(socklen_t, int, [ Default definition for socklen_t ])
 fi
 
-if test x"$enable_ltdl_install" = x"yes"
-then
-	LIBLTDL_SUBDIR=libltdl
-fi
-
-AC_SUBST(LIBLTDL_SUBDIR)
-
 AC_ARG_WITH(repository, [], REPOSITORY="$withval")
 AC_SUBST(REPOSITORY)
 
 AM_CONDITIONAL(HAVE_SGML, test -d ${srcdir}/docbook)
 AC_CONFIG_SUBDIRS(libltdl bdbobj gdbmobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog)
 
-AC_CONFIG_FILES(Makefile authdaemond authdaemonrc authsystem.passwd README.authdebug.html dbobj.h authmigrate courier-authlib.spec courier-authlib.lpspec courier-authlib.sysvinit userdb-test-cram-md5.pl)
+AC_CONFIG_FILES(Makefile authdaemond authdaemonrc authsystem.passwd README.authdebug.html dbobj.config dbobj.h authmigrate courier-authlib.spec courier-authlib.lpspec courier-authlib.sysvinit userdb-test-cram-md5.pl)
 AC_OUTPUT