Mercurial > dovecot > core-2.2

changeset 4142:08aef9a8e22c HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added lib64 directory to mysql/pgsql checks. Removed all special lib/include directory handling from SQLite checks (it should usually exist in default paths I think).
author Timo Sirainen <tss@iki.fi>
date Sun, 09 Apr 2006 15:21:03 +0300
parents 4a023bede75e
children c2ae6dc37a19
files configure.in
diffstat 1 files changed, 5 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Sun Apr 09 15:09:02 2006 +0300
+++ b/configure.in	Sun Apr 09 15:21:03 2006 +0300
@@ -1399,10 +1399,12 @@
 				PGSQL_INCLUDE=$i/$j
 			fi
 		done
-		for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
+		for lib in lib lib64; do
+		  for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
 			if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
 				PGSQL_LIBDIR=$i/$j
 			fi
+		  done
 		done
 	done
 
@@ -1444,7 +1446,7 @@
 				MYSQL_INCLUDE=$i/$j
 			fi
 		done
-		for j in lib lib/mysql ""; do
+		for j in lib lib/mysql lib64 lib64/mysql ""; do
 			if test -f "$i/$j/libmysqlclient.so" || test -f "$i/$j/libmysqlclient.a"; then
 				MYSQL_LIBDIR=$i/$j
 			fi
@@ -1503,51 +1505,14 @@
 fi
 
 if test $want_sqlite = yes; then
-	for i in /usr /usr/local /usr/local; do
-		for j in include  ""; do
-			if test -r "$i/$j/sqlite3.h"; then
-				SQLITE_INCLUDE=$i/$j
-			fi
-		done
-		for j in lib lib/sqlite3 ""; do
-			if test -f "$i/$j/libsqlite3.so" || test -f "$i/$j/libsqlite3.a"; then
-				SQLITE_LIBDIR=$i/$j
-			fi
-		done
-	done
-
-	old_LIBS=$LIBS
-	if test "$SQLITE_LIBDIR" != ""; then
-		LIBS="$LIBS -L$SQLITE_LIBDIR"
-	fi
-
-	sqlite_lib=""
-	LIBS="$LIBS -lz"
 	AC_CHECK_LIB(sqlite3, sqlite3_open, [
-		sqlite_lib="-lsqlite3 -lz"
-	])
-
-	if test "$sqlite_lib" != ""; then
-		old_CPPFLAGS=$CPPFLAGS
-		if test "$SQLITE_INCLUDE" != ""; then
-			CPPFLAGS="$CPPFLAGS -I $SQLITE_INCLUDE"
-		fi
 		AC_CHECK_HEADER(sqlite3.h, [
-			if test "$SQLITE_INCLUDE" != ""; then
-				SQL_CFLAGS="$SQL_CFLAGS -I$SQLITE_INCLUDE"
-			fi
-			if test "$SQLITE_LIBDIR" != ""; then
-				SQL_LIBS="$SQL_LIBS -L$SQLITE_LIBDIR"
-			fi
-			SQL_LIBS="$SQL_LIBS $sqlite_lib"
+			SQL_LIBS="$SQL_LIBS -lsqlite3 -lz"
 
 			AC_DEFINE(HAVE_SQLITE,, Build with SQLite3 support)
 			found_sql_drivers="$found_sql_drivers sqlite"
 		])
-		CPPFLAGS=$old_CPPFLAGS
 	fi
-
-	LIBS=$old_LIBS
 fi
 
 if test "$found_sql_drivers" != "" -o "$want_sql" = "yes"; then