From sumomo ＠ users.sourceforge.jp  Fri Jun 12 00:21:38 2009
From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp)
Date: Fri, 12 Jun 2009 00:21:38 +0900
Subject: [Julius-cvs 411]  CVS update: julius4/libjulius/src
Message-ID: <1244733698.504714.10618.nullmailer@users.sourceforge.jp>

Index: julius4/libjulius/src/beam.c
diff -u julius4/libjulius/src/beam.c:1.11 julius4/libjulius/src/beam.c:1.12
--- julius4/libjulius/src/beam.c:1.11	Fri Dec 12 16:14:57 2008
+++ julius4/libjulius/src/beam.c	Fri Jun 12 00:21:38 2009
@@ -42,7 +42,7 @@
  * @author Akinobu LEE
  * @date   Tue Feb 22 17:00:45 2005
  *
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  * 
  */
 /*
@@ -1256,7 +1256,7 @@
     }
 #ifdef WPAIR_KEEP_NLIMIT
     if (lowest_token == TOKENID_UNDEFINED ||
-	d->tlist[tt][lowest_token].score < d->tlist[tt][tmp].score)
+	d->tlist[tt][lowest_token].score > d->tlist[tt][tmp].score)
       lowest_token = tmp;
     if (++i >= d->wpair_keep_nlimit) break;
 #endif
@@ -2252,6 +2252,7 @@
     if (sword == wchmm->winfo->tail_silwid) return;
 
 #ifdef UNIGRAM_FACTORING
+#ifndef WPAIR
     /* あとで共有単語先頭ノードに対して単語間遷移をまとめて計算するため，*/
     /* このループ内では最大尤度を持つ単語終端ノードを記録しておく */
     /* here we will record the best wordend node of maximum likelihood
@@ -2266,6 +2267,7 @@
       d->wordend_best_last_cword = tk->last_cword;
     }
 #endif
+#endif
     
     /* N-gramにおいては常に全単語の接続を考慮する必要があるため，
        ここで単語間の言語確率値をすべて計算しておく. 
@@ -2302,6 +2304,23 @@
       /* N-gram確率を計算 */
       /* compute N-gram probability */
 #ifdef UNIGRAM_FACTORING
+      /* wchmm,start2isolate[0..stid-1] ... ノードを共有しない単語は
+	 その通しID, 共有する(キャッシュの必要のない)単語は -1 */
+      /* wchmm->start2isolate[0..stid-1] ... isolate ID for
+	 beginning-of-word state.  value: -1 for states that has
+	 1-gram factoring value (share nodes with some other words),
+	 and ID for unshared words
+      */
+      isoid = wchmm->start2isolate[stid];
+#ifdef WPAIR
+      /* Efficient cross-word LM handling should be disabled for
+	 word-pair approximation */
+      if (isoid == -1) {
+	tmpprob = wchmm->fscore[- wchmm->state[next_node].scid];
+      } else {
+	tmpprob = iwparray[isoid];
+      }
+#else  /* ~WPAIR */
       /* 1-gram factoring における単語間言語確率キャッシュの効率化:
 	 1-gram factoring は単語履歴に依存しないので，
 	 ここで参照する factoring 値の多くは
@@ -2316,21 +2335,14 @@
 	 So only the unshared beginning-of-word states are computed and
 	 cached here in iwparray[].
       */
-      /* wchmm,start2isolate[0..stid-1] ... ノードを共有しない単語は
-	 その通しID, 共有する(キャッシュの必要のない)単語は -1 */
-      /* wchmm->start2isolate[0..stid-1] ... isolate ID for
-	 beginning-of-word state.  value: -1 for states that has
-	 1-gram factoring value (share nodes with some other words),
-	 and ID for unshared words
-      */
-      isoid = wchmm->start2isolate[stid];
       /* 計算が必要でない単語先頭ノードはパスをまとめて後に計算するので
 	 ここではスキップ */
       /* the shared nodes will be computed afterward, so just skip them
 	 here */
       if (isoid == -1) continue;
       tmpprob = iwparray[isoid];
-#else
+#endif /* ~WPAIR */
+#else  /* ~UNIGRAM_FACTORING */
       tmpprob = iwparray[stid];
 #endif
     }
@@ -2621,6 +2633,7 @@
   tn = d->tn;
 
 #ifdef UNIGRAM_FACTORING
+#ifndef WPAIR
   /* 1-gram factoring では単語先頭での言語確率が一定で直前単語に依存しない
      ため，単語間 Viterbi において選ばれる直前単語は,次単語によらず共通である. 
      よって単語終端からfactoring値のある単語先頭への遷移は１つにまとめられる. 
@@ -2642,6 +2655,7 @@
     d->wordend_best_score = LOG_ZERO;
   }
 #endif
+#endif
 
 #ifdef DEBUG
   /* debug */
@@ -2797,6 +2811,7 @@
   }
 
 #ifdef UNIGRAM_FACTORING
+#ifndef WPAIR
 
   if (lmtype == LM_PROB) {
 
@@ -2809,6 +2824,7 @@
       beam_inter_word_factoring(wchmm, d);
     }
   }
+#endif
 #endif /* UNIGRAM_FACTORING */
 
   /***************************************/

