Mercurial > dovecot > core-2.2

changeset 2416:e6594431ee4f HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If -lmysqlclient doesn't automatically link with zlib, do it manually.
author Timo Sirainen <tss@iki.fi>
date Mon, 09 Aug 2004 22:14:03 +0300
parents 0b296005452e
children af0e73fc6658
files configure.in
diffstat 1 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Fri Aug 06 21:05:45 2004 +0300
+++ b/configure.in	Mon Aug 09 22:14:03 2004 +0300
@@ -1138,7 +1138,17 @@
 		LIBS="$LIBS -L$MYSQL_LIBDIR"
 	fi
 
+	mysql_lib=""
 	AC_CHECK_LIB(mysqlclient, mysql_init, [
+		mysql_lib="-lmysqlclient"
+	], [
+		LIBS="$LIBS -lz"
+		AC_CHECK_LIB(mysqlclient, mysql_init, [
+			mysql_lib="-lmysqlclient -lz"
+		])
+	])
+
+	if test "$mysql_lib" != ""; then
 		old_CPPFLAGS=$CPPFLAGS
 		if test "$MYSQL_INCLUDE" != ""; then
 			CPPFLAGS="$CPPFLAGS -I $MYSQL_INCLUDE"
@@ -1150,7 +1160,7 @@
 			if test "$MYSQL_LIBDIR" != ""; then
 				AUTH_LIBS="$AUTH_LIBS -L$MYSQL_LIBDIR"
 			fi
-			AUTH_LIBS="$AUTH_LIBS -lmysqlclient"
+			AUTH_LIBS="$AUTH_LIBS $mysql_lib"
 
 			AC_CHECK_LIB(mysqlclient, mysql_ssl_set, [
 				AC_DEFINE(HAVE_MYSQL_SSL,, Define if your MySQL library has SSL functions)
@@ -1175,7 +1185,7 @@
 			passdb="$passdb mysql"
 		])
 		CPPFLAGS=$old_CPPFLAGS
-	])
+	fi
 
 	LIBS=$old_LIBS
 fi