Commit 4991290b authored by Josh Coalson's avatar Josh Coalson
Browse files

check for ogg using AM_PATH_OGG from ogg.m4

parent 90dff44b
...@@ -93,9 +93,7 @@ if test x$use_3dnow = xtrue ; then ...@@ -93,9 +93,7 @@ if test x$use_3dnow = xtrue ; then
AC_DEFINE(FLAC__USE_3DNOW) AC_DEFINE(FLAC__USE_3DNOW)
fi fi
AC_CHECK_LIB(ogg, ogg_stream_init, AM_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built]))
[LIBS="$LIBS -logg"; have_ogg=yes],
[AC_MSG_WARN([*** Ogg development enviroment not installed - ogg support will not be built])])
AM_CONDITIONAL(FLaC__HAS_OGG, [test x$have_ogg = xyes]) AM_CONDITIONAL(FLaC__HAS_OGG, [test x$have_ogg = xyes])
if test x$have_ogg = xyes ; then if test x$have_ogg = xyes ; then
AC_DEFINE(FLAC__HAS_OGG) AC_DEFINE(FLAC__HAS_OGG)
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = flac bin_PROGRAMS = flac
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@ @OGG_CFLAGS@
flac_SOURCES = \ flac_SOURCES = \
analyze.c \ analyze.c \
...@@ -29,4 +29,4 @@ flac_SOURCES = \ ...@@ -29,4 +29,4 @@ flac_SOURCES = \
encode.h \ encode.h \
file.h file.h
flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ -lm
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