From sumomo ＠ users.sourceforge.jp  Tue Jun 16 19:57:43 2009
From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp)
Date: Tue, 16 Jun 2009 19:57:43 +0900
Subject: [Julius-cvs 412]  CVS update: julius4/libjulius/src
Message-ID: <1245149863.677874.6683.nullmailer@users.sourceforge.jp>

Index: julius4/libjulius/src/realtime-1stpass.c
diff -u julius4/libjulius/src/realtime-1stpass.c:1.5 julius4/libjulius/src/realtime-1stpass.c:1.6
--- julius4/libjulius/src/realtime-1stpass.c:1.5	Thu Sep 25 14:00:06 2008
+++ julius4/libjulius/src/realtime-1stpass.c	Tue Jun 16 19:57:43 2009
@@ -111,7 +111,7 @@
  * @author Akinobu Lee
  * @date   Tue Aug 23 11:44:14 2005
  *
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  * 
  */
 /*
@@ -1505,7 +1505,7 @@
     /* callback poll */
     if (ad_check != NULL) {
       if ((ret3 = (*(ad_check))(recog)) < 0) {
-	if ((ret3 == -1 && mfcc->f == 0) || ret3 == -2) {
+	if ((ret3 == -1 && recog->mfcclist->f == 0) || ret3 == -2) {
 	  return(-2);
 	}
       }
@@ -1517,7 +1517,7 @@
 
 #ifdef ENABLE_PLUGIN
       /* call post-process plugin if exist */
-      plugin_exec_vector_postprocess(recog->mfcclist->param->parvec[recog->mfcclist->f], recog->mfcclist->param->veclen, mfcc->f);
+      plugin_exec_vector_postprocess(recog->mfcclist->param->parvec[recog->mfcclist->f], recog->mfcclist->param->veclen, recog->mfcclist->f);
 #endif
 
       /* 処理を1フレーム進める */

From sumomo ＠ users.sourceforge.jp  Tue Jun 16 20:03:37 2009
From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp)
Date: Tue, 16 Jun 2009 20:03:37 +0900
Subject: [Julius-cvs 413]  CVS update: julius4/adintool
Message-ID: <1245150217.393014.18962.nullmailer@users.sourceforge.jp>

Index: julius4/adintool/adintool.c
diff -u julius4/adintool/adintool.c:1.7 julius4/adintool/adintool.c:1.8
--- julius4/adintool/adintool.c:1.7	Fri May 15 12:22:53 2009
+++ julius4/adintool/adintool.c	Tue Jun 16 20:03:37 2009
@@ -35,7 +35,7 @@
  * @author Akinobu LEE
  * @date   Wed Mar 23 20:43:32 2005
  *
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
  * 
  */
 /*
@@ -204,7 +204,7 @@
 {
   char *p, *q;
   if (speech_output == SPOUT_ADINNET) {
-    p = (char *)malloc(strlen(arg[0] + 1));
+    p = (char *)malloc(strlen(arg[0]) + 1);
     strcpy(p, arg[0]);
     for (q = strtok(p, ","); q; q = strtok(NULL, ",")) {
       if (adinnet_servnum >= MAXCONNECTION) {
@@ -249,7 +249,7 @@
 {
   char *p, *q;
 
-  p = (char *)malloc(strlen(arg[0] + 1));
+  p = (char *)malloc(strlen(arg[0]) + 1);
   strcpy(p, arg[0]);
   for (q = strtok(p, ","); q; q = strtok(NULL, ",")) {
     if (adinnet_portnum >= MAXCONNECTION) {

From sumomo ＠ users.sourceforge.jp  Wed Jun 17 19:18:14 2009
From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp)
Date: Wed, 17 Jun 2009 19:18:14 +0900
Subject: [Julius-cvs 414]  CVS update: julius4/julius
Message-ID: <1245233894.400921.1705.nullmailer@users.sourceforge.jp>

Index: julius4/julius/output_module.c
diff -u julius4/julius/output_module.c:1.5 julius4/julius/output_module.c:1.6
--- julius4/julius/output_module.c:1.5	Tue Oct 21 02:40:23 2008
+++ julius4/julius/output_module.c	Wed Jun 17 19:18:14 2009
@@ -12,7 +12,7 @@
  * @author Akinobu Lee
  * @date   Tue Sep 06 14:46:49 2005
  *
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  * 
  */
 /*
@@ -388,6 +388,7 @@
   Sentence *s;
   RecogProcess *r;
   boolean multi;
+  SentenceAlign *align;
 
   if (recog->process_list->next != NULL) multi = TRUE;
   else multi = FALSE;
@@ -465,6 +466,19 @@
 	}
 #endif
 #endif /* CONFIDENCE_MEASURE */
+	/* output alignment result if exist */
+	for (align = s->align; align; align = align->next) {
+	  switch(align->unittype) {
+	  case PER_WORD:	/* word alignment */
+	    module_send(module_sd, " BEGINFRAME=\"%d\" ENDFRAME=\"%d\"", align->begin_frame[i], align->end_frame[i]);
+	    break;
+	  case PER_PHONEME:
+	  case PER_STATE:
+	    fprintf(stderr, "Error: \"-palign\" and \"-salign\" does not supported for module output\n");
+	    break;
+	  }
+	}
+	
 	module_send(module_sd, "/>\n");
       }
       module_send(module_sd, "  </SHYPO>\n");

