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

diff --git a/configure.in b/configure.in
index 0355386..5452e88 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(concord, 0.0.1, chise-en@m17n.org)
+AC_INIT(concord, 0.0.2, chise-en@m17n.org)
 AC_CONFIG_SRCDIR(concord.c)
 AC_CONFIG_HEADER(config.h)
 
@@ -14,16 +14,47 @@ AC_PROG_LIBTOOL
 #  AC_CHECK_PROGS(LIBTOOL, glibtool libtool, libtool, \
 #  	/usr/local/bin:/opt/bin:/sw/bin:/usr/bin:/bin)
 
-# Checks for libraries.
-if test -f /sw/include/db3/db.h; then
-	CFLAGS="-I/sw/include/db3 $CFLAGS"
-	LIBS="-L/sw/lib -ldb-3 $LIBS"
+# Settings for optional paths
+AC_ARG_WITH(site_includes,
+  --with-site-includes=PATH List of directories to search first for header files
+,
+for dir in `echo "$with_site_includes"|sed 's/:/ /'`
+do
+    SITE_INCLUDES_CFLAGS="$SITE_INCLUDES_CFLAGS -I$dir"
+done
+CFLAGS=`echo "$SITE_INCLUDES_CFLAGS $CFLAGS"|sed 's/^  *//'`
+,
+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
+)
+
+AC_ARG_WITH(site_libraries,
+  --with-site-libraries=PATH List of directories to search first for libraries
+,
+for dir in `echo "$with_site_libraries"|sed 's/:/ /'`
+do
+    SITE_LIBS="$SITE_LIBS -L$dir"
+done
+LIBS=`echo "$SITE_LIBS $LIBS"|sed 's/^  *//'`
+LIBS="-ldb $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
+)
+
+# Checks for libraries.
 
 # Checks for header files.
 
@@ -31,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