Skip to content

Commit 09e2c32

Browse files
committed
Automatically regenerated autotools files.
1 parent f6ef104 commit 09e2c32

File tree

2 files changed

+47
-7
lines changed

2 files changed

+47
-7
lines changed

Makefile.in

+7-7
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ SED = @SED@
411411
SET_MAKE = @SET_MAKE@
412412
SHELL = @SHELL@
413413
STRIP = @STRIP@
414+
UTFCPP_CXXFLAGS = @UTFCPP_CXXFLAGS@
414415
VERSION = @VERSION@
415416
abs_builddir = @abs_builddir@
416417
abs_srcdir = @abs_srcdir@
@@ -535,27 +536,26 @@ dist_bin_SCRIPTS = \
535536

536537
AM_CPPFLAGS = -I$(top_srcdir)/src -DGIT_REVISION=\"$(GIT_REVISION)\" -std=c++0x -Wall -Wno-sign-compare -Wno-unused-local-typedefs
537538
bin_phonetisaurus_align_SOURCES = src/bin/phonetisaurus-align.cc src/include/PhonetisaurusRex.h src/lib/util.cc src/include/util.h src/lib/LatticePruner.cc src/include/LatticePruner.h src/lib/M2MFstAligner.cc src/include/M2MFstAligner.h
538-
bin_phonetisaurus_align_CXXFLAGS = $(OPENFST_CXXFLAGS) -I$(top_srcdir)/src/3rdparty/utfcpp
539+
bin_phonetisaurus_align_CXXFLAGS = $(OPENFST_CXXFLAGS) $(UTFCPP_CXXFLAGS)
539540
bin_phonetisaurus_align_LDADD = $(OPENFST_LDFLAGS)
540541
bin_phonetisaurus_arpa2wfst_SOURCES = src/bin/phonetisaurus-arpa2wfst.cc src/include/ARPA2WFST.h src/lib/util.cc src/include/util.h
541-
bin_phonetisaurus_arpa2wfst_CXXFLAGS = $(OPENFST_CXXFLAGS) -I$(top_srcdir)/src/3rdparty/utfcpp
542+
bin_phonetisaurus_arpa2wfst_CXXFLAGS = $(OPENFST_CXXFLAGS) $(UTFCPP_CXXFLAGS)
542543
bin_phonetisaurus_arpa2wfst_LDADD = $(OPENFST_LDFLAGS)
543544
bin_phonetisaurus_g2pfst_SOURCES = src/bin/phonetisaurus-g2pfst.cc src/include/PhonetisaurusScript.h src/include/PhonetisaurusRex.h src/lib/util.cc src/include/util.h
544-
bin_phonetisaurus_g2pfst_CXXFLAGS = $(OPENFST_CXXFLAGS) -I$(top_srcdir)/src/3rdparty/utfcpp -funroll-loops -ffast-math
545+
bin_phonetisaurus_g2pfst_CXXFLAGS = $(OPENFST_CXXFLAGS) $(UTFCPP_CXXFLAGS) -funroll-loops -ffast-math
545546
bin_phonetisaurus_g2pfst_LDADD = $(OPENFST_LDFLAGS)
546547
bin_phonetisaurus_g2prnn_SOURCES = src/bin/phonetisaurus-g2prnn.cc src/include/LegacyRnnLMHash.h src/include/LegacyRnnLMDecodable.h src/include/LegacyRnnLMReader.h src/include/RnnLMDecoder.h src/lib/util.cc src/include/util.h src/3rdparty/rnnlm/rnnlmlib.cpp src/3rdparty/rnnlm/rnnlmlib.h
547548
bin_phonetisaurus_g2prnn_CXXFLAGS = $(OPENFST_CXXFLAGS) \
548-
-I$(top_srcdir)/src/3rdparty/utfcpp \
549-
-I$(top_srcdir)/src/3rdparty/rnnlm -funroll-loops -ffast-math \
550-
$(am__append_1)
549+
$(UTFCPP_CXXFLAGS) -I$(top_srcdir)/src/3rdparty/rnnlm \
550+
-funroll-loops -ffast-math $(am__append_1)
551551
bin_phonetisaurus_g2prnn_LDADD = $(OPENFST_LDFLAGS) $(am__append_2)
552552
bin_rnnlm_SOURCES = src/bin/rnnlm.cc src/3rdparty/rnnlm/rnnlmlib.cpp src/3rdparty/rnnlm/rnnlmlib.h
553553
bin_rnnlm_CXXFLAGS = $(OPENFST_CXXFLAGS) -I$(top_srcdir)/src/3rdparty/rnnlm -funroll-loops -ffast-math
554554
bin_rnnlm_LDADD = $(OPENFST_LDFLAGS)
555555
@HAVE_PYTHON_TRUE@@WANT_PYTHON_TRUE@CLEANFILES = python/Phonetisaurus-binding.cc
556556
@HAVE_PYTHON_DEV_TRUE@@HAVE_PYTHON_TRUE@@WANT_PYTHON_TRUE@pyexec_LTLIBRARIES = Phonetisaurus.la
557557
@HAVE_PYTHON_DEV_TRUE@@HAVE_PYTHON_TRUE@@WANT_PYTHON_TRUE@nodist_Phonetisaurus_la_SOURCES = python/Phonetisaurus-binding.cc src/lib/util.cc src/include/util.h
558-
@HAVE_PYTHON_DEV_TRUE@@HAVE_PYTHON_TRUE@@WANT_PYTHON_TRUE@Phonetisaurus_la_CXXFLAGS = $(OPENFST_CXXFLAGS) $(PYTHON_CPPFLAGS) -I$(top_srcdir)/src/3rdparty/utfcpp -funroll-loops -ffast-math
558+
@HAVE_PYTHON_DEV_TRUE@@HAVE_PYTHON_TRUE@@WANT_PYTHON_TRUE@Phonetisaurus_la_CXXFLAGS = $(OPENFST_CXXFLAGS) $(PYTHON_CPPFLAGS) $(UTFCPP_CXXFLAGS) -funroll-loops -ffast-math
559559
@HAVE_PYTHON_DEV_TRUE@@HAVE_PYTHON_TRUE@@WANT_PYTHON_TRUE@Phonetisaurus_la_LIBADD = $(OPENFST_LDFLAGS) $(PYTHON_LIBS)
560560
@HAVE_PYTHON_DEV_TRUE@@HAVE_PYTHON_TRUE@@WANT_PYTHON_TRUE@Phonetisaurus_la_LDFLAGS = -avoid-version -module
561561
all: all-am

configure

+40
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,9 @@ ac_includes_default="\
635635
ac_subst_vars='am__EXEEXT_FALSE
636636
am__EXEEXT_TRUE
637637
LTLIBOBJS
638+
UTFCPP_FALSE
639+
UTFCPP_TRUE
640+
UTFCPP_CXXFLAGS
638641
WANT_OPENMP_FALSE
639642
WANT_OPENMP_TRUE
640643
OPENMP_LDFLAGS
@@ -19518,6 +19521,39 @@ else
1951819521
fi
1951919522

1952019523

19524+
saved_cppflags="${CPPFLAGS}"
19525+
CPPFLAGS=
19526+
for ac_header in utf8.h
19527+
do :
19528+
ac_fn_cxx_check_header_mongrel "$LINENO" "utf8.h" "ac_cv_header_utf8_h" "$ac_includes_default"
19529+
if test "x$ac_cv_header_utf8_h" = xyes; then :
19530+
cat >>confdefs.h <<_ACEOF
19531+
#define HAVE_UTF8_H 1
19532+
_ACEOF
19533+
utfcpp_headers_found=1
19534+
else
19535+
utfcpp_headers_found=0
19536+
fi
19537+
19538+
done
19539+
19540+
if [ $utfcpp_headers_found -eq 1 ]; then
19541+
UTFCPP_CXXFLAGS="$CPPFLAGS"
19542+
else
19543+
UTFCPP_CXXFLAGS="-I \${top_srcdir}/src/3rdparty/utfcpp"
19544+
fi
19545+
CPPFLAGS="${saved_cppflags}"
19546+
19547+
if test x"$utfcpp_headers_found" = x1; then
19548+
UTFCPP_TRUE=
19549+
UTFCPP_FALSE='#'
19550+
else
19551+
UTFCPP_TRUE='#'
19552+
UTFCPP_FALSE=
19553+
fi
19554+
19555+
19556+
1952119557
ac_config_files="$ac_config_files Makefile"
1952219558

1952319559
cat >confcache <<\_ACEOF
@@ -19725,6 +19761,10 @@ if test -z "${WANT_OPENMP_TRUE}" && test -z "${WANT_OPENMP_FALSE}"; then
1972519761
as_fn_error $? "conditional \"WANT_OPENMP\" was never defined.
1972619762
Usually this means the macro was only invoked conditionally." "$LINENO" 5
1972719763
fi
19764+
if test -z "${UTFCPP_TRUE}" && test -z "${UTFCPP_FALSE}"; then
19765+
as_fn_error $? "conditional \"UTFCPP\" was never defined.
19766+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
19767+
fi
1972819768

1972919769
: "${CONFIG_STATUS=./config.status}"
1973019770
ac_write_fail=0

0 commit comments

Comments
 (0)