From sumomo ＠ users.sourceforge.jp  Fri Jun 19 11:22:58 2009
From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp)
Date: Fri, 19 Jun 2009 11:22:58 +0900
Subject: [Julius-cvs 415]  CVS update: julius4/man
Message-ID: <1245378178.742921.19780.nullmailer@users.sourceforge.jp>

Index: julius4/man/Makefile.in
diff -u julius4/man/Makefile.in:1.2 julius4/man/Makefile.in:1.3
--- julius4/man/Makefile.in:1.2	Fri Oct  3 00:01:59 2008
+++ julius4/man/Makefile.in	Fri Jun 19 11:22:58 2009
@@ -3,7 +3,7 @@
 # Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
 # All rights reserved 
 #
-# $Id: Makefile.in,v 1.2 2008/10/02 15:01:59 sumomo Exp $
+# $Id: Makefile.in,v 1.3 2009/06/19 02:22:58 sumomo Exp $
 #
 SHELL=/bin/sh
 RM=@RM@ -f
@@ -25,10 +25,10 @@
 	done
 
 install.man.ja:
-	${INSTALL} -d @mandir@/man1/ja
+	${INSTALL} -d @mandir@/ja/man1
 	cd ja;
 	for f in *.1; do \
-	  @INSTALL_DATA@ $$f @mandir@/man1/ja/$$f; \
+	  @INSTALL_DATA@ $$f @mandir@/ja/man1/$$f; \
 	done
 	cd ..
 

From sumomo ＠ users.sourceforge.jp  Sat Jun 20 16:47:06 2009
From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp)
Date: Sat, 20 Jun 2009 16:47:06 +0900
Subject: [Julius-cvs 416]  CVS update: julius4/jcontrol
Message-ID: <1245484026.301542.26604.nullmailer@users.sourceforge.jp>

Index: julius4/jcontrol/configure
diff -u julius4/jcontrol/configure:1.2 julius4/jcontrol/configure:1.3
--- julius4/jcontrol/configure:1.2	Tue Aug  5 18:46:53 2008
+++ julius4/jcontrol/configure	Sat Jun 20 16:47:06 2009
@@ -1154,15 +1154,38 @@
 
 else
   echo "$ac_t""no" 1>&6
+echo $ac_n "checking for connect in -lws2_32""... $ac_c" 1>&6
+echo "configure:1159: checking for connect in -lws2_32" >&5
+xxxxLIBS=$LIBS
+LIBS="$LIBS -lws2_32"
+cat > conftest.$ac_ext <<EOF
+#line 1163 "configure"
+#include "confdefs.h"
+#include <winsock2.h>
+int sd;
+struct sockaddr_in s;
+
+int main() {
+connect(sd, (struct sockaddr *)&s, sizeof(s));
+; return 0; }
+EOF
+if { (eval echo configure:1173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  LIBS=$xxxxLIBS
+echo "$ac_t""no" 1>&6
+
+fi
+rm -f conftest*
+
 fi
 
 fi
 
-case "$host_os" in
-mingw*)
-	EXTRALIB="$EXTRALIB -lws2_32"
-	;;
-esac
 
 trap '' 1 2 15
 cat > confcache <<\EOF
Index: julius4/jcontrol/configure.in
diff -u julius4/jcontrol/configure.in:1.3 julius4/jcontrol/configure.in:1.4
--- julius4/jcontrol/configure.in:1.3	Tue Aug  5 18:46:53 2008
+++ julius4/jcontrol/configure.in	Sat Jun 20 16:47:06 2009
@@ -9,11 +9,18 @@
 AC_PROG_INSTALL
 AC_PATH_PROG(RM,rm)
 AC_CHECK_FUNC(gethostbyname,,AC_CHECK_LIB(nsl,gethostbyname))
-AC_CHECK_FUNC(connect,,AC_CHECK_LIB(socket, connect))
-case "$host_os" in
-mingw*)
-	EXTRALIB="$EXTRALIB -lws2_32"
-	;;
-esac
+AC_CHECK_FUNC(connect,,AC_CHECK_LIB(socket, connect,,
+AC_MSG_CHECKING([for connect in -lws2_32])
+xxxxLIBS=$LIBS
+LIBS="$LIBS -lws2_32"
+AC_TRY_LINK([#include <winsock2.h>
+int sd;
+struct sockaddr_in s;
+], [connect(sd, (struct sockaddr *)&s, sizeof(s));],
+AC_MSG_RESULT([yes]),
+LIBS=$xxxxLIBS
+AC_MSG_RESULT([no])
+)
+))
 AC_SUBST(EXTRALIB)
 AC_OUTPUT(Makefile)

From sumomo ＠ users.sourceforge.jp  Sat Jun 20 16:47:06 2009
From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp)
Date: Sat, 20 Jun 2009 16:47:06 +0900
Subject: [Julius-cvs 417]  CVS update: julius4/libsent
Message-ID: <1245484026.385708.26614.nullmailer@users.sourceforge.jp>

Index: julius4/libsent/configure
diff -u julius4/libsent/configure:1.14 julius4/libsent/configure:1.15
--- julius4/libsent/configure:1.14	Wed Feb 11 16:22:45 2009
+++ julius4/libsent/configure	Sat Jun 20 16:47:06 2009
@@ -1735,19 +1735,48 @@
 
 else
   echo "$ac_t""no" 1>&6
