diff options
| author | Jonathan Lennox <jonathan@vidyo.com> | 2015-11-20 23:02:55 -0500 |
|---|---|---|
| committer | Timothy B. Terriberry <tterribe@xiph.org> | 2016-07-06 15:00:01 -0700 |
| commit | 8cb1487288bf25835962dc692be2e8544d8ecccc (patch) | |
| tree | 98a27b93b9a640223bbc336de2ac03d57398cae7 | |
| parent | ab61f328a4482bae654149412a62682bc21f28c9 (diff) | |
| download | libopus-8cb1487288bf25835962dc692be2e8544d8ecccc.tar.gz | |
Rename OPUS_ARM_NEON_INTR AM_CONDITIONAL as HAVE_ARM_NEON_INTR, for consistency with x86.
Signed-off-by: Timothy B. Terriberry <tterribe@xiph.org>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index cfdacedc..5b85a18f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,7 +47,7 @@ if CPU_ARM CELT_SOURCES += $(CELT_SOURCES_ARM) SILK_SOURCES += $(SILK_SOURCES_ARM) -if OPUS_ARM_NEON_INTR +if HAVE_ARM_NEON_INTR CELT_SOURCES += $(CELT_SOURCES_ARM_NEON_INTR) endif @@ -294,7 +294,7 @@ SSE4_1_OBJ = $(CELT_SOURCES_SSE4_1:.c=.lo) \ $(SSE4_1_OBJ) $(OPT_UNIT_TEST_OBJ): CFLAGS += $(OPUS_X86_SSE4_1_CFLAGS) endif -if OPUS_ARM_NEON_INTR +if HAVE_ARM_NEON_INTR CELT_ARM_NEON_INTR_OBJ = $(CELT_SOURCES_ARM_NEON_INTR:.c=.lo) $(CELT_ARM_NEON_INTR_OBJ) $(OPT_UNIT_TEST_OBJ): CFLAGS += \ $(OPUS_ARM_NEON_INTR_CFLAGS) $(NE10_CFLAGS) diff --git a/configure.ac b/configure.ac index 4a7199c6..3b20325b 100644 --- a/configure.ac +++ b/configure.ac @@ -708,7 +708,7 @@ AS_IF([test x"$enable_intrinsics" = x"yes"],[ ]) AM_CONDITIONAL([CPU_ARM], [test "$cpu_arm" = "yes"]) -AM_CONDITIONAL([OPUS_ARM_NEON_INTR], +AM_CONDITIONAL([HAVE_ARM_NEON_INTR], [test x"$OPUS_ARM_MAY_HAVE_NEON_INTR" = x"1"]) AM_CONDITIONAL([HAVE_ARM_NE10], [test x"$HAVE_ARM_NE10" = x"1"]) |