[dovecot-cvs] dovecot configure.in,1.180,1.181
cras at dovecot.org
cras at dovecot.org
Mon Aug 9 22:14:05 EEST 2004
Update of /home/cvs/dovecot
In directory talvi:/tmp/cvs-serv27714
Modified Files:
configure.in
Log Message:
If -lmysqlclient doesn't automatically link with zlib, do it manually.
Index: configure.in
===================================================================
RCS file: /home/cvs/dovecot/configure.in,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- configure.in 30 Jul 2004 23:37:14 -0000 1.180
+++ configure.in 9 Aug 2004 19:14:03 -0000 1.181
@@ -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
More information about the dovecot-cvs
mailing list