+echo $ac_n "checking for connect in -lws2_32""... $ac_c" 1>&6
+echo "configure:1740: checking for connect in -lws2_32" >&5
+xxxxLIBS=$LIBS
+LIBS="$LIBS -lws2_32"
+cat > conftest.$ac_ext <<EOF
+#line 1744 "configure"
+#include "confdefs.h"
+#include <winsock2.h>
+int sd;
+struct sockaddr_in s;
+
+int main() {
+connect(sd, (struct sockaddr *)&s, sizeof(s));
+; return 0; }
+EOF
+if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  LIBS=$xxxxLIBS
+echo "$ac_t""no" 1>&6
+
+fi
+rm -f conftest*
+
 fi
 
 fi
 
+
 for ac_func in strcasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1746: checking for $ac_func" >&5
+echo "configure:1775: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1751 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1770,7 +1799,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1797,12 +1826,12 @@
 for ac_func in sleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1801: checking for $ac_func" >&5
+echo "configure:1830: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1806 "configure"
+#line 1835 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1825,7 +1854,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1849,11 +1878,7 @@
 fi
 done
 
-case "$host_os" in
-mingw*)
-	EXTRALIB="$EXTRALIB -lws2_32"
-	;;
-esac
+
 
 # ALSA
 has_alsa=yes
@@ -1861,17 +1886,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1865: checking for $ac_hdr" >&5
+echo "configure:1890: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1870 "configure"
+#line 1895 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1900: \"$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*
@@ -1898,17 +1923,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1902: checking for $ac_hdr" >&5
+echo "configure:1927: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1907 "configure"
+#line 1932 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1937: \"$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*
@@ -1945,17 +1970,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1949: checking for $ac_hdr" >&5
+echo "configure:1974: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1954 "configure"
+#line 1979 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1984: \"$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*
@@ -1982,17 +2007,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1986: checking for $ac_hdr" >&5
+echo "configure:2011: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1991 "configure"
+#line 2016 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2021: \"$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*
@@ -2029,17 +2054,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2033: checking for $ac_hdr" >&5
+echo "configure:2058: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2038 "configure"
+#line 2063 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2068: \"$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*
@@ -2069,7 +2094,7 @@
 
 if test "$with_mictype" = auto; then
   echo $ac_n "checking for input device type""... $ac_c" 1>&6
-echo "configure:2073: checking for input device type" >&5
+echo "configure:2098: checking for input device type" >&5
   altype=no
   case "$host_os" in
   linux*)
@@ -2095,12 +2120,12 @@
   darwin*)
         # MacOSX (CoreAudio)
 	cat > conftest.$ac_ext <<EOF
-#line 2099 "configure"
+#line 2124 "configure"
 #include "confdefs.h"
 #include <CoreAudio/CoreAudio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2129: \"$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*
@@ -2115,12 +2140,12 @@
   solaris2*)
 	# Solaris2.x Built-in Audio
 	cat > conftest.$ac_ext <<EOF
-#line 2119 "configure"
+#line 2144 "configure"
 #include "confdefs.h"
 #include <sys/audioio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2149: \"$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*
@@ -2135,12 +2160,12 @@
   sunos4*)
 	# SunOS4 Audio
 	cat > conftest.$ac_ext <<EOF
-#line 2139 "configure"
+#line 2164 "configure"
 #include "confdefs.h"
 #include <multimedia/libaudio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2169: \"$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*
@@ -2155,12 +2180,12 @@
   irix6*)
  	# O2 (SGI IRIX6.3)
 	cat > conftest.$ac_ext <<EOF
-#line 2159 "configure"
+#line 2184 "configure"
 #include "confdefs.h"
 #include <audio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2189: \"$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*
@@ -2198,7 +2223,7 @@
 	  ;;
         cygwin*|mingw*)
 	  echo $ac_n "checking for main in -ldsound""... $ac_c" 1>&6
-echo "configure:2202: checking for main in -ldsound" >&5
+echo "configure:2227: checking for main in -ldsound" >&5
 ac_lib_var=`echo dsound'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2206,14 +2231,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldsound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2210 "configure"
+#line 2235 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2232,17 +2257,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2236: checking for $ac_hdr" >&5
+echo "configure:2261: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2241 "configure"
+#line 2266 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2271: \"$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*
@@ -2313,7 +2338,7 @@
       case "$host_os" in
         linux*)
           echo $ac_n "checking for spInitAudio in -lspa.linux""... $ac_c" 1>&6
-echo "configure:2317: checking for spInitAudio in -lspa.linux" >&5
+echo "configure:2342: checking for spInitAudio in -lspa.linux" >&5
 ac_lib_var=`echo spa.linux'_'spInitAudio | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2321,7 +2346,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lspa.linux -lspb.linux -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2325 "configure"
+#line 2350 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2332,7 +2357,7 @@
 spInitAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:2336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2351,7 +2376,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for spInitAudio in -lspa.linux-glibc""... $ac_c" 1>&6
