diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-10-08 21:52:09 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-10-08 21:52:09 +0000 |
| commit | 91c75489c506bc8791c9c55bdc6c9efd67c58384 (patch) | |
| tree | a4abe1b3bb8fdbd83d7a9a4d9d2464ed026945cc | |
| parent | 23c8426b42bb057c82a513c2f46c432a66feb75d (diff) | |
| download | xine-lib-91c75489c506bc8791c9c55bdc6c9efd67c58384.tar.gz xine-lib-91c75489c506bc8791c9c55bdc6c9efd67c58384.tar.bz2 | |
Fixed ogg/vorbis stuff (don't link vorbis plusgin to libogg, etc...). Clean
up the ogg/vorbis check (overriding $LIBS is gone now).
CVS patchset: 771
CVS date: 2001/10/08 21:52:09
| -rw-r--r-- | m4/_xine.m4 | 17 | ||||
| -rw-r--r-- | src/demuxers/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libvorbis/Makefile.am | 4 |
3 files changed, 10 insertions, 15 deletions
diff --git a/m4/_xine.m4 b/m4/_xine.m4 index a738fd732..5f8708f60 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -3,27 +3,22 @@ dnl Check for divx4. dnl AC_CHECK_DIVX4([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]) AC_DEFUN([AC_CHECK_DIVX4], [ - ac_save_LIBS="$LIBS" - - DIVX4_LIBS="$DIVX4_LIBS -lstdc++" - LIBS="$DIVX4_LIBS" AC_CHECK_HEADER(decore.h, [ no_divx4=no; - AC_CHECK_LIB(divxdecore, decore, no_divx4=no, no_divx4=yes) ] - , no_divx4=yes) + AC_CHECK_LIB(divxdecore, decore, + [ no_divx4=no; DIVX4_LIBS="$DIVX4_LIBS -ldivxdecore" ], + no_divx4=yes) + ], no_divx4=yes) - LIBS="$ac_save_LIBS" + AC_SUBST(DIVX4_LIBS) if test x"$no_divx4" = "xno" ; then - DIVX4_LIBS="$DIVX4_LIBS -ldivxdecore" - AC_SUBST(DIVX4_LIBS) ifelse([$1], , :, [$1]) else - DIVX4_LIBS="" - AC_SUBST(DIVX4_LIBS) ifelse([$2], , :, [$2]) fi + ]) dnl diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index 4de7bbfd6..8ff778bde 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -1,4 +1,4 @@ -CFLAGS = @GLOBAL_CFLAGS@ +CFLAGS = @GLOBAL_CFLAGS@ @OGG_CFLAGS@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic @@ -21,7 +21,7 @@ lib_LTLIBRARIES = $(ogg_module) xineplug_dmx_avi.la \ xineplug_dmx_qt.la xineplug_dmx_ogg_la_SOURCES = demux_ogg.c -xineplug_dmx_ogg_la_LIBADD = -logg +xineplug_dmx_ogg_la_LIBADD = @OGG_LIBS@ xineplug_dmx_ogg_la_LDFLAGS = -avoid-version -module xineplug_dmx_avi_la_SOURCES = demux_avi.c diff --git a/src/libvorbis/Makefile.am b/src/libvorbis/Makefile.am index 286a1befa..5a581756f 100644 --- a/src/libvorbis/Makefile.am +++ b/src/libvorbis/Makefile.am @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in ## -CFLAGS = @GLOBAL_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ +CFLAGS = @GLOBAL_CFLAGS@ @VORBIS_CFLAGS@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic @@ -15,7 +15,7 @@ endif lib_LTLIBRARIES = $(vorbis_module) xineplug_decode_vorbis_la_SOURCES = xine_decoder.c -xineplug_decode_vorbis_la_LIBADD = @OGG_LIBS@ @VORBIS_LIBS@ +xineplug_decode_vorbis_la_LIBADD = @VORBIS_LIBS@ xineplug_decode_vorbis_la_LDFLAGS = -avoid-version -module |