Some speechd-related fixes

This commit is contained in:
Maxim Kartashev
2022-12-07 09:56:13 +03:00
parent eb987a800e
commit 9beed7ac0d
5 changed files with 12 additions and 8 deletions

View File

@@ -47,7 +47,7 @@ AC_DEFUN_ONCE([LIB_SETUP_SPEECHD],
else
SPEECHD_FOUND=no
if test "x${with_speechd}" != x; then
if test "x${with_speechd}" != x && test "x${with_speechd}" != xyes; then
AC_MSG_CHECKING([for speechd header and library])
if test -s "${with_speechd}/include/libspeechd.h"; then
SPEECHD_CFLAGS="-I${with_speechd}/include"

View File

@@ -35,7 +35,7 @@
*/
JNIEXPORT void JNICALL Java_javax_swing_AccessibleAnnouncer_announce(JNIEnv *env, jclass cls, jobject accessible, jstring str, jint priority)
{
#if NO_A11Y_ANNOUNCING
#ifndef NO_A11Y_ANNOUNCING
if (str != NULL)
{
const char *msg = JNU_GetStringPlatformChars(env, str, NULL);

View File

@@ -27,7 +27,7 @@
#ifndef ACCESSIBLEANNOUNCERJNIUTILS_H
#define ACCESSIBLEANNOUNCERJNIUTILS_H
#if NO_A11Y_ANNOUNCING
#ifndef NO_A11Y_ANNOUNCING
#include "jni.h"
@@ -182,6 +182,8 @@ return ret;\
}\
}\
#endif
#endif // #ifndef NO_A11Y_ANNOUNCING
#endif //ACCESSIBLEANNOUNCERJNIUTILS_H

View File

@@ -24,7 +24,7 @@
* questions.
*/
#if NO_A11Y_ANNOUNCING
#ifndef NO_A11Y_ANNOUNCING
#include "OrcaConf.h"
#include "AccessibleAnnouncerJNIUtils.h"
@@ -187,4 +187,5 @@ jobject GetOrcaConf(JNIEnv *env)
return o;
}
#endif
#endif // #ifndef NO_A11Y_ANNOUNCING

View File

@@ -27,7 +27,7 @@
#ifndef ORCACONF_H
#define ORCACONF_H
#if NO_A11Y_ANNOUNCING
#ifndef NO_A11Y_ANNOUNCING
#include <libspeechd.h>
#include "jni.h"
@@ -45,6 +45,7 @@ int GetEnableSpeech(JNIEnv *env, jobject conf);
int GetOnlySpeakDisplayedText(JNIEnv *env, jobject conf);
int GetEstablished(JNIEnv *env, jobject conf);
#endif
#endif // #ifndef NO_A11Y_ANNOUNCING
#endif //ORCACONF_H