-echo "configure:2355: checking for spInitAudio in -lspa.linux-glibc" >&5
+echo "configure:2380: checking for spInitAudio in -lspa.linux-glibc" >&5
 ac_lib_var=`echo spa.linux-glibc'_'spInitAudio | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2359,7 +2384,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lspa.linux-glibc -lspb.linux-glibc -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2363 "configure"
+#line 2388 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2370,7 +2395,7 @@
 spInitAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:2374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2536,21 +2561,21 @@
 
 if test "$with_netaudio_dir" = auto ; then
 	echo $ac_n "checking for DatLink/NetAudio support""... $ac_c" 1>&6
-echo "configure:2540: checking for DatLink/NetAudio support" >&5
+echo "configure:2565: checking for DatLink/NetAudio support" >&5
 else
 	echo $ac_n "checking for DatLink/NetAudio support on ${with_netaudio_dir}""... $ac_c" 1>&6
-echo "configure:2543: checking for DatLink/NetAudio support on ${with_netaudio_dir}" >&5
+echo "configure:2568: checking for DatLink/NetAudio support on ${with_netaudio_dir}" >&5
 fi
 TMPCPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS -I${with_netaudio_dir}/include"
 use_netaudio=no
 cat > conftest.$ac_ext <<EOF
-#line 2549 "configure"
+#line 2574 "configure"
 #include "confdefs.h"
 #include <netaudio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2579: \"$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*
@@ -2575,7 +2600,7 @@
 have_zlib=no;
 if test "$use_zlib" = yes; then
   echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:2579: checking for deflate in -lz" >&5
+echo "configure:2604: checking for deflate in -lz" >&5
 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2583,7 +2608,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2587 "configure"
+#line 2612 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2594,7 +2619,7 @@
 deflate()
 ; return 0; }
 EOF
-if { (eval echo configure:2598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2613,17 +2638,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2617: checking for $ac_hdr" >&5
+echo "configure:2642: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2622 "configure"
+#line 2647 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2652: \"$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*
@@ -2668,7 +2693,7 @@
   # Extract the first word of "gzip", so it can be a program name with args.
 set dummy gzip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2672: checking for $ac_word" >&5
+echo "configure:2697: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GZIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2715,7 +2740,7 @@
 if test "$with_sndfile" = yes; then
  have_libsndfile=no
  echo $ac_n "checking for sf_open in -lsndfile""... $ac_c" 1>&6
-echo "configure:2719: checking for sf_open in -lsndfile" >&5
+echo "configure:2744: checking for sf_open in -lsndfile" >&5
 ac_lib_var=`echo sndfile'_'sf_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2723,7 +2748,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsndfile  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2727 "configure"
+#line 2752 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2734,7 +2759,7 @@
 sf_open()
 ; return 0; }
 EOF
