Commit dc54bd68 authored by conrad's avatar conrad

Applied patch from Erik de Castro Lopo. Now builds on MingGW:

	* add pkg-config check for Ogg
	* add vorbis and speex CFLAGS to various Makefile.am's


git-svn-id: http://svn.annodex.net/liboggz/trunk@601 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent 9402d450
...@@ -35,6 +35,8 @@ AC_TYPE_SIZE_T ...@@ -35,6 +35,8 @@ AC_TYPE_SIZE_T
AC_FUNC_REALLOC AC_FUNC_REALLOC
AC_CHECK_FUNCS([memmove random]) AC_CHECK_FUNCS([memmove random])
# Check for pkg-config
AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
# Check for doxygen # Check for doxygen
AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false) AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
...@@ -160,11 +162,18 @@ dnl Detect Ogg ...@@ -160,11 +162,18 @@ dnl Detect Ogg
dnl dnl
HAVE_OGG=no HAVE_OGG=no
XIPH_PATH_OGG(HAVE_OGG="yes", HAVE_OGG="no") if test "x$HAVE_PKG_CONFIG" = "xyes" ; then
if test "x$HAVE_OGG" = xno ; then PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no)
oggz_config_ok="no"
AC_CHECK_LIB(ogg, ogg_stream_init, HAVE_OGG="maybe")
fi fi
if test "x$HAVE_OGG" = "xno" ; then
XIPH_PATH_OGG(HAVE_OGG="yes", HAVE_OGG="no")
if test "x$HAVE_OGG" = xno ; then
oggz_config_ok="no"
AC_CHECK_LIB(ogg, ogg_stream_init, HAVE_OGG="maybe")
fi
fi
AM_CONDITIONAL(HAVE_OGG, [test "x$HAVE_OGG" = "xyes"]) AM_CONDITIONAL(HAVE_OGG, [test "x$HAVE_OGG" = "xyes"])
# Checks for header files. # Checks for header files.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
AM_CFLAGS = -Wall -pedantic -g AM_CFLAGS = -Wall -pedantic -g
INCLUDES = -I$(top_srcdir)/include INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
OGGZDIR = ../liboggz OGGZDIR = ../liboggz
OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@ OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
AM_CFLAGS = -Wall -pedantic AM_CFLAGS = -Wall -pedantic
INCLUDES = -I$(top_srcdir)/include INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
OGGZDIR = ../liboggz OGGZDIR = ../liboggz
OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@ OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@
......
...@@ -6,7 +6,7 @@ EXTRA_DIST = oggzdiff ...@@ -6,7 +6,7 @@ EXTRA_DIST = oggzdiff
bin_SCRIPTS = oggzdiff bin_SCRIPTS = oggzdiff
INCLUDES = -I$(top_srcdir)/include INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
OGGZDIR = ../liboggz OGGZDIR = ../liboggz
OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@ OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@
......
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