sumom****@users*****
sumom****@users*****
2009年 10月 22日 (木) 01:39:40 JST
Index: julius4/libsent/configure
diff -u julius4/libsent/configure:1.15 julius4/libsent/configure:1.16
--- julius4/libsent/configure:1.15 Sat Jun 20 16:47:06 2009
+++ julius4/libsent/configure Thu Oct 22 01:39:40 2009
@@ -2439,6 +2439,7 @@
pa-*)
aldesc="PortAudio library"
ADINOBJ="$ADINOBJ src/adin/pa/pa_lib.o src/adin/pa/pa_convert.o src/adin/pa/pa_trace.o src/adin/pa/pablio.o src/adin/pa/ringbuffer.o"
+ SOUNDINC="-Isrc/adin/pa"
cat >> confdefs.h <<\EOF
#define USE_MIC 1
EOF
@@ -2561,21 +2562,21 @@
if test "$with_netaudio_dir" = auto ; then
echo $ac_n "checking for DatLink/NetAudio support""... $ac_c" 1>&6
-echo "configure:2565: checking for DatLink/NetAudio support" >&5
+echo "configure:2566: 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:2568: checking for DatLink/NetAudio support on ${with_netaudio_dir}" >&5
+echo "configure:2569: 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 2574 "configure"
+#line 2575 "configure"
#include "confdefs.h"
#include <netaudio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2580: \"$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*
@@ -2600,7 +2601,7 @@
have_zlib=no;
if test "$use_zlib" = yes; then
echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:2604: checking for deflate in -lz" >&5
+echo "configure:2605: 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
@@ -2608,7 +2609,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2612 "configure"
+#line 2613 "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
@@ -2619,7 +2620,7 @@
deflate()
; return 0; }
EOF
-if { (eval echo configure:2623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2624: \"$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
@@ -2638,17 +2639,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2642: checking for $ac_hdr" >&5
+echo "configure:2643: 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 2647 "configure"
+#line 2648 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2653: \"$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*
@@ -2693,7 +2694,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:2697: checking for $ac_word" >&5
+echo "configure:2698: 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
@@ -2740,7 +2741,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:2744: checking for sf_open in -lsndfile" >&5
+echo "configure:2745: 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
@@ -2748,7 +2749,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsndfile $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2752 "configure"
+#line 2753 "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
@@ -2759,7 +2760,7 @@
sf_open()
; return 0; }
EOF
-if { (eval echo configure:2763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2764: \"$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
@@ -2778,17 +2779,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2782: checking for $ac_hdr" >&5
+echo "configure:2783: 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 2787 "configure"
+#line 2788 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2793: \"$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*
@@ -2830,7 +2831,7 @@
if test "$have_libsndfile" = no; then
echo $ac_n "checking for sf_open_read in -lsndfile""... $ac_c" 1>&6
-echo "configure:2834: checking for sf_open_read in -lsndfile" >&5
+echo "configure:2835: 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
@@ -2838,7 +2839,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lsndfile $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
+#line 2843 "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 +2850,7 @@
sf_open_read()
; 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:2854: \"$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 +2869,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:2873: 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 2878 "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:2883: \"$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.15 julius4/libsent/configure.in:1.16
--- julius4/libsent/configure.in:1.15 Sat Jun 20 16:47:06 2009
+++ julius4/libsent/configure.in Thu Oct 22 01:39:40 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.15 2009/06/20 07:47:06 sumomo Exp $
+dnl $Id: configure.in,v 1.16 2009/10/21 16:39:40 sumomo Exp $
dnl
dnl Process this file with autoconf to produce a configure script.
@@ -310,6 +310,7 @@
pa-*)
aldesc="PortAudio library"
ADINOBJ="$ADINOBJ src/adin/pa/pa_lib.o src/adin/pa/pa_convert.o src/adin/pa/pa_trace.o src/adin/pa/pablio.o src/adin/pa/ringbuffer.o"
+ SOUNDINC="-Isrc/adin/pa"
AC_DEFINE(USE_MIC)
case "$altype" in
pa-winmm)