-if { (eval echo configure:2738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2753,17 +2778,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2757: checking for $ac_hdr" >&5
+echo "configure:2782: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2762 "configure"
+#line 2787 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2792: \"$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*
@@ -2805,7 +2830,7 @@
 
  if test "$have_libsndfile" = no; then
   echo $ac_n "checking for sf_open_read in -lsndfile""... $ac_c" 1>&6
-echo "configure:2809: checking for sf_open_read in -lsndfile" >&5
+echo "configure:2834: checking for sf_open_read in -lsndfile" >&5
 ac_lib_var=`echo sndfile'_'sf_open_read | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2813,7 +2838,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsndfile  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2817 "configure"
+#line 2842 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2824,7 +2849,7 @@
 sf_open_read()
 ; return 0; }
 EOF
-if { (eval echo configure:2828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2843,17 +2868,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2847: checking for $ac_hdr" >&5
+echo "configure:2872: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2852 "configure"
+#line 2877 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2882: \"$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*
Index: julius4/libsent/configure.in
diff -u julius4/libsent/configure.in:1.14 julius4/libsent/configure.in:1.15
--- julius4/libsent/configure.in:1.14	Wed Feb 11 16:22:45 2009
+++ julius4/libsent/configure.in	Sat Jun 20 16:47:06 2009
@@ -3,7 +3,7 @@
 dnl Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
 dnl All rights reserved
 dnl
-dnl  $Id: configure.in,v 1.14 2009/02/11 07:22:45 sumomo Exp $
+dnl  $Id: configure.in,v 1.15 2009/06/20 07:47:06 sumomo Exp $
 dnl
 
 dnl Process this file with autoconf to produce a configure script.
@@ -144,14 +144,23 @@
 dnl AC_FUNC_VPRINTF
 dnl AC_CHECK_FUNCS(strdup strstr)
 AC_CHECK_FUNC(gethostbyname,,AC_CHECK_LIB(nsl,gethostbyname))
-AC_CHECK_FUNC(connect,,AC_CHECK_LIB(socket, connect))
+AC_CHECK_FUNC(connect,,AC_CHECK_LIB(socket, connect,,
+AC_MSG_CHECKING([for connect in -lws2_32])
+xxxxLIBS=$LIBS
+LIBS="$LIBS -lws2_32"
+AC_TRY_LINK([#include <winsock2.h>
+int sd;
+struct sockaddr_in s;
+], [connect(sd, (struct sockaddr *)&s, sizeof(s));],
+AC_MSG_RESULT([yes]),
+LIBS=$xxxxLIBS
+AC_MSG_RESULT([no])
+)
+))
+
 AC_CHECK_FUNCS(strcasecmp)
 AC_CHECK_FUNCS(sleep)
-case "$host_os" in
-mingw*)
-	EXTRALIB="$EXTRALIB -lws2_32"
-	;;
-esac
+
 
 dnl Check for avaiable common adin files
 # ALSA

From sumomo ＠ users.sourceforge.jp  Sat Jun 20 23:06:55 2009
From: sumomo ＠ users.sourceforge.jp (sumomo ＠ users.sourceforge.jp)
Date: Sat, 20 Jun 2009 23:06:55 +0900
Subject: [Julius-cvs 417]  CVS update: julius4/julius
Message-ID: <1245506815.007495.25753.nullmailer@users.sourceforge.jp>

Index: julius4/julius/Makefile.in
diff -u julius4/julius/Makefile.in:1.5 julius4/julius/Makefile.in:1.6
--- julius4/julius/Makefile.in:1.5	Thu Oct  2 17:57:03 2008
+++ julius4/julius/Makefile.in	Sat Jun 20 23:06:54 2009
@@ -5,7 +5,7 @@
 # All rights reserved
 
 #
-# $Id: Makefile.in,v 1.5 2008/10/02 08:57:03 sumomo Exp $
+# $Id: Makefile.in,v 1.6 2009/06/20 14:06:54 sumomo Exp $
 #
 SHELL=/bin/sh
 .SUFFIXES:
@@ -18,7 +18,7 @@
 CC=@CC@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-I. -I$(LIBJULIUS)/include -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` `$(LIBJULIUS)/libjulius-config --cflags`
-LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs`
+LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` @LIBICONV@
 GTK_CFLAGS=@GTK_CFLAGS@
 GTK_LIBS=@GTK_LIBS@
 RM=@RM@ -f
Index: julius4/julius/configure
diff -u julius4/julius/configure:1.2 julius4/julius/configure:1.3
--- julius4/julius/configure:1.2	Thu Oct  2 17:57:03 2008
+++ julius4/julius/configure	Sat Jun 20 23:06:54 2009
@@ -1506,28 +1506,47 @@
 if test "$use_charconv" = no; then
     CCOBJ=""
 else
-    echo $ac_n "checking for charset conversion""... $ac_c" 1>&6
-echo "configure:1511: checking for charset conversion" >&5
-    CCOBJ="charconv.o"
-    case "$host_os" in
-    mingw*)
-		cat >> confdefs.h <<\EOF
-#define USE_WIN32_MULTIBYTE 1
-EOF
-
-        CCOBJ="${CCOBJ} charconv_win32.o"
-	CCOBJ="${CCOBJ} charconv_libjcode.o libjcode/libjcode.o libjcode/detect.o"
-	ccdesc="Win32 API + libjcode"
-	cat >> confdefs.h <<\EOF
-#define CHARACTER_CONVERSION 1
+        CCOBJ="charconv.o"
+    case "$use_charconv" in
+	auto)
+	    	    ac_safe=`echo "winnls.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for winnls.h""... $ac_c" 1>&6
+echo "configure:1515: checking for winnls.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1520 "configure"
+#include "confdefs.h"
+#include <winnls.h>
 EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1525: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  use_winnls=yes
+else
+  echo "$ac_t""no" 1>&6
+use_winnls=no
+fi
 
-	echo "$ac_t""win32" 1>&6
-	;;
-*)
-	case "$use_charconv" in
-	auto)
-                        
+	    if test "$use_winnls" = yes; then
+	       use_cfunc=win32
+	    else
+	       	       
     
   # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
 if test "${with_libiconv_prefix+set}" = set; then
@@ -1542,7 +1561,7 @@
 
 
   echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:1546: checking for iconv" >&5
+echo "configure:1565: checking for iconv" >&5
 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1550,7 +1569,7 @@
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat > conftest.$ac_ext <<EOF
-#line 1554 "configure"
+#line 1573 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -1560,7 +1579,7 @@
        iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:1564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_func_iconv=yes
 else
@@ -1572,7 +1591,7 @@
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat > conftest.$ac_ext <<EOF
-#line 1576 "configure"
+#line 1595 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -1582,7 +1601,7 @@
          iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:1586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -1603,13 +1622,13 @@
 EOF
 
     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:1607: checking for iconv declaration" >&5
+echo "configure:1626: checking for iconv declaration" >&5
     if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
       cat > conftest.$ac_ext <<EOF
-#line 1613 "configure"
+#line 1632 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -1628,7 +1647,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_proto_iconv_arg1=""
 else
@@ -1655,26 +1674,57 @@
   fi
   
 
-            if test "$am_cv_func_iconv" = yes; then
-	       CCOBJ="${CCOBJ} charconv_iconv.o"
-               ccdesc="iconv library"
-	       echo "$ac_t""iconv" 1>&6
-            else
-               cat >> confdefs.h <<\EOF
-#define USE_LIBJCODE 1
-EOF
-
-	       CCOBJ="${CCOBJ} charconv_libjcode.o libjcode/libjcode.o libjcode/detect.o"
-               ccdesc="built-in libjcode (Japanese codes only)"
-	       echo "$ac_t""libjcode" 1>&6
-            fi
-            cat >> confdefs.h <<\EOF
-#define CHARACTER_CONVERSION 1
+	       if test "$am_cv_func_iconv" = yes; then
+	          use_cfunc=iconv
+	       else
+	          use_cfunc=libjcode
+	       fi
+	    fi
+	    ;;
+	win)
+	    	    ac_safe=`echo "winnls.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for winnls.h""... $ac_c" 1>&6
+echo "configure:1688: checking for winnls.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1693 "configure"
+#include "confdefs.h"
+#include <winnls.h>
 EOF
