Commit 77466730 authored by Jack Moffitt's avatar Jack Moffitt
Browse files

Revamped teh vorbis-tools build system. I must have forgotten to do the

AM_PATH_OGG and AM_PATH_VORBIS fixes.  evreything builds except for
oggenc, which Michael needs to get using libvorbisenc

svn path=/trunk/vorbis-tools/; revision=982
parent 50fcd960
...@@ -221,10 +221,12 @@ AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile an ...@@ -221,10 +221,12 @@ AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile an
if test x$vorbis_prefix != x ; then if test x$vorbis_prefix != x ; then
vorbis_args="$vorbis_args --prefix=$vorbis_prefix" vorbis_args="$vorbis_args --prefix=$vorbis_prefix"
VORBIS_CFLAGS="-I$vorbis_prefix/include" VORBIS_CFLAGS="-I$vorbis_prefix/include"
VORBIS_LIBS="-L$vorbis_prefix/lib" VORBIS_LIBDIR="-L$vorbis_prefix/lib"
fi fi
VORBIS_LIBS="$VORBIS_LIBS -lvorbisfile -lvorbis -lm" VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm"
VORBISFILE_LIBS="-lvorbisfile"
VORBISENC_LIBS="-lvorbisenc"
AC_MSG_CHECKING(for Vorbis) AC_MSG_CHECKING(for Vorbis)
no_vorbis="" no_vorbis=""
...@@ -288,9 +290,13 @@ int main () ...@@ -288,9 +290,13 @@ int main ()
fi fi
VORBIS_CFLAGS="" VORBIS_CFLAGS=""
VORBIS_LIBS="" VORBIS_LIBS=""
VORBISFILE_LIBS=""
VORBISENC_LIBS=""
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
fi fi
AC_SUBST(VORBIS_CFLAGS) AC_SUBST(VORBIS_CFLAGS)
AC_SUBST(VORBIS_LIBS) AC_SUBST(VORBIS_LIBS)
AC_SUBST(VORBISFILE_LIBS)
AC_SUBST(VORBISENC_LIBS)
rm -f conf.vorbistest rm -f conf.vorbistest
]) ])
...@@ -48,18 +48,8 @@ dnl -------------------------------------------------- ...@@ -48,18 +48,8 @@ dnl --------------------------------------------------
dnl Check for libraries dnl Check for libraries
dnl -------------------------------------------------- dnl --------------------------------------------------
dnl Check for libogg AM_PATH_OGG(,AC_MSG_ERROR(Ogg needed!))
if test -n $with_ogg; then AM_PATH_VORBIS(,AC_MSG_ERROR(Vorbis needed!))
CFLAGS="$CFLAGS -I$with_ogg/include -L$with_ogg/lib"
fi
AC_CHECK_LIB(ogg, oggpack_read, LIBS="$LIBS -logg", AC_MSG_ERROR([You must have libogg to compile vorbis!!!]))
dnl Check for libvorbis
if test -n $with_vorbis; then
CFLAGS="$CFLAGS -I$with_vorbis/include -L$with_vorbis/lib"
fi
AC_CHECK_LIB(vorbis, vorbis_info_init, LIBS="$LIBS -lvorbis", AC_MSG_ERROR([You must have libvorbis to compile vorbis-tools!!!]))
AM_PATH_AO(0.5.0,,AC_MSG_ERROR(libao needed!)) AM_PATH_AO(0.5.0,,AC_MSG_ERROR(libao needed!))
dnl -------------------------------------------------- dnl --------------------------------------------------
......
...@@ -5,9 +5,9 @@ AUTOMAKE_OPTIONS = foreign ...@@ -5,9 +5,9 @@ AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = ogg123 bin_PROGRAMS = ogg123
man_MANS = ogg123.1 man_MANS = ogg123.1
INCLUDES = @AO_CFLAGS@ INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@
ogg123_LDFLAGS = -lvorbisfile @AO_LIBS@ ogg123_LDFLAGS = @OGG_LIBS@ @VORBIS_LIBS@ @VORBISFILE_LIBS@ @AO_LIBS@
ogg123_SOURCES = ogg123.c ogg123_SOURCES = ogg123.c
......
...@@ -6,6 +6,7 @@ SUBDIRS = man ...@@ -6,6 +6,7 @@ SUBDIRS = man
bin_PROGRAMS = oggenc bin_PROGRAMS = oggenc
oggenc_LDFLAGS = @VORBISENC_LIBS@
oggenc_SOURCES = oggenc.c audio.c encode.c oe_unix.c getopt.c getopt1.c\ oggenc_SOURCES = oggenc.c audio.c encode.c oe_unix.c getopt.c getopt1.c\
oe_win32.c\ oe_win32.c\
audio.h encode.h platform.h getopt.h audio.h encode.h platform.h getopt.h
......
...@@ -4,6 +4,9 @@ AUTOMAKE_OPTIONS = foreign ...@@ -4,6 +4,9 @@ AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = vorbiscomment bin_PROGRAMS = vorbiscomment
INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@
vorbiscomment_LDFLAGS = @OGG_LIBS@ @VORBIS_LIBS@
vorbiscomment_SOURCES = vorbiscomment.c vorbiscomment_SOURCES = vorbiscomment.c
debug: debug:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment