(xemacs_configure_args): New SUBST.

(--with-site-includes=PATH): New argument.
(--with-site-libraries=PATH): New argument.
(--with-canna): New argument.

diff --git a/configure.in b/configure.in
index ca791bf..57cd03c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,7 @@ AC_CANONICAL_TARGET
 #      /usr/local/bin:/opt/bin:/sw/bin:/usr/bin:/bin)
 
 AC_SUBST(ac_configure_args)
+AC_SUBST(xemacs_configure_args)
 AC_SUBST(xemacs_site_includes)
 AC_SUBST(xemacs_site_libraries)
 AC_SUBST(xemacs_opts)
@@ -27,10 +28,18 @@ else
        lemi_cvs_root=':pserver:anonymous@cvs.m17n.org:/cvs/root'
 fi
 
-# Checks for libraries.
+xemacs_configure_args=`echo $ac_configure_args \
+                       | sed 's/--with-site-includes/--site-includes/' \
+                       | sed 's/--with-site-libraries/--site-libraries/'`
+
+# Settings for optional paths
+AC_ARG_WITH(site_includes,
+  --with-site-includes=PATH List of directories to search first for header files
+,
+#xemacs_site_includes="$with_site_includes"
+,
 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
@@ -38,19 +47,45 @@ if test -d /sw/include; then
        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"
+       if test x"$with_canna" != x"no"; then
+          if test -d /sw/include/canna; then
+               xemacs_opts="$xemacs_opts --with-canna"
+          fi
        fi
 fi
+)
 
-if test "$xemacs_site_includes" != ""; then
+AC_ARG_WITH(site_libraries,
+  --with-site-libraries=PATH List of directories to search first for libraries
+,
+#xemacs_site_libraries="$with_site_libraries"
+,
+if test -d /sw/include; then
+       xemacs_site_libraries="/sw/lib"
+fi
+)
+
+AC_ARG_WITH(canna,
+  --with-canna          Support the Canna input method
+,
+#xemacs_opts="$xemacs_opts --with-canna"
+,
+)
+
+# Checks for libraries.
+if test x"$xemacs_site_includes" != x""; then
        xemacs_opts="$xemacs_opts --site-includes=$xemacs_site_includes"
 fi
 
-if test "$xemacs_site_libraries" != ""; then
+if test x"$xemacs_site_libraries" != x""; then
        xemacs_opts="$xemacs_opts --site-libraries=$xemacs_site_libraries"
 fi
 
+if test x"$with_canna" != x"no"; then
+   AC_CHECK_LIB(canna,jrKanjiControl,
+   xemacs_opts="$xemacs_opts --with-canna")
+fi
+
 # Checks for header files.
 
 # Checks for typedefs, structures, and compiler characteristics.