-
-            ;;
-        iconv)
-                        
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1698: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  use_winnls=yes
+else
+  echo "$ac_t""no" 1>&6
+use_winnls=no
+fi
+
+	    if test "$use_winnls" = yes; then
+	       use_cfunc=win32
+	    else
+	       use_cfunc=no
+               { echo "configure: error: Win32 function not found!" 1>&2; exit 1; }
+	    fi
+	    ;;
+	iconv)
+	    	    
     
   # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
 if test "${with_libiconv_prefix+set}" = set; then
@@ -1689,7 +1739,7 @@
 
 
   echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:1693: checking for iconv" >&5
+echo "configure:1743: checking for iconv" >&5
 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1697,7 +1747,7 @@
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat > conftest.$ac_ext <<EOF
-#line 1701 "configure"
+#line 1751 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -1707,7 +1757,7 @@
        iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_func_iconv=yes
 else
@@ -1719,7 +1769,7 @@
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat > conftest.$ac_ext <<EOF
-#line 1723 "configure"
+#line 1773 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -1729,7 +1779,7 @@
          iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:1733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -1750,13 +1800,13 @@
 EOF
 
     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:1754: checking for iconv declaration" >&5
+echo "configure:1804: checking for iconv declaration" >&5
     if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
       cat > conftest.$ac_ext <<EOF
-#line 1760 "configure"
+#line 1810 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -1775,7 +1825,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_proto_iconv_arg1=""
 else
@@ -1802,42 +1852,64 @@
   fi
   
 
-            if test "$am_cv_func_iconv" = yes; then
-	       CCOBJ="${CCOBJ} charconv_iconv.o"
-               EXTRALIB="$EXTRALIB $LIBICONV"
-               cat >> confdefs.h <<\EOF
+	    if test "$am_cv_func_iconv" = yes; then
+	       use_cfunc=iconv
+	    else
+	       use_cfunc=no
+               { echo "configure: error: iconv function not found!" 1>&2; exit 1; }
+	    fi
+	    ;;
+	no)
+	    use_cfunc=no
+	    ;;
+	*)
+                        { echo "configure: error: wrong argument for --enable-charconv" 1>&2; exit 1; }
+	    ;;
+    esac
+    echo $ac_n "checking for charset conversion""... $ac_c" 1>&6
+echo "configure:1871: checking for charset conversion" >&5
+    case "$use_cfunc" in
+	win32)
+	    cat >> confdefs.h <<\EOF
 #define CHARACTER_CONVERSION 1
 EOF
 
-               ccdesc="iconv libraru"
-	       echo "$ac_t""iconv" 1>&6
-            else
-	       CCOBJ=""
-               ccdesc="no"
-               { echo "configure: error: iconv function not found!" 1>&2; exit 1; }
-	       echo "$ac_t""no" 1>&6
-            fi
-            ;;
-        libjcode)
-                        cat >> confdefs.h <<\EOF
-#define USE_LIBJCODE 1
+	    cat >> confdefs.h <<\EOF
+#define USE_WIN32_MULTIBYTE 1
 EOF
 
+	    CCOBJ="${CCOBJ} charconv_win32.o"
 	    CCOBJ="${CCOBJ} charconv_libjcode.o libjcode/libjcode.o libjcode/detect.o"
-            ccdesc="built-in libjcode (Japanese codes only)"
+	    ccdesc="Win32 API + libjcode"
+	    echo "$ac_t""win32" 1>&6
+	    ;;
+	iconv)
+            cat >> confdefs.h <<\EOF
+#define CHARACTER_CONVERSION 1
+EOF
+
+	    CCOBJ="${CCOBJ} charconv_iconv.o"
+            ccdesc="iconv library"
+	    echo "$ac_t""iconv" 1>&6
+	    ;;
+	libjcode)
             cat >> confdefs.h <<\EOF
 #define CHARACTER_CONVERSION 1
 EOF
 
+            cat >> confdefs.h <<\EOF
+#define USE_LIBJCODE 1
+EOF
+
+	    CCOBJ="${CCOBJ} charconv_libjcode.o libjcode/libjcode.o libjcode/detect.o"
+            ccdesc="built-in libjcode (Japanese codes only)"
 	    echo "$ac_t""libjcode" 1>&6
-            ;;
-        no)
-                        ccdesc="no"
+	    ;;
+	no)
+	    CCOBJ=""
+            ccdesc="no"
 	    echo "$ac_t""no" 1>&6
             ;;
-        *)
-                        { echo "configure: error: wrong argument for charconv!" 1>&2; exit 1; }
-        esac
     esac
 fi
 
Index: julius4/julius/configure.in
diff -u julius4/julius/configure.in:1.3 julius4/julius/configure.in:1.4
--- julius4/julius/configure.in:1.3	Thu Oct  2 17:57:03 2008
+++ julius4/julius/configure.in	Sat Jun 20 23:06:54 2009
@@ -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.3 2008/10/02 08:57:03 sumomo Exp $
+dnl $Id: configure.in,v 1.4 2009/06/20 14:06:54 sumomo Exp $
 dnl
 
 AC_INIT(main.c)
