ref: d30bc6087f69337abc0c2363e317bb6f79d6034b
parent: 4ccbf42231100d5fb72d9633952043af3d34c36a
author: robs <robs>
date: Thu Nov 1 15:19:38 EDT 2007
Fix AMR build with --disable-shared
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@
o Fix ogg vorbis compile error on some platforms.
o Remove unused libltdl that could cause header mismatch with
installed libltdl.
+ o Fix AMR detection with --disable-shared. (robs)
sox-14.0.0
--- a/configure.ac
+++ b/configure.ac
@@ -355,9 +355,9 @@
fi
fi
if test "$using_amr_wb" = yes; then
- AC_DEFINE(HAVE_AMR_WB, 1, [Define to 1 if you have AMR-WB.])
+ AC_DEFINE(HAVE_AMRWB, 1, [Define to 1 if you have AMR-WB.])
fi
-AM_CONDITIONAL(HAVE_AMR_WB, test x$using_amr_wb = xyes)
+AM_CONDITIONAL(HAVE_AMRWB, test x$using_amr_wb = xyes)
AC_SUBST(AMR_WB_LIBS)
dnl Check for amr-nb libraries
@@ -376,9 +376,9 @@
fi
fi
if test "$using_amr_nb" = yes; then
- AC_DEFINE(HAVE_AMR_NB, 1, [Define to 1 if you have AMR-NB.])
+ AC_DEFINE(HAVE_AMRNB, 1, [Define to 1 if you have AMR-NB.])
fi
-AM_CONDITIONAL(HAVE_AMR_NB, test x$using_amr_nb = xyes)
+AM_CONDITIONAL(HAVE_AMRNB, test x$using_amr_nb = xyes)
AC_SUBST(AMR_NB_LIBS)
dnl Test for libsamplerate.
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -138,12 +138,12 @@
libsox_fmt_sndfile_la_LIBADD = libsox.la @SNDFILE_LIBS@
pkglib_LTLIBRARIES += libsox_fmt_sndfile.la
endif
-if HAVE_AMR_WB
+if HAVE_AMRWB
libsox_fmt_amr_wb_la_SOURCES = amr-wb.c amr.h
libsox_fmt_amr_wb_la_LIBADD = libsox.la @AMR_WB_LIBS@
pkglib_LTLIBRARIES += libsox_fmt_amr_wb.la
endif
-if HAVE_AMR_NB
+if HAVE_AMRNB
libsox_fmt_amr_nb_la_SOURCES = amr-nb.c amr.h
libsox_fmt_amr_nb_la_LIBADD = libsox.la @AMR_NB_LIBS@
pkglib_LTLIBRARIES += libsox_fmt_amr_nb.la
@@ -240,12 +240,12 @@
libsox_la_LIBADD += @SNDFILE_LIBS@
sox_LDADD += @SNDFILE_LIBS@
endif
-if HAVE_AMR_WB
+if HAVE_AMRWB
libsox_la_SOURCES += amr-wb.c amr.h
libsox_la_LIBADD += @AMR_WB_LIBS@
sox_LDADD += @AMR_WB_LIBS@
endif
-if HAVE_AMR_NB
+if HAVE_AMRNB
libsox_la_SOURCES += amr-nb.c amr.h
libsox_la_LIBADD += @AMR_NB_LIBS@
sox_LDADD += @AMR_NB_LIBS@