Diff: configure.in - configure.in

	configure.in	configure.in
	dnl configure.in for the SASL library	dnl configure.in for the SASL library
	dnl Rob Siemborski	dnl Rob Siemborski
	dnl Rob Earhart	dnl Rob Earhart

	dnl $Id: configure.in,v 1.222 2011/09/07 13:19:44 murch Exp $	dnl $Id: configure.in,v 1.224 2011/09/22 14:44:15 mel Exp $
	dnl	dnl
	dnl Copyright (c) 2001 Carnegie Mellon University. All rights reserved.	dnl Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
	dnl	dnl
	dnl Redistribution and use in source and binary forms, with or without	dnl Redistribution and use in source and binary forms, with or without
	dnl modification, are permitted provided that the following conditions	dnl modification, are permitted provided that the following conditions
	dnl are met:	dnl are met:
	dnl	dnl
	dnl 1. Redistributions of source code must retain the above copyright	dnl 1. Redistributions of source code must retain the above copyright
	dnl notice, this list of conditions and the following disclaimer.	dnl notice, this list of conditions and the following disclaimer.
	dnl	dnl

	skipping to change at line 62	skipping to change at line 62
	fi	fi

	AC_CONFIG_AUX_DIR(config)	AC_CONFIG_AUX_DIR(config)
	AC_CANONICAL_HOST	AC_CANONICAL_HOST
	AC_CANONICAL_TARGET	AC_CANONICAL_TARGET

	dnl	dnl
	dnl REMINDER: When changing the version number here, please also update	dnl REMINDER: When changing the version number here, please also update
	dnl the values in win32/include/config.h and include/sasl.h as well.	dnl the values in win32/include/config.h and include/sasl.h as well.
	dnl	dnl

	AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.25)	AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.26)
	CMU_INIT_AUTOMAKE	CMU_INIT_AUTOMAKE

	# and include our config dir scripts	# and include our config dir scripts
	ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"	ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"

	DIRS=""	DIRS=""

	AC_ARG_ENABLE(cmulocal,	AC_ARG_ENABLE(cmulocal,
	[AC_HELP_STRING([--enable-cmulocal],	[AC_HELP_STRING([--enable-cmulocal],
	[enable local mods for CMU [[no]]])],	[enable local mods for CMU [[no]]])],

	skipping to change at line 127	skipping to change at line 127
	SASL_STATIC_LIBS=libsasl2.a	SASL_STATIC_LIBS=libsasl2.a
	else	else
	SASL_STATIC_LIBS=	SASL_STATIC_LIBS=
	fi	fi

	AC_ARG_ENABLE(staticdlopen, [ --enable-staticdlopen try dynamic plugins when we are a static libsasl [[no]] ],	AC_ARG_ENABLE(staticdlopen, [ --enable-staticdlopen try dynamic plugins when we are a static libsasl [[no]] ],
	enable_staticdlopen=$enableval,	enable_staticdlopen=$enableval,
	enable_staticdlopen=no)	enable_staticdlopen=no)

	if test "$enable_staticdlopen" = yes; then	if test "$enable_staticdlopen" = yes; then

	AC_DEFINE(TRY_DLOPEN_WHEN_STATIC,[],[Should we try to dlopen() plugins wh ile staticly compiled?])	AC_DEFINE(TRY_DLOPEN_WHEN_STATIC,[],[Should we try to dlopen() plugins wh ile statically compiled?])
	fi	fi

	if test "$ac_cv_prog_gcc" = yes; then	if test "$ac_cv_prog_gcc" = yes; then
	CFLAGS="-Wall -W ${CFLAGS}"	CFLAGS="-Wall -W ${CFLAGS}"
	fi	fi

	AC_ARG_WITH(purecov,[ --with-purecov link with purecov])	AC_ARG_WITH(purecov,[ --with-purecov link with purecov])
	if test "$with_purecov" = yes; then	if test "$with_purecov" = yes; then
	AC_CHECK_PROGS(PURECOV, purecov)	AC_CHECK_PROGS(PURECOV, purecov)
	fi	fi

	skipping to change at line 396	skipping to change at line 396
	AC_MSG_CHECKING(CRAM-MD5)	AC_MSG_CHECKING(CRAM-MD5)
	if test "$cram" != no; then	if test "$cram" != no; then
	AC_MSG_RESULT(enabled)	AC_MSG_RESULT(enabled)
	SASL_MECHS="$SASL_MECHS libcrammd5.la"	SASL_MECHS="$SASL_MECHS libcrammd5.la"
	if test "$enable_obsolete_cram_attr" = yes; then	if test "$enable_obsolete_cram_attr" = yes; then
	CPPFLAGS="$CPPFLAGS -DOBSOLETE_CRAM_ATTR=1"	CPPFLAGS="$CPPFLAGS -DOBSOLETE_CRAM_ATTR=1"
	fi	fi
	if test "$enable_static" = yes; then	if test "$enable_static" = yes; then
	SASL_STATIC_OBJS="$SASL_STATIC_OBJS cram.o"	SASL_STATIC_OBJS="$SASL_STATIC_OBJS cram.o"
	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/cram.c"	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/cram.c"

	AC_DEFINE(STATIC_CRAMMD5, [], [Link CRAM-MD5 Staticly])	AC_DEFINE(STATIC_CRAMMD5, [], [Link CRAM-MD5 Statically])
	fi	fi
	else	else
	AC_MSG_RESULT(disabled)	AC_MSG_RESULT(disabled)
	fi	fi

	CMU_HAVE_OPENSSL	CMU_HAVE_OPENSSL
	AC_MSG_CHECKING(for OpenSSL)	AC_MSG_CHECKING(for OpenSSL)
	AC_MSG_RESULT($with_openssl)	AC_MSG_RESULT($with_openssl)

	SASL_DES_CHK	SASL_DES_CHK

	skipping to change at line 431	skipping to change at line 431
	fi	fi
	fi	fi

	AC_MSG_CHECKING(DIGEST-MD5)	AC_MSG_CHECKING(DIGEST-MD5)
	if test "$digest" != no; then	if test "$digest" != no; then
	AC_MSG_RESULT(enabled)	AC_MSG_RESULT(enabled)
	SASL_MECHS="$SASL_MECHS libdigestmd5.la"	SASL_MECHS="$SASL_MECHS libdigestmd5.la"
	if test "$enable_static" = yes; then	if test "$enable_static" = yes; then
	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/digestmd5.c"	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/digestmd5.c"
	SASL_STATIC_OBJS="$SASL_STATIC_OBJS digestmd5.o"	SASL_STATIC_OBJS="$SASL_STATIC_OBJS digestmd5.o"

	AC_DEFINE(STATIC_DIGESTMD5, [], [Link DIGEST-MD5 Staticly])	AC_DEFINE(STATIC_DIGESTMD5, [], [Link DIGEST-MD5 Statically])
	fi	fi
	else	else
	AC_MSG_RESULT(disabled)	AC_MSG_RESULT(disabled)
	fi	fi

	dnl SCRAM	dnl SCRAM
	AC_ARG_ENABLE(scram, [ --enable-scram enable SCRAM authenticati on [[yes]] ],	AC_ARG_ENABLE(scram, [ --enable-scram enable SCRAM authenticati on [[yes]] ],
	scram=$enableval,	scram=$enableval,
	scram=yes)	scram=yes)


	skipping to change at line 456	skipping to change at line 456

	AC_MSG_CHECKING(SCRAM)	AC_MSG_CHECKING(SCRAM)
	if test "$scram" != no; then	if test "$scram" != no; then
	AC_MSG_RESULT(enabled)	AC_MSG_RESULT(enabled)
	SCRAM_LIBS="-lcrypto $LIB_RSAREF"	SCRAM_LIBS="-lcrypto $LIB_RSAREF"

	SASL_MECHS="$SASL_MECHS libscram.la"	SASL_MECHS="$SASL_MECHS libscram.la"
	if test "$enable_static" = yes; then	if test "$enable_static" = yes; then
	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/scram.c"	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/scram.c"
	SASL_STATIC_OBJS="$SASL_STATIC_OBJS scram.o"	SASL_STATIC_OBJS="$SASL_STATIC_OBJS scram.o"

	AC_DEFINE(STATIC_SCRAM, [], [Link SCRAM Staticly])	AC_DEFINE(STATIC_SCRAM, [], [Link SCRAM Statically])
	fi	fi

	AC_SUBST(SCRAM_LIBS)	AC_SUBST(SCRAM_LIBS)
	else	else
	AC_MSG_RESULT(disabled)	AC_MSG_RESULT(disabled)
	fi	fi

	dnl OTP	dnl OTP
	AC_ARG_ENABLE(otp, [ --enable-otp enable OTP authentication [[y es]] ],	AC_ARG_ENABLE(otp, [ --enable-otp enable OTP authentication [[y es]] ],
	otp=$enableval,	otp=$enableval,

	skipping to change at line 483	skipping to change at line 483

	AC_MSG_CHECKING(OTP)	AC_MSG_CHECKING(OTP)
	if test "$otp" != no; then	if test "$otp" != no; then
	AC_MSG_RESULT(enabled)	AC_MSG_RESULT(enabled)
	OTP_LIBS="-lcrypto $LIB_RSAREF"	OTP_LIBS="-lcrypto $LIB_RSAREF"

	SASL_MECHS="$SASL_MECHS libotp.la"	SASL_MECHS="$SASL_MECHS libotp.la"
	if test "$enable_static" = yes; then	if test "$enable_static" = yes; then
	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/otp.c"	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/otp.c"
	SASL_STATIC_OBJS="$SASL_STATIC_OBJS otp.o"	SASL_STATIC_OBJS="$SASL_STATIC_OBJS otp.o"

	AC_DEFINE(STATIC_OTP, [], [Link OTP Staticly])	AC_DEFINE(STATIC_OTP, [], [Link OTP Statically])
	fi	fi

	dnl Test for OPIE	dnl Test for OPIE
	AC_ARG_WITH(with-opie,[ --with-opie=PATH use OPIE (One Time Passw ords in Everything) from PATH],	AC_ARG_WITH(with-opie,[ --with-opie=PATH use OPIE (One Time Passw ords in Everything) from PATH],
	with_opie="${withval}")	with_opie="${withval}")

	case "$with_opie" in	case "$with_opie" in
	""\|yes)	""\|yes)
	AC_CHECK_LIB(opie, opiechallenge, [	AC_CHECK_LIB(opie, opiechallenge, [
	AC_CHECK_HEADER(opie.h, with_opie="yes",	AC_CHECK_HEADER(opie.h, with_opie="yes",

	skipping to change at line 540	skipping to change at line 540

	AC_MSG_CHECKING(SRP)	AC_MSG_CHECKING(SRP)
	if test "$srp" != no; then	if test "$srp" != no; then
	AC_MSG_RESULT(enabled)	AC_MSG_RESULT(enabled)
	SRP_LIBS="-lcrypto $LIB_RSAREF"	SRP_LIBS="-lcrypto $LIB_RSAREF"

	SASL_MECHS="$SASL_MECHS libsrp.la"	SASL_MECHS="$SASL_MECHS libsrp.la"
	if test "$enable_static" = yes; then	if test "$enable_static" = yes; then
	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/srp.c"	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/srp.c"
	SASL_STATIC_OBJS="$SASL_STATIC_OBJS srp.o"	SASL_STATIC_OBJS="$SASL_STATIC_OBJS srp.o"

	AC_DEFINE(STATIC_SRP, [], [Link SRP Staticly])	AC_DEFINE(STATIC_SRP, [], [Link SRP Statically])
	fi	fi

	dnl srp_setpass support	dnl srp_setpass support
	AC_ARG_ENABLE(srp_setpass, [ --enable-srp-setpass enable setting SRP secrets with saslpasswd [[no]]],	AC_ARG_ENABLE(srp_setpass, [ --enable-srp-setpass enable setting SRP secrets with saslpasswd [[no]]],
	srp_setpass=$enableval,	srp_setpass=$enableval,
	srp_setpass=no)	srp_setpass=no)

	AC_MSG_CHECKING(if we should enable setting SRP secrets with saslpasswd)	AC_MSG_CHECKING(if we should enable setting SRP secrets with saslpasswd)
	if test "$srp_setpass" != no; then	if test "$srp_setpass" != no; then
	AC_MSG_RESULT(enabled)	AC_MSG_RESULT(enabled)

	skipping to change at line 566	skipping to change at line 566
	AC_SUBST(SRP_LIBS)	AC_SUBST(SRP_LIBS)
	else	else
	AC_MSG_RESULT(disabled)	AC_MSG_RESULT(disabled)
	fi	fi

	dnl Kerberos based Mechanisms	dnl Kerberos based Mechanisms
	SASL_KERBEROS_V4_CHK	SASL_KERBEROS_V4_CHK
	SASL_GSSAPI_CHK	SASL_GSSAPI_CHK

	if test "$gssapi" != "no"; then	if test "$gssapi" != "no"; then

	AC_DEFINE(STATIC_GSSAPIV2,[],[Link GSSAPI Staticly])	AC_DEFINE(STATIC_GSSAPIV2,[],[Link GSSAPI Statically])
	mutex_default="no"	mutex_default="no"
	if test "$gss_impl" = "mit"; then	if test "$gss_impl" = "mit"; then
	mutex_default="yes"	mutex_default="yes"
	fi	fi
	AC_MSG_CHECKING(to use mutexes aroung GSS calls)	AC_MSG_CHECKING(to use mutexes aroung GSS calls)
	AC_ARG_ENABLE(gss_mutexes, [ --enable-gss_mutexes use mutexes around calls to the GSS library],	AC_ARG_ENABLE(gss_mutexes, [ --enable-gss_mutexes use mutexes around calls to the GSS library],
	use_gss_mutexes=$enableval,	use_gss_mutexes=$enableval,
	use_gss_mutexes=$mutex_default)	use_gss_mutexes=$mutex_default)
	if test $use_gss_mutexes = "yes"; then	if test $use_gss_mutexes = "yes"; then
	AC_DEFINE(GSS_USE_MUTEXES, [], [should we mutex-wrap calls into the GS S library?])	AC_DEFINE(GSS_USE_MUTEXES, [], [should we mutex-wrap calls into the GS S library?])

	skipping to change at line 596	skipping to change at line 596
	anon=$enableval,	anon=$enableval,
	anon=yes)	anon=yes)

	AC_MSG_CHECKING(ANONYMOUS)	AC_MSG_CHECKING(ANONYMOUS)
	if test "$anon" != no; then	if test "$anon" != no; then
	AC_MSG_RESULT(enabled)	AC_MSG_RESULT(enabled)
	SASL_MECHS="$SASL_MECHS libanonymous.la"	SASL_MECHS="$SASL_MECHS libanonymous.la"
	if test "$enable_static" = yes; then	if test "$enable_static" = yes; then
	SASL_STATIC_OBJS="$SASL_STATIC_OBJS anonymous.o"	SASL_STATIC_OBJS="$SASL_STATIC_OBJS anonymous.o"
	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/anonymous.c"	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/anonymous.c"

	AC_DEFINE(STATIC_ANONYMOUS, [], [Link ANONYMOUS Staticly])	AC_DEFINE(STATIC_ANONYMOUS, [], [Link ANONYMOUS Statically])
	fi	fi
	else	else
	AC_MSG_RESULT(disabled)	AC_MSG_RESULT(disabled)
	fi	fi

	dnl LOGIN	dnl LOGIN
	AC_ARG_ENABLE(login, [ --enable-login enable unsupported LOGIN au thentication [[no]] ],	AC_ARG_ENABLE(login, [ --enable-login enable unsupported LOGIN au thentication [[no]] ],
	login=$enableval,	login=$enableval,
	login=no)	login=no)

	AC_MSG_CHECKING(LOGIN)	AC_MSG_CHECKING(LOGIN)
	if test "$login" != no; then	if test "$login" != no; then
	AC_MSG_RESULT(enabled)	AC_MSG_RESULT(enabled)
	SASL_MECHS="$SASL_MECHS liblogin.la"	SASL_MECHS="$SASL_MECHS liblogin.la"
	if test "$enable_static" = yes; then	if test "$enable_static" = yes; then
	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/login.c"	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/login.c"
	SASL_STATIC_OBJS="$SASL_STATIC_OBJS login.o"	SASL_STATIC_OBJS="$SASL_STATIC_OBJS login.o"

	AC_DEFINE(STATIC_LOGIN,[],[Link LOGIN Staticly])	AC_DEFINE(STATIC_LOGIN,[],[Link LOGIN Statically])
	fi	fi
	else	else
	AC_MSG_RESULT(disabled)	AC_MSG_RESULT(disabled)
	fi	fi

	dnl NTLM	dnl NTLM
	AC_ARG_ENABLE(ntlm, [ --enable-ntlm enable unsupported NTLM auth entication [[no]] ],	AC_ARG_ENABLE(ntlm, [ --enable-ntlm enable unsupported NTLM auth entication [[no]] ],
	ntlm=$enableval,	ntlm=$enableval,
	ntlm=no)	ntlm=no)


	skipping to change at line 640	skipping to change at line 640
	AC_MSG_CHECKING(NTLM)	AC_MSG_CHECKING(NTLM)
	if test "$ntlm" != no; then	if test "$ntlm" != no; then
	AC_MSG_RESULT(enabled)	AC_MSG_RESULT(enabled)
	NTLM_LIBS="-lcrypto $LIB_RSAREF"	NTLM_LIBS="-lcrypto $LIB_RSAREF"
	AC_SUBST(NTLM_LIBS)	AC_SUBST(NTLM_LIBS)

	SASL_MECHS="$SASL_MECHS libntlm.la"	SASL_MECHS="$SASL_MECHS libntlm.la"
	if test "$enable_static" = yes; then	if test "$enable_static" = yes; then
	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/ntlm.c"	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/ntlm.c"
	SASL_STATIC_OBJS="$SASL_STATIC_OBJS ntlm.o"	SASL_STATIC_OBJS="$SASL_STATIC_OBJS ntlm.o"

	AC_DEFINE(STATIC_NTLM,[],[Link NTLM Staticly])	AC_DEFINE(STATIC_NTLM,[],[Link NTLM Statically])
	fi	fi
	else	else
	AC_MSG_RESULT(disabled)	AC_MSG_RESULT(disabled)
	fi	fi

	dnl PASSDSS	dnl PASSDSS
	AC_ARG_ENABLE(passdss, [ --enable-passdss enable PASSDSS authentica tion (experimental) [[no]] ],	AC_ARG_ENABLE(passdss, [ --enable-passdss enable PASSDSS authentica tion (experimental) [[no]] ],
	passdss=$enableval,	passdss=$enableval,
	passdss=no)	passdss=no)


	skipping to change at line 666	skipping to change at line 666
	AC_MSG_CHECKING(PASSDSS)	AC_MSG_CHECKING(PASSDSS)
	if test "$passdss" != no; then	if test "$passdss" != no; then
	AC_MSG_RESULT(enabled)	AC_MSG_RESULT(enabled)
	PASSDSS_LIBS="-lcrypto $LIB_RSAREF"	PASSDSS_LIBS="-lcrypto $LIB_RSAREF"
	AC_SUBST(PASSDSS_LIBS)	AC_SUBST(PASSDSS_LIBS)

	SASL_MECHS="$SASL_MECHS libpassdss.la"	SASL_MECHS="$SASL_MECHS libpassdss.la"
	if test "$enable_static" = yes; then	if test "$enable_static" = yes; then
	SASL_STATIC_OBJS="$SASL_STATIC_OBJS passdss.o"	SASL_STATIC_OBJS="$SASL_STATIC_OBJS passdss.o"
	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/passdss.c"	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/passdss.c"

	AC_DEFINE(STATIC_PASSDSS,[],[Link PASSDSS Staticly])	AC_DEFINE(STATIC_PASSDSS,[],[Link PASSDSS Statically])
	fi	fi
	else	else
	AC_MSG_RESULT(disabled)	AC_MSG_RESULT(disabled)
	fi	fi

	# make the option show up so people don't whine that it is only in the	# make the option show up so people don't whine that it is only in the
	# saslauthd configure script --help	# saslauthd configure script --help
	AC_ARG_WITH(ldap, [ --with-ldap=DIR use LDAP (in DIR) for saslau thd [no] ],,with_ldap=no)	AC_ARG_WITH(ldap, [ --with-ldap=DIR use LDAP (in DIR) for saslau thd [no] ],,with_ldap=no)

	dnl SQL	dnl SQL

	skipping to change at line 695	skipping to change at line 695
	sql=$enableval,	sql=$enableval,
	sql=no)	sql=no)

	AC_MSG_CHECKING(SQL)	AC_MSG_CHECKING(SQL)
	if test "$sql" != no; then	if test "$sql" != no; then
	AC_MSG_RESULT(enabled)	AC_MSG_RESULT(enabled)
	SASL_MECHS="$SASL_MECHS libsql.la"	SASL_MECHS="$SASL_MECHS libsql.la"
	if test "$enable_static" = yes; then	if test "$enable_static" = yes; then
	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/sql.c"	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/sql.c"
	SASL_STATIC_OBJS="$SASL_STATIC_OBJS sql.o"	SASL_STATIC_OBJS="$SASL_STATIC_OBJS sql.o"

	AC_DEFINE(STATIC_SQL,[],[Link SQL plugin staticly])	AC_DEFINE(STATIC_SQL,[],[Link SQL plugin statically])
	fi	fi
	else	else
	AC_MSG_RESULT(disabled)	AC_MSG_RESULT(disabled)
	fi	fi

	dnl MySQL	dnl MySQL
	AC_ARG_WITH(mysql, [ --with-mysql=PATH use MySQL from PATH ],	AC_ARG_WITH(mysql, [ --with-mysql=PATH use MySQL from PATH ],
	with_mysql=$withval,	with_mysql=$withval,
	with_mysql=$sql)	with_mysql=$sql)


	skipping to change at line 986	skipping to change at line 986
	if test "$cmu_cv_openldap_compat" = no; then	if test "$cmu_cv_openldap_compat" = no; then
	AC_MSG_ERROR([Cannot enable LDAPDB plugin: OpenLDAP library loc ated but incompatible])	AC_MSG_ERROR([Cannot enable LDAPDB plugin: OpenLDAP library loc ated but incompatible])
	else	else
	LIB_LDAP=$cmu_link_openldap	LIB_LDAP=$cmu_link_openldap
	AC_SUBST(LIB_LDAP)	AC_SUBST(LIB_LDAP)

	SASL_MECHS="$SASL_MECHS libldapdb.la"	SASL_MECHS="$SASL_MECHS libldapdb.la"
	if test "$enable_static" = yes; then	if test "$enable_static" = yes; then
	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/ ldapdb.c"	SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/ ldapdb.c"
	SASL_STATIC_OBJS="$SASL_STATIC_OBJS ldapdb.o"	SASL_STATIC_OBJS="$SASL_STATIC_OBJS ldapdb.o"

	AC_DEFINE(STATIC_LDAPDB,[],[Link ldapdb plugin Staticly])	AC_DEFINE(STATIC_LDAPDB,[],[Link ldapdb plugin Statically])
	fi	fi
	fi	fi
	fi	fi

	if test "$cmu_cv_openldap_compat" != yes; then	if test "$cmu_cv_openldap_compat" != yes; then
	CPPFLAGS=$save_CPPFLAGS	CPPFLAGS=$save_CPPFLAGS
	LDFLAGS=$save_LDFLAGS	LDFLAGS=$save_LDFLAGS
	fi	fi
	else	else
	AC_MSG_RESULT(disabled)	AC_MSG_RESULT(disabled)

	skipping to change at line 1266	skipping to change at line 1266
	* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.	* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
	*/	*/

	#ifndef CONFIG_H	#ifndef CONFIG_H
	#define CONFIG_H	#define CONFIG_H
	])	])

	AH_BOTTOM([	AH_BOTTOM([

	/* Create a struct iovec if we need one */	/* Create a struct iovec if we need one */

	#if !defined(_WIN32) && !defined(HAVE_SYS_UIO_H)	#if !defined(_WIN32)
		#if !defined(HAVE_SYS_UIO_H)
	/* (win32 is handled in sasl.h) */	/* (win32 is handled in sasl.h) */
	struct iovec {	struct iovec {
	char *iov_base;	char *iov_base;
	long iov_len;	long iov_len;
	};	};
	#else	#else
	#include <sys/types.h>	#include <sys/types.h>
	#include <sys/uio.h>	#include <sys/uio.h>
	#endif	#endif

		#endif

	/* location of the random number generator */	/* location of the random number generator */
	#ifdef DEV_RANDOM	#ifdef DEV_RANDOM
	#undef DEV_RANDOM	#undef DEV_RANDOM
	#endif	#endif
	#define DEV_RANDOM SASL_DEV_RANDOM	#define DEV_RANDOM SASL_DEV_RANDOM

	/* if we've got krb_get_err_txt, we might as well use it;	/* if we've got krb_get_err_txt, we might as well use it;
	especially since krb_err_txt isn't in some newer distributions	especially since krb_err_txt isn't in some newer distributions
	(MIT Kerb for Mac 4 being a notable example). If we don't have	(MIT Kerb for Mac 4 being a notable example). If we don't have

	skipping to change at line 1313	skipping to change at line 1315
	#ifndef HAVE___ATTRIBUTE__	#ifndef HAVE___ATTRIBUTE__
	/* Can't use attributes... */	/* Can't use attributes... */
	#define __attribute__(foo)	#define __attribute__(foo)
	#endif	#endif

	#define SASL_PATH_ENV_VAR "SASL_PATH"	#define SASL_PATH_ENV_VAR "SASL_PATH"
	#define SASL_CONF_PATH_ENV_VAR "SASL_CONF_PATH"	#define SASL_CONF_PATH_ENV_VAR "SASL_CONF_PATH"

	#include <stdlib.h>	#include <stdlib.h>
	#include <sys/types.h>	#include <sys/types.h>

	#include <sys/socket.h>
	#ifndef WIN32	#ifndef WIN32

		# include <sys/socket.h>
	# include <netdb.h>	# include <netdb.h>

		# include <netinet/in.h>
	# ifdef HAVE_SYS_PARAM_H	# ifdef HAVE_SYS_PARAM_H
	# include <sys/param.h>	# include <sys/param.h>
	# endif	# endif
	#else /* WIN32 */	#else /* WIN32 */
	# include <winsock2.h>	# include <winsock2.h>
	#endif /* WIN32 */	#endif /* WIN32 */
	#include <string.h>	#include <string.h>


	#include <netinet/in.h>

	#ifndef HAVE_SOCKLEN_T	#ifndef HAVE_SOCKLEN_T
	typedef unsigned int socklen_t;	typedef unsigned int socklen_t;
	#endif /* HAVE_SOCKLEN_T */	#endif /* HAVE_SOCKLEN_T */


	#ifndef HAVE_STRUCT_SOCKADDR_STORAGE	#if !defined(HAVE_STRUCT_SOCKADDR_STORAGE) && !defined(WIN32)
	#define _SS_MAXSIZE 128 /* Implementation specific max size */	#define _SS_MAXSIZE 128 /* Implementation specific max size */
	#define _SS_PADSIZE (_SS_MAXSIZE - sizeof (struct sockaddr))	#define _SS_PADSIZE (_SS_MAXSIZE - sizeof (struct sockaddr))

	struct sockaddr_storage {	struct sockaddr_storage {
	struct sockaddr ss_sa;	struct sockaddr ss_sa;
	char __ss_pad2[_SS_PADSIZE];	char __ss_pad2[_SS_PADSIZE];
	};	};
	# define ss_family ss_sa.sa_family	# define ss_family ss_sa.sa_family
	#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */	#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */


	skipping to change at line 1394	skipping to change at line 1395
	# include <sys/time.h>	# include <sys/time.h>
	# else	# else
	# include <time.h>	# include <time.h>
	# endif	# endif
	#endif	#endif

	#ifndef HIER_DELIMITER	#ifndef HIER_DELIMITER
	#define HIER_DELIMITER '/'	#define HIER_DELIMITER '/'
	#endif	#endif


		#ifdef WIN32
		#define SASL_ROOT_KEY "SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Libra
		ry"
		#define SASL_PLUGIN_PATH_ATTR "SearchPath"
		#define SASL_CONF_PATH_ATTR "ConfFile"

		#include <windows.h>
		inline static unsigned int sleep(unsigned int seconds) {
		Sleep(seconds * 1000);
		return 0;
		}
		#endif

	#endif /* CONFIG_H */	#endif /* CONFIG_H */
	])	])


	AC_CONFIG_HEADERS(config.h)	AM_CONFIG_HEADER(config.h)

	AC_OUTPUT(Makefile	AC_OUTPUT(Makefile

		libsasl2.pc
	include/Makefile	include/Makefile
	sasldb/Makefile	sasldb/Makefile
	plugins/Makefile	plugins/Makefile
	lib/Makefile	lib/Makefile
	utils/Makefile	utils/Makefile
	doc/Makefile	doc/Makefile
	sample/Makefile	sample/Makefile
	java/Makefile	java/Makefile
	java/CyrusSasl/Makefile	java/CyrusSasl/Makefile
	java/Test/Makefile	java/Test/Makefile

End of changes. 25 change blocks.
	21 lines changed or deleted	36 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/