@@ -92,68 +92,80 @@
 if test "$use_charconv" = no; then
     CCOBJ=""
 else
-    AC_MSG_CHECKING([for charset conversion])
+    dnl determine which one to use
     CCOBJ="charconv.o"
-    case "$host_os" in
-    mingw*)
-	dnl libjcode (EUC|JIS->SJIS) + Win32 API (SJIS->UTF8)
-	AC_DEFINE(USE_WIN32_MULTIBYTE)
-        CCOBJ="${CCOBJ} charconv_win32.o"
-	CCOBJ="${CCOBJ} charconv_libjcode.o libjcode/libjcode.o libjcode/detect.o"
-	ccdesc="Win32 API + libjcode"
-	AC_DEFINE(CHARACTER_CONVERSION)
-	AC_MSG_RESULT([win32])
-	;;
-*)
-	case "$use_charconv" in
+    case "$use_charconv" in
 	auto)
-            dnl iconv -> libjcode
-            AM_ICONV
-            if test "$am_cv_func_iconv" = yes; then
-	       CCOBJ="${CCOBJ} charconv_iconv.o"
-               ccdesc="iconv library"
-	       AC_MSG_RESULT([iconv])
-            else
-               AC_DEFINE(USE_LIBJCODE)
-	       CCOBJ="${CCOBJ} charconv_libjcode.o libjcode/libjcode.o libjcode/detect.o"
-               ccdesc="built-in libjcode (Japanese codes only)"
-	       AC_MSG_RESULT([libjcode])
-            fi
-            AC_DEFINE(CHARACTER_CONVERSION)
-            ;;
-        iconv)
-            dnl force iconv
-            AM_ICONV
-            if test "$am_cv_func_iconv" = yes; then
-	       CCOBJ="${CCOBJ} charconv_iconv.o"
-               EXTRALIB="$EXTRALIB $LIBICONV"
-               AC_DEFINE(CHARACTER_CONVERSION)
-               ccdesc="iconv libraru"
-	       AC_MSG_RESULT([iconv])
-            else
-	       CCOBJ=""
-               ccdesc="no"
+	    dnl check w32 function
+	    AC_CHECK_HEADER(winnls.h,use_winnls=yes,use_winnls=no)
+	    if test "$use_winnls" = yes; then
+	       use_cfunc=win32
+	    else
+	       dnl check iconv
+	       AM_ICONV
+	       if test "$am_cv_func_iconv" = yes; then
+	          use_cfunc=iconv
+	       else
+	          use_cfunc=libjcode
+	       fi
+	    fi
+	    ;;
+	win)
+	    dnl check w32 function
+	    AC_CHECK_HEADER(winnls.h,use_winnls=yes,use_winnls=no)
+	    if test "$use_winnls" = yes; then
+	       use_cfunc=win32
+	    else
+	       use_cfunc=no
+               AC_MSG_ERROR([Win32 function not found!])
+	    fi
+	    ;;
+	iconv)
+	    dnl check iconv
+	    AM_ICONV
+	    if test "$am_cv_func_iconv" = yes; then
+	       use_cfunc=iconv
+	    else
+	       use_cfunc=no
                AC_MSG_ERROR([iconv function not found!])
-	       AC_MSG_RESULT([no])
-            fi
-            ;;
-        libjcode)
-            dnl force libjcode
+	    fi
+	    ;;
+	no)
+	    use_cfunc=no
+	    ;;
+	*)
+            dnl error
+            AC_MSG_ERROR([wrong argument for --enable-charconv])
+	    ;;
+    esac
+    AC_MSG_CHECKING([for charset conversion])
+    case "$use_cfunc" in
+	win32)
+	    AC_DEFINE(CHARACTER_CONVERSION)
+	    AC_DEFINE(USE_WIN32_MULTIBYTE)
+	    CCOBJ="${CCOBJ} charconv_win32.o"
+	    CCOBJ="${CCOBJ} charconv_libjcode.o libjcode/libjcode.o libjcode/detect.o"
+	    ccdesc="Win32 API + libjcode"
+	    AC_MSG_RESULT([win32])
+	    ;;
+	iconv)
+            AC_DEFINE(CHARACTER_CONVERSION)
+	    CCOBJ="${CCOBJ} charconv_iconv.o"
+            ccdesc="iconv library"
+	    AC_MSG_RESULT([iconv])
+	    ;;
+	libjcode)
+            AC_DEFINE(CHARACTER_CONVERSION)
             AC_DEFINE(USE_LIBJCODE)
 	    CCOBJ="${CCOBJ} charconv_libjcode.o libjcode/libjcode.o libjcode/detect.o"
             ccdesc="built-in libjcode (Japanese codes only)"
-            AC_DEFINE(CHARACTER_CONVERSION)
 	    AC_MSG_RESULT([libjcode])
-            ;;
-        no)
-            dnl disable
+	    ;;
+	no)
+	    CCOBJ=""
             ccdesc="no"
 	    AC_MSG_RESULT([no])
             ;;
-        *)
-            dnl error
-            AC_MSG_ERROR([wrong argument for charconv!])
-        esac
     esac
 fi