sumom****@users*****
sumom****@users*****
2012年 7月 19日 (木) 10:48:49 JST
Index: julius4/gramtools/configure
diff -u julius4/gramtools/configure:1.3 julius4/gramtools/configure:1.4
--- julius4/gramtools/configure:1.3 Fri Apr 29 11:01:55 2011
+++ julius4/gramtools/configure Thu Jul 19 10:48:49 2012
@@ -1130,58 +1130,10 @@
{ echo "configure: error: perl not found! installation terminated" 1>&2; exit 1; }
fi
-echo $ac_n "checking for yywrap in -lfl""... $ac_c" 1>&6
-echo "configure:1135: checking for yywrap in -lfl" >&5
-ac_lib_var=`echo fl'_'yywrap | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lfl $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1143 "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
- builtin and then its argument prototype would still apply. */
-char yywrap();
-
-int main() {
-yywrap()
-; return 0; }
-EOF
-if { (eval echo configure:1154: \"$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
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo fl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
- LIBS="-lfl $LIBS"
-
-else
- echo "$ac_t""no" 1>&6
-{ echo "configure: error: flex library not found! installation terminated" 1>&2; exit 1; }
-fi
-
# Extract the first word of "iconv", so it can be a program name with args.
set dummy iconv; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1185: checking for $ac_word" >&5
+echo "configure:1137: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ICONV'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1217,7 +1169,7 @@
echo "configure: warning: no iconv, gram2sapixml.pl may not work" 1>&2
else
echo $ac_n "checking for Jcode module in perl""... $ac_c" 1>&6
-echo "configure:1221: checking for Jcode module in perl" >&5
+echo "configure:1173: checking for Jcode module in perl" >&5
if $PERL -mJcode -e "print;"; then
echo "$ac_t""yes" 1>&6
else
@@ -1228,17 +1180,17 @@
READLINE_LIBS=""
ac_safe=`echo "readline/readline.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for readline/readline.h""... $ac_c" 1>&6
-echo "configure:1232: checking for readline/readline.h" >&5
+echo "configure:1184: checking for readline/readline.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 1237 "configure"
+#line 1189 "configure"
#include "confdefs.h"
#include <readline/readline.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1194: \"$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*
@@ -1255,7 +1207,7 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:1259: checking for readline in -lreadline" >&5
+echo "configure:1211: checking for readline in -lreadline" >&5
ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1263,7 +1215,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lreadline $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1267 "configure"
+#line 1219 "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
@@ -1274,7 +1226,7 @@
readline()
; return 0; }
EOF
-if { (eval echo configure:1278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1230: \"$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
@@ -1294,11 +1246,11 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for readline in -lreadline with -ltermcap""... $ac_c" 1>&6
-echo "configure:1298: checking for readline in -lreadline with -ltermcap" >&5
+echo "configure:1250: checking for readline in -lreadline with -ltermcap" >&5
ac_save_LIBS="$LIBS"
LIBS="$ac_save_LIBS -lreadline -ltermcap"
cat > conftest.$ac_ext <<EOF
-#line 1302 "configure"
+#line 1254 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <readline/readline.h>
@@ -1306,7 +1258,7 @@
readline("");
; return 0; }
EOF
-if { (eval echo configure:1310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
READLINE_LIBS="-lreadline -ltermcap"
@@ -1318,10 +1270,10 @@
rm -rf conftest*
echo "$ac_t""no" 1>&6
echo $ac_n "checking for readline in -lreadline with -lncurses""... $ac_c" 1>&6
-echo "configure:1322: checking for readline in -lreadline with -lncurses" >&5
+echo "configure:1274: checking for readline in -lreadline with -lncurses" >&5
LIBS="$ac_save_LIBS -lreadline -lncurses"
cat > conftest.$ac_ext <<EOF
-#line 1325 "configure"
+#line 1277 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <readline/readline.h>
@@ -1329,7 +1281,7 @@
readline("");
; return 0; }
EOF
-if { (eval echo configure:1333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
READLINE_LIBS="-lreadline -lncurses"
@@ -1362,9 +1314,9 @@
EOF
echo $ac_n "checking for readline verion > 4.1""... $ac_c" 1>&6
-echo "configure:1366: checking for readline verion > 4.1" >&5
+echo "configure:1318: checking for readline verion > 4.1" >&5
cat > conftest.$ac_ext <<EOF
-#line 1368 "configure"
+#line 1320 "configure"
#include "confdefs.h"
#include <readline/readline.h>
EOF
@@ -1390,17 +1342,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1394: checking for $ac_hdr" >&5
+echo "configure:1346: 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 1399 "configure"
+#line 1351 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1356: \"$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/gramtools/configure.in
diff -u julius4/gramtools/configure.in:1.4 julius4/gramtools/configure.in:1.5
--- julius4/gramtools/configure.in:1.4 Fri Apr 29 10:57:19 2011
+++ julius4/gramtools/configure.in Thu Jul 19 10:48:49 2012
@@ -57,7 +57,6 @@
dnl if test -z "$FLEX"; then
dnl AC_MSG_ERROR([flex not found! installation terminated])
dnl fi
-AC_CHECK_LIB(fl, yywrap,,AC_MSG_ERROR([flex library not found! installation terminated]))
AC_PATH_PROG(ICONV,iconv)
if test -z "$ICONV"; then
AC_MSG_WARN([no iconv, gram2sapixml.pl may not work])