X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fconcord.git;a=blobdiff_plain;f=configure.in;h=5452e882c6891c7d9702939cab6a05a5badb2300;hp=8ac29b6b935be5f69f0c8279a020886b24b1f649;hb=ca4318605d15073f7f68508717b5180c0ce618e7;hpb=abeddedca7db1014ca71e910972c4bc6ccea7e03

diff --git a/configure.in b/configure.in
index 8ac29b6..5452e88 100644
--- a/configure.in
+++ b/configure.in
@@ -24,10 +24,12 @@ do
 done
 CFLAGS=`echo "$SITE_INCLUDES_CFLAGS $CFLAGS"|sed 's/^  *//'`
 ,
-if test -f /sw/include/db3/db.h; then
-	CFLAGS="-I/sw/include/db3 $CFLAGS"
+if test -f /sw/include/db5/db.h; then
+	CFLAGS="-I/sw/include/db5 $CFLAGS"
 elif test -f /sw/include/db4/db.h; then
 	CFLAGS="-I/sw/include/db4 $CFLAGS"
+elif test -f /sw/include/db3/db.h; then
+	CFLAGS="-I/sw/include/db3 $CFLAGS"
 fi
 )
 
@@ -41,10 +43,12 @@ done
 LIBS=`echo "$SITE_LIBS $LIBS"|sed 's/^  *//'`
 LIBS="-ldb $LIBS"
 ,
-if test -f /sw/include/db3/db.h; then
-	LIBS="-L/sw/lib -ldb-3 $LIBS"
+if test -f /sw/include/db5/db.h; then
+	LIBS="-L/sw/lib -ldb-5 $LIBS"
 elif test -f /sw/include/db4/db.h; then
 	LIBS="-L/sw/lib -ldb-4 $LIBS"
+elif test -f /sw/include/db3/db.h; then
+	LIBS="-L/sw/lib -ldb-3 $LIBS"
 else
 	LIBS="-ldb $LIBS"
 fi
@@ -58,11 +62,17 @@ fi
 AC_C_CONST
 AC_C_INLINE
 
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(void *)
+
 # Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_STRNLEN
-
-AC_CHECK_FUNCS(strnlen)
+if test "x$ac_cv_func_strnlen_working" = "xyes"; then
+    AC_DEFINE([HAVE_STRNLEN])
+fi
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT