[Julius-cvs 255] CVS update: julius4/libjulius

アーカイブの一覧に戻る

sumom****@users***** sumom****@users*****
2008年 9月 25日 (木) 14:00:05 JST


Index: julius4/libjulius/Makefile.in
diff -u julius4/libjulius/Makefile.in:1.3 julius4/libjulius/Makefile.in:1.4
--- julius4/libjulius/Makefile.in:1.3	Tue Jan 22 22:01:55 2008
+++ julius4/libjulius/Makefile.in	Thu Sep 25 14:00:04 2008
@@ -5,7 +5,7 @@
 # All rights reserved
 
 #
-# $Id: Makefile.in,v 1.3 2008/01/22 13:01:55 sumomo Exp $
+# $Id: Makefile.in,v 1.4 2008/09/25 05:00:04 sumomo Exp $
 #
 SHELL=/bin/sh
 .SUFFIXES:
@@ -18,7 +18,7 @@
 CC=@CC@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-Iinclude -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags`
-LDFLAGS=@LDFLAGS@ -L$(LIBSENT) -lsent @LIBS@ `$(LIBSENT)/libsent-config --libs` -lm 
+LDFLAGS=@LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` 
 RM=@RM@ -f
 AR=@AR@ r
 RANLIB=@RANLIB@
@@ -74,6 +74,7 @@
 src/confnet.o \
 src/gmm.o \
 src/word_align.o \
+src/plugin.o \
 src/version.o
 
 ############################################################
Index: julius4/libjulius/configure
diff -u julius4/libjulius/configure:1.4 julius4/libjulius/configure:1.5
--- julius4/libjulius/configure:1.4	Tue May 27 18:16:39 2008
+++ julius4/libjulius/configure	Thu Sep 25 14:00:04 2008
@@ -58,6 +58,8 @@
   --enable-decoder-vad       enable a new decoder-based VAD by NAIST team"
 ac_help="$ac_help
   --enable-power-reject      enable post rejection by power"
+ac_help="$ac_help
+  --disable-plugin           disable plugin support"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -851,6 +853,22 @@
 fi
 
 
+# Check whether --enable-plugin or --disable-plugin was given.
+if test "${enable_plugin+set}" = set; then
+  enableval="$enable_plugin"
+  if test "$enableval" = yes; then
+	cat >> confdefs.h <<\EOF
+#define ENABLE_PLUGIN 1
+EOF
+
+fi
+
+else
+  cat >> confdefs.h <<\EOF
+#define ENABLE_PLUGIN 1
+EOF
+
+fi
 
 
 if test "$use_cm" = yes; then
@@ -989,7 +1007,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:993: checking host system type" >&5
+echo "configure:1011: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1011,7 +1029,7 @@
 
 
 echo $ac_n "checking host-specific optimization flag""... $ac_c" 1>&6
-echo "configure:1015: checking host-specific optimization flag" >&5
+echo "configure:1033: checking host-specific optimization flag" >&5
 if test -z "$CFLAGS" ; then
     OPTFLAG=../support/cflags.${host_cpu}-${host_vendor}-${host_os}
     if test -f "$OPTFLAG" ; then
@@ -1027,7 +1045,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1031: checking for $ac_word" >&5
+echo "configure:1049: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1057,7 +1075,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1061: checking for $ac_word" >&5
+echo "configure:1079: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1108,7 +1126,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1112: checking for $ac_word" >&5
+echo "configure:1130: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1140,7 +1158,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1144: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1162: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1151,12 +1169,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1155 "configure"
+#line 1173 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1182,12 +1200,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1186: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1204: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1191: checking whether we are using GNU C" >&5
+echo "configure:1209: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1196,7 +1214,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1215,7 +1233,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1219: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1237: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1247,7 +1265,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1251: checking how to run the C preprocessor" >&5
+echo "configure:1269: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1262,13 +1280,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1266 "configure"
+#line 1284 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1279,13 +1297,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1283 "configure"
+#line 1301 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1296,13 +1314,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1300 "configure"
+#line 1318 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1339,7 +1357,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1343: checking for a BSD compatible install" >&5
+echo "configure:1361: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1394,7 +1412,7 @@
 # Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1398: checking for $ac_word" >&5
+echo "configure:1416: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1429,7 +1447,7 @@
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1433: checking for $ac_word" >&5
+echo "configure:1451: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1464,7 +1482,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1468: checking for $ac_word" >&5
+echo "configure:1486: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1494,12 +1512,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1498: checking for ANSI C header files" >&5
+echo "configure:1516: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1503 "configure"
+#line 1521 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1507,7 +1525,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1524,7 +1542,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1528 "configure"
+#line 1546 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1542,7 +1560,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1546 "configure"
+#line 1564 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1563,7 +1581,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1567 "configure"
+#line 1585 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1574,7 +1592,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1599,12 +1617,12 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1603: checking for working const" >&5
+echo "configure:1621: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1608 "configure"
+#line 1626 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1653,7 +1671,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1675,12 +1693,12 @@
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:1679: checking return type of signal handlers" >&5
+echo "configure:1697: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1684 "configure"
+#line 1702 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -1697,7 +1715,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:1701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -1721,18 +1739,18 @@
   freebsd*)
 	# FreeBSD
 	echo $ac_n "checking for linking POSIX threaded process""... $ac_c" 1>&6
-echo "configure:1725: checking for linking POSIX threaded process" >&5
+echo "configure:1743: checking for linking POSIX threaded process" >&5
  	ac_save_CFLAGS="$CFLAGS"
  	CFLAGS="$CFLAGS -pthread"
  	cat > conftest.$ac_ext <<EOF
-#line 1729 "configure"
+#line 1747 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 pthread_equal(NULL,NULL);
 ; return 0; }
 EOF
-if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   use_pthread=yes
      	    cat >> confdefs.h <<\EOF
@@ -1753,18 +1771,18 @@
   *)
 	# other with libpthread
 	echo $ac_n "checking for POSIX thread library in -lpthread""... $ac_c" 1>&6
-echo "configure:1757: checking for POSIX thread library in -lpthread" >&5
+echo "configure:1775: checking for POSIX thread library in -lpthread" >&5
 	ac_save_LIBS_p="$LIBS"
 	LIBS="$LIBS -lpthread"
 	cat > conftest.$ac_ext <<EOF
-#line 1761 "configure"
+#line 1779 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 pthread_equal(NULL,NULL);
 ; return 0; }
 EOF
-if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   use_pthread=yes
 	    cat >> confdefs.h <<\EOF
Index: julius4/libjulius/configure.in
diff -u julius4/libjulius/configure.in:1.4 julius4/libjulius/configure.in:1.5
--- julius4/libjulius/configure.in:1.4	Tue May 27 18:16:39 2008
+++ julius4/libjulius/configure.in	Thu Sep 25 14:00:04 2008
@@ -4,7 +4,7 @@
 dnl Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
 dnl All rights reserved
 dnl
-dnl $Id: configure.in,v 1.4 2008/05/27 09:16:39 sumomo Exp $
+dnl $Id: configure.in,v 1.5 2008/09/25 05:00:04 sumomo Exp $
 dnl
 
 AC_INIT(src/search_bestfirst_main.c)
@@ -201,7 +201,13 @@
 ,want_power_reject=no
 )
 
-
+dnl plugin support
+AC_ARG_ENABLE(plugin,
+[  --disable-plugin           disable plugin support],
+if test "$enableval" = yes; then
+	AC_DEFINE(ENABLE_PLUGIN)
+fi
+,AC_DEFINE(ENABLE_PLUGIN))
 
 dnl CM options check
 if test "$use_cm" = yes; then


Julius-cvs メーリングリストの案内
アーカイブの一覧に戻る