sumom****@users*****
sumom****@users*****
2009年 10月 27日 (火) 13:31:21 JST
Index: julius4/libsent/configure
diff -u julius4/libsent/configure:1.17 julius4/libsent/configure:1.18
--- julius4/libsent/configure:1.17 Tue Oct 27 03:43:37 2009
+++ julius4/libsent/configure Tue Oct 27 13:31:21 2009
@@ -2524,6 +2524,10 @@
aldesc="PortAudio library (external)"
ADINOBJ="$ADINOBJ src/adin/adin_portaudio.o"
SOUNDLIB="$SOUNDLIB -lportaudio"
+ cat >> confdefs.h <<\EOF
+#define USE_MIC 1
+EOF
+
;;
pa-*)
aldesc="PortAudio library (internal)"
@@ -2651,21 +2655,21 @@
if test "$with_netaudio_dir" = auto ; then
echo $ac_n "checking for DatLink/NetAudio support""... $ac_c" 1>&6
-echo "configure:2655: checking for DatLink/NetAudio support" >&5
+echo "configure:2659: 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:2658: checking for DatLink/NetAudio support on ${with_netaudio_dir}" >&5
+echo "configure:2662: 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 2664 "configure"
+#line 2668 "configure"
#include "confdefs.h"
#include <netaudio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2673: \"$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*
@@ -2690,7 +2694,7 @@
have_zlib=no;
if test "$use_zlib" = yes; then
echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:2694: checking for deflate in -lz" >&5
+echo "configure:2698: 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
@@ -2698,7 +2702,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2702 "configure"
+#line 2706 "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
@@ -2709,7 +2713,7 @@
deflate()
; return 0; }
EOF
-if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2717: \"$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
@@ -2728,17 +2732,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2732: checking for $ac_hdr" >&5
+echo "configure:2736: 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 2737 "configure"
+#line 2741 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2746: \"$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*
@@ -2783,7 +2787,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:2787: checking for $ac_word" >&5
+echo "configure:2791: 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
@@ -2830,7 +2834,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:2834: checking for sf_open in -lsndfile" >&5
+echo "configure:2838: 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
@@ -2838,7 +2842,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsndfile $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
+#line 2846 "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
@@ -2849,7 +2853,7 @@
sf_open()
; return 0; }
EOF
-if { (eval echo configure:2853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2857: \"$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
@@ -2868,17 +2872,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2872: checking for $ac_hdr" >&5
+echo "configure:2876: 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 2877 "configure"
+#line 2881 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2886: \"$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*
@@ -2920,7 +2924,7 @@
if test "$have_libsndfile" = no; then
echo $ac_n "checking for sf_open_read in -lsndfile""... $ac_c" 1>&6
-echo "configure:2924: checking for sf_open_read in -lsndfile" >&5
+echo "configure:2928: 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
@@ -2928,7 +2932,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsndfile $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2932 "configure"
+#line 2936 "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
@@ -2939,7 +2943,7 @@
sf_open_read()
; return 0; }
EOF
-if { (eval echo configure:2943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2947: \"$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
@@ -2958,17 +2962,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2962: checking for $ac_hdr" >&5
+echo "configure:2966: 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 2967 "configure"
+#line 2971 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2976: \"$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.17 julius4/libsent/configure.in:1.18
--- julius4/libsent/configure.in:1.17 Tue Oct 27 03:43:37 2009
+++ julius4/libsent/configure.in Tue Oct 27 13:31:21 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.17 2009/10/26 18:43:37 sumomo Exp $
+dnl $Id: configure.in,v 1.18 2009/10/27 04:31:21 sumomo Exp $
dnl
dnl Process this file with autoconf to produce a configure script.
@@ -317,6 +317,7 @@
aldesc="PortAudio library (external)"
ADINOBJ="$ADINOBJ src/adin/adin_portaudio.o"
SOUNDLIB="$SOUNDLIB -lportaudio"
+ AC_DEFINE(USE_MIC)
;;
pa-*)
aldesc="PortAudio library (internal)"