Merge pull request #968

This commit is contained in:
Valdis Vitolins
2021-07-09 12:53:56 +03:00
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -134,7 +134,7 @@ src_libespeak_ng_la_LDFLAGS = -version-info $(SHARED_VERSION) -lpthread -lm \
src_libespeak_ng_la_CFLAGS = \
-fPIC -fvisibility=hidden \
-pedantic -fno-exceptions -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -DLIBESPEAK_NG_EXPORT \
-pedantic -fno-exceptions -DPATH_ESPEAK_DATA=\"$(DATADIR)\" -DLIBESPEAK_NG_EXPORT \
${PCAUDIOLIB_CFLAGS} ${AM_CFLAGS}
src_libespeak_ng_la_SOURCES = \
@@ -235,7 +235,7 @@ check_LTLIBRARIES += src/libespeak-ng-test.la
src_libespeak_ng_test_la_LDFLAGS = $(src_libespeak_ng_la_LDFLAGS)
src_libespeak_ng_test_la_CFLAGS = \
-fPIC -pedantic -fno-exceptions -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -DLIBESPEAK_NG_EXPORT \
-fPIC -pedantic -fno-exceptions -DPATH_ESPEAK_DATA=\"$(DATADIR)\" -DLIBESPEAK_NG_EXPORT \
${PCAUDIOLIB_CFLAGS} ${AM_CFLAGS}
src_libespeak_ng_test_la_SOURCES = $(src_libespeak_ng_la_SOURCES)
+2 -2
View File
@@ -83,10 +83,10 @@ dnl ================================================================
AC_MSG_CHECKING([for gradle])
if test -e ${GRADLE} ; then
AC_MSG_RESULT([${GRADLE}])
AM_CONDITIONAL(HAVE_GRADLE, [1])
AM_CONDITIONAL(HAVE_GRADLE, [test 1 = 1])
else
AC_MSG_RESULT([no])
AM_CONDITIONAL(HAVE_GRADLE, [0])
AM_CONDITIONAL(HAVE_GRADLE, [test 0 = 0])
fi
AC_SUBST(GRADLE)