update.

diff --git a/ChangeLog b/ChangeLog
index f074011..95ad132 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * configure.in: Put --with-canna into $xemacs_opts when Fink is
+       used.
+
 2006-05-15  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * Makefile.in (concord): Fix problem when the target is bundled.

diff --git a/configure b/configure
index bfd21e1..424f4c4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1363,23 +1363,26 @@ fi
 
 # Checks for libraries.
 if test -d /sw/include; then
-    xemacs_site_includes="/sw/include"
-    xemacs_site_libraries="/sw/lib"
-    xemacs_opts="--with-dialogs=athena --with-widgets=athena --with-athena=3d"
-
-    if test -f /sw/include/db3/db.h; then
-       xemacs_site_includes="$xemacs_site_includes:/sw/include/db3"
-    elif test -f /sw/include/db4/db.h; then
-       xemacs_site_includes="$xemacs_site_includes:/sw/include/db4"
-    fi
+       xemacs_site_includes="/sw/include"
+       xemacs_site_libraries="/sw/lib"
+       xemacs_opts="--with-dialogs=athena --with-widgets=athena --with-athena=3d"
+
+       if test -f /sw/include/db3/db.h; then
+               xemacs_site_includes="$xemacs_site_includes:/sw/include/db3"
+       elif test -f /sw/include/db4/db.h; then
+               xemacs_site_includes="$xemacs_site_includes:/sw/include/db4"
+       fi
+       if test -d /sw/include/canna; then
+               xemacs_opts="$xemacs_opts --with-canna"
+       fi
+fi
 
-    if test "$xemacs_site_includes" != ""; then
+if test "$xemacs_site_includes" != ""; then
        xemacs_opts="$xemacs_opts --site-includes=$xemacs_site_includes"
-    fi
+fi
 
-    if test "$xemacs_site_libraries" != ""; then
+if test "$xemacs_site_libraries" != ""; then
        xemacs_opts="$xemacs_opts --site-libraries=$xemacs_site_libraries"
-    fi
 fi
 
 # Checks for header files.