--- myauth-1.2/configure.in.orig	Sat Jan 22 17:44:17 2005
+++ myauth-1.2/configure.in	Sat Jan 29 05:29:34 2005
@@ -7,17 +7,57 @@
 AC_PROG_INSTALL
 
 dnl Checks for programs.
-AC_ARG_WITH(apache, 'Apache installation path', ,\
+AC_ARG_WITH([apache], 
+	AS_HELP_STRING([--with-apache=/path/to/apache],[Apache installation path])
+	, ,
     AC_MSG_ERROR(use --with-apache=/path/to/apache))
-AC_ARG_WITH(mysql, 'MySQL installation path',\
-	LIBS="${LIBS} -L${withval}/lib/mysql",\
+AC_ARG_WITH([mysql],
+	AS_HELP_STRING([--with-mysql=/path/to/mysql],[MySQL installation path])
+	,LIBS="${LIBS} -L${withval}/lib/mysql",
     AC_MSG_ERROR(use --with-mysql=/path/to/mysql))
+AC_ARG_ENABLE([openssl],
+	AS_HELP_STRING([--enable-openssl],
+		[enable MD5-Base64 encoding via OpenSSL (default no)]),[
+if test x$enableval = xno; then
+	openssl=no
+else
+	openssl=yes
+fi],openssl=no)
+
+if test x$openssl = xyes; then
+	AC_MSG_NOTICE([checking for OpenSSL ...])
+	PKG_CHECK_MODULES(SSL, openssl >= 0.9.7,,openssl=no)
+fi
+if test x$openssl = xyes; then
+	AC_MSG_NOTICE([openssl enabled])
+	# we need the -L switch and libcrypto, only
+	SSL_LIBS=${SSL_LIBS//-lssl}
+	SSL_LIBS=${SSL_LIBS//-ldl}
+	AC_DEFINE(USE_OPENSSL,1,[enable MD5-Base64 encoding using openssl])
+	# because PKG_CHECK_MODULES has already made an AC_SUBST for SSL_* stuff
+	OPENSSL_LDFLAGS="$SSL_LIBS"
+	OPENSSL_CFLAGS="$SSL_CFLAGS"
+else
+	AC_MSG_NOTICE([openssl disabled])
+fi
+AC_SUBST(OPENSSL_LDFLAGS)
+AC_SUBST(OPENSSL_CFLAGS)
+
 
 dnl Checks for libraries.
-AC_CHECK_LIB(mysqlclient, my_connect)
+AC_CHECK_LIB(mysqlclient_r, my_connect,,
+[
+dnl probably unresolved deps to compress/uncompress - try again with libz
+dnl throw away cached value to get the test running a second time
+unset ac_cv_lib_mysqlclient_r_my_connect
+AC_CHECK_LIB(mysqlclient_r, my_connect,LIBS="-lmysqlclient_r -lz",,-lz)
+]
+)
 
 dnl Checks for functions.
 AC_CHECK_FUNCS(make_scrambled_password make_scrambled_password_323)
+dnl myauth itself does not need libz
+LIBS=${LIBS//-lz}
 
 dnl Checks for header files.
 AC_HEADER_STDC