diff --git a/libs/speex/Makefile.am b/libs/speex/Makefile.am index a24edde76d..5f6c7bbdf8 100644 --- a/libs/speex/Makefile.am +++ b/libs/speex/Makefile.am @@ -13,7 +13,7 @@ pkgconfig_DATA = speex.pc EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP #Fools KDevelop into including all files -SUBDIRS = libspeex include @src@ doc win32 symbian ti +SUBDIRS = libspeex include doc win32 symbian ti DIST_SUBDIRS = libspeex include src doc win32 symbian ti diff --git a/libs/speex/configure.ac b/libs/speex/configure.ac index faa449bc17..a3a2395c7f 100644 --- a/libs/speex/configure.ac +++ b/libs/speex/configure.ac @@ -67,9 +67,6 @@ AC_MSG_RESULT($has_alloca) AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h) -XIPH_PATH_OGG([src="src"], [src=""]) -AC_SUBST(src) - AC_CHECK_LIB(m, sin) # Check for getopt_long; if not found, use included source. @@ -230,10 +227,4 @@ AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec ti/speex_C54_test/Makefile ti/speex_C55_test/Makefile ti/speex_C64_test/Makefile ]) -if test "x$src" = "x"; then -echo "**IMPORTANT**" -echo "You don't seem to have the development package for libogg (libogg-devel) installed. Only the Speex library (libspeex) will be built (no encoder/decoder executable)" -echo "You can download libogg from http://downloads.xiph.org/releases/ogg/" -fi - echo "Type \"make; make install\" to compile and install Speex";