update version to 0.3.1.20170428.0.

[canna-yubin/canna-yubin.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9070782..28a09c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,76 +19,69 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([canna-yubin], [0.3.0.20141226.0],
-[canna-yubin-misc@lists.sourceforge.jp])
+AC_INIT([canna-yubin], [0.3.1.20170428.0],
+[canna-yubin-misc@lists.osdn.me])
 AM_INIT_AUTOMAKE
 
-#
+# Checks for options.
 
 AC_ARG_WITH([canna],
 [--with-canna  build Canna dictionary [[default=/var/lib/canna/dic/canna/]]],
 [], [with_canna=yes])
-
 AC_ARG_WITH([wnn], [--with-wnn build Wnn dictionary [[default=no]]], [],
 [with_wnn=no])
 
-
-IMES=''
-
-case "$with_canna" in
-no) ;;
-yes)
-       IMES="$IMES Canna"
-       CANNADICDIR='/var/lib/canna/dic/canna/'
-       cannaMk='Canna/Makefile'
-       ;;
-*)
-       IMES="$IMES Canna"
-       CANNADICDIR="$with_canna"
-       cannaMk='Canna/Makefile'
-       ;;
+case "x$with_canna" in
+'xno') ;;
+'xyes') CANNADICDIR='/var/lib/canna/dic/canna/'        ;;
+*) CANNADICDIR="$with_canna" ;;
 esac
-
-case "$with_wnn" in
-no) ;;
-yes)
-       IMES="$IMES Wnn"
-       WNNDICDIR='/usr/local/lib/wnn/ja_JP/dic/yubin/'
-       wnnMk='Wnn/Makefile'
-       ;;
-*)
-       IMES="$IMES Wnn"
-       WNNDICDIR="$with_wnn"
-       wnnMk='Wnn/Makefile'
-       ;;
+case "x$CANNADICDIR" in
+'x') ;;
+*) CANNATARGETS='yubin7.cbd yubin7.cld' ;;
 esac
 
-AC_SUBST(IMES)
-AC_SUBST(CANNADICDIR)
-AC_SUBST(WNNDICDIR)
+case "x$with_wnn" in
+'xno') ;;
+'xyes') WNNDICDIR='/usr/local/lib/wnn/ja_JP/dic/yubin/'        ;;
+*) WNNDICDIR="$with_wnn" ;;
+esac
+case "x$WNNDICDIR" in
+'x') ;;
+*) WNNTARGETS='yubin7.dic';;
+esac
 
 # Checks for programs.
+
 AC_PROG_INSTALL
 AC_PROG_MKDIR_P
 
-if test "x$with_canna" != 'xno'
-then
+case "x$CANNADICDIR" in
+'x') ;;
+x*)
        AC_CHECK_PROGS(MKBINDIC, [mkbindic], [])
-       if test "x$MKBINDIC" == 'x'
-       then
-               AC_MSG_ERROR([could not find mkbindic.  Did you install Canna?])
-       fi
-fi
-
+       case "x$MKBINDIC" in
+       'x') AC_MSG_ERROR([could not find mkbindic.  Did you install Canna?]) ;;
+       esac
+       ;;
+esac
 
-if test "x$with_wnn" != 'xno'
-then
+case "x$WNNDICDIR" in
+'x') ;;
+x*)
        AC_CHECK_PROGS(ATOD, [atod], [])
-       if test "x$ATOD" == 'x'
-       then
+       case "x$ATOD" in
+       'x') 
                AC_MSG_ERROR([could not find atod.  Did you install Wnn and set your PATH?  FreeWnn default, atod is installed /usr/local/bin/Wnn4/!])
-       fi
-fi
+               ;;
+       esac
+       ;;
+esac
+
+AC_SUBST(CANNATARGETS)
+AC_SUBST(WNNTARGETS)
+AC_SUBST(CANNADICDIR)
+AC_SUBST(WNNDICDIR)
 
 # Checks for libraries.
 
@@ -98,10 +91,5 @@ fi
 
 # Checks for library functions.
 
-
-AC_CONFIG_FILES([
-                 Makefile
-                $cannaMk
-                $wnnMk
-                ])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT