diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | ext/Makefile.am | 2 | ||||
| -rw-r--r-- | ext/arts/Makefile.am | 2 | ||||
| -rw-r--r-- | gst-libs/ext/ffmpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | m4/gst-ivorbis.m4 | 73 | ||||
| -rw-r--r-- | m4/lrint.m4 | 2 | ||||
| -rw-r--r-- | m4/lrintf.m4 | 2 |
7 files changed, 79 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 6e8231c7..7c630989 100644 --- a/configure.ac +++ b/configure.ac @@ -609,14 +609,6 @@ GST_CHECK_FEATURE(IVORBIS, [integer vorbis plug-in], ivorbisdec, [ AS_SCRUB_INCLUDE(IVORBIS_CFLAGS) ]) -dnl *** ivorbis *** -dnl AM_PATH_IVORBIS only takes two options -translit(dnm, m, l) AM_CONDITIONAL(USE_IVORBIS, true) -GST_CHECK_FEATURE(IVORBIS, [integer vorbis plug-in], ivorbisdec, [ - XIPH_PATH_IVORBIS(HAVE_IVORBIS=yes, HAVE_IVORBIS=no) - AS_SCRUB_INCLUDE(IVORBIS_CFLAGS) -]) - dnl *** Jack *** translit(dnm, m, l) AM_CONDITIONAL(USE_JACK, true) GST_CHECK_FEATURE(JACK, Jack, jack, [ @@ -1114,11 +1106,11 @@ ext/gnomevfs/Makefile ext/gsm/Makefile ext/hermes/Makefile ext/http/Makefile -ext/ivorbis/Makefile ext/jack/Makefile ext/jpeg/Makefile ext/ladspa/Makefile ext/lame/Makefile +ext/ivorbis/Makefile ext/lcs/Makefile ext/libfame/Makefile ext/libpng/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 6816c7de..4514d888 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -274,7 +274,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \ $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ $(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \ - $(IVORBIS_DIR) $(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR) + $(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR) DIST_SUBDIRS=\ a52dec aalib alsa \ diff --git a/ext/arts/Makefile.am b/ext/arts/Makefile.am index 782bc637..1e6922a6 100644 --- a/ext/arts/Makefile.am +++ b/ext/arts/Makefile.am @@ -10,7 +10,7 @@ gst_artsio_impl.lo: gst_artsio.cc if USE_ARTS SUFFIXES = .idl .idl.cc: - mcopidl -t $< $(ARTS_CXXFLAGS) + mcopidl -t $(ARTS_CXXFLAGS) $< # mcopidl Extension Expansion Technology clean up CLEANFILES = gst_artsio.h gst_artsio.cc gst_artsio.mcopclass gst_artsio.mcoptype diff --git a/gst-libs/ext/ffmpeg/Makefile.am b/gst-libs/ext/ffmpeg/Makefile.am index 079fa13d..a03d2795 100644 --- a/gst-libs/ext/ffmpeg/Makefile.am +++ b/gst-libs/ext/ffmpeg/Makefile.am @@ -75,7 +75,7 @@ checkout: # on running make install, make sure make has been run first install: - cd ffmpeg && make + cd ffmpeg && $(MAKE) # we don't install stuff so no need to uninstall uninstall: diff --git a/m4/gst-ivorbis.m4 b/m4/gst-ivorbis.m4 new file mode 100644 index 00000000..9acbe291 --- /dev/null +++ b/m4/gst-ivorbis.m4 @@ -0,0 +1,73 @@ +# Configure paths for Tremor + +dnl XIPH_PATH_IVORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for libivorbis, and define IVORBIS_CFLAGS and IVORBIS_LIBS +dnl +AC_DEFUN(XIPH_PATH_IVORBIS, +[dnl +dnl Get the cflags and libraries +dnl +AC_ARG_WITH(ivorbis,[ --with-ivorbis=PFX Prefix where libivorbis is installed (optional)], ivorbis_prefix="$withval", ivorbis_prefix="") +AC_ARG_WITH(ivorbis-libraries,[ --with-ivorbis-libraries=DIR Directory where libivorbis library is installed (optional)], ivorbis_libraries="$withval", ivorbis_libraries="") +AC_ARG_WITH(ivorbis-includes,[ --with-ivorbis-includes=DIR Directory where libivorbis header files are installed (optional)], ivorbis_includes="$withval", ivorbis_includes="") +AC_ARG_ENABLE(ivorbistest, [ --disable-ivorbistest Do not try to compile and run a test Ivorbis program],, enable_ivorbistest=yes) + + if test "x$ivorbis_libraries" != "x" ; then + IVORBIS_LIBS="-L$ivorbis_libraries" + elif test "x$ivorbis_prefix" != "x" ; then + IVORBIS_LIBS="-L$ivorbis_prefix/lib" + elif test "x$prefix" != "xNONE"; then + IVORBIS_LIBS="-L$prefix/lib" + fi + + IVORBIS_LIBS="$IVORBIS_LIBS -lvorbisidec -lm" + + if test "x$ivorbis_includes" != "x" ; then + IVORBIS_CFLAGS="-I$ivorbis_includes" + elif test "x$ivorbis_prefix" != "x" ; then + IVORBIS_CFLAGS="-I$ivorbis_prefix/include" + elif test "x$prefix" != "xNONE"; then + IVORBIS_CFLAGS="-I$prefix/include" + fi + + AC_MSG_CHECKING(for Tremor) + no_ivorbis="" + + if test "x$enable_ivorbistest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $IVORBIS_CFLAGS $OGG_CFLAGS" + LIBS="$LIBS $IVORBIS_LIBS $OGG_LIBS" +dnl +dnl Now check if the installed Tremor is sufficiently new. +dnl + rm -f conf.ivorbistest + AC_TRY_COMPILE([ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <tremor/codec.h> + +int main () +{ +} + +],, no_ivorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_ivorbis" = "x" ; then + AC_MSG_RESULT(yes) + ifelse([$1], , :, [$1]) + else + AC_MSG_RESULT(no) + IVORBIS_CFLAGS="" + IVORBIS_LIBS="" + IVORBISFILE_LIBS="" + ifelse([$2], , :, [$2]) + fi + AC_SUBST(IVORBIS_CFLAGS) + AC_SUBST(IVORBIS_LIBS) + AC_SUBST(IVORBISFILE_LIBS) +]) diff --git a/m4/lrint.m4 b/m4/lrint.m4 index c60665ce..7d72c73f 100644 --- a/m4/lrint.m4 +++ b/m4/lrint.m4 @@ -13,7 +13,7 @@ dnl AC_DEFUN([AC_C99_FUNC_LRINT], [AC_CACHE_CHECK(for lrint, ac_cv_c99_lrint, -[AC_TRY_COMPILE([ +[AC_TRY_LINK([ #define _ISOC9X_SOURCE 1 #define _ISOC99_SOURCE 1 #define __USE_ISOC99 1 diff --git a/m4/lrintf.m4 b/m4/lrintf.m4 index 4ea74b58..f9b76e36 100644 --- a/m4/lrintf.m4 +++ b/m4/lrintf.m4 @@ -13,7 +13,7 @@ dnl AC_DEFUN([AC_C99_FUNC_LRINTF], [AC_CACHE_CHECK(for lrintf, ac_cv_c99_lrintf, -[AC_TRY_COMPILE([ +[AC_TRY_LINK([ #define _ISOC9X_SOURCE 1 #define _ISOC99_SOURCE 1 #define __USE_ISOC99 1 |