check for ogg using AM_PATH_OGG from ogg.m4
This commit is contained in:
parent
90dff44b56
commit
4991290bbb
@ -93,9 +93,7 @@ if test x$use_3dnow = xtrue ; then
|
||||
AC_DEFINE(FLAC__USE_3DNOW)
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB(ogg, ogg_stream_init,
|
||||
[LIBS="$LIBS -logg"; have_ogg=yes],
|
||||
[AC_MSG_WARN([*** Ogg development enviroment not installed - ogg support will not be built])])
|
||||
AM_PATH_OGG(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])
|
||||
if test x$have_ogg = xyes ; then
|
||||
AC_DEFINE(FLAC__HAS_OGG)
|
||||
|
@ -16,7 +16,7 @@
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
bin_PROGRAMS = flac
|
||||
CFLAGS = @CFLAGS@
|
||||
CFLAGS = @CFLAGS@ @OGG_CFLAGS@
|
||||
|
||||
flac_SOURCES = \
|
||||
analyze.c \
|
||||
@ -29,4 +29,4 @@ flac_SOURCES = \
|
||||
encode.h \
|
||||
file.h
|
||||
|
||||
flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm
|
||||
flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ -lm
|
||||
|
Loading…
Reference in New Issue
Block a user