From eaa553748e6a9e8fdabf9f2f97c389b5c30d3239 Mon Sep 17 00:00:00 2001 From: Minas Tirith Citizen <84505946+Min4sT1r1th@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:22:12 +0200 Subject: [PATCH 1/3] fix conditional for GRADLE without this fix (assuming it does, what the original author intended to check for), the configure script spits out an error: checking for ndk-build no checking for gradle no ${_source}/configure: line 13806: 0: command not found checking if zsp-gcc supports C99 without any flags yes checking if zsp-gcc supports C99 with the -std=c99 flag yes that's because the condition in AM_CONDITIONAL is expected to be a valid shell expression for an if-statement, not just plain value: { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gradle" >&5 printf %s "checking for gradle... " >&6; } if test -e ${GRADLE} ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${GRADLE}" >&5 printf "%s\n" "${GRADLE}" >&6; } if 1; then HAVE_GRADLE_TRUE= HAVE_GRADLE_FALSE='#' else HAVE_GRADLE_TRUE='#' HAVE_GRADLE_FALSE= fi else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if 0; then HAVE_GRADLE_TRUE= HAVE_GRADLE_FALSE='#' else HAVE_GRADLE_TRUE='#' HAVE_GRADLE_FALSE= fi fi --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2ea6d5d0..c200e6d4 100644 --- a/configure.ac +++ b/configure.ac @@ -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) From d44f6e0c996f5d4520d90ef12f372e52cfdf6bf9 Mon Sep 17 00:00:00 2001 From: Minas Tirith Citizen <84505946+Min4sT1r1th@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:34:11 +0200 Subject: [PATCH 2/3] remove space between -D and PATH_ESPEAK_DATA fixed a wrong compilation parameter --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 71b8c6f9..429554e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 = \ From 3dfd750bf6eb79c9cf4f7bd0efb0a1affdfabc30 Mon Sep 17 00:00:00 2001 From: Minas Tirith Citizen <84505946+Min4sT1r1th@users.noreply.github.com> Date: Wed, 16 Jun 2021 15:41:09 +0200 Subject: [PATCH 3/3] removed another space fix compilation error within the testsuite --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 429554e1..4919202e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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)