Interface to libvorbis :)

git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@121 84d2e878-0bd5-11dd-ad15-13eda11d74c5

1 files changed, 22 insertions, 17 deletions

diff --git a/configure.ac b/configure.ac
index 7cbf67a..01b7e6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,34 +32,39 @@ if $PKG_CONFIG sdl ; then
         AC_MSG_RESULT([yes])
 else
         AC_MSG_RESULT([not found])
-        AC_MSG_ERROR([
-*** SDL not found.  Do you have 'libsdl-dev' or similar installed?])
+        AC_MSG_ERROR([*** SDL not found.  Do you have 'libsdl-dev' or similar installed?])
 fi
 
 AC_CHECK_LIB(GL, main, [OPENGL_CFLAGS=-I/usr/include/GL
-OPENGL_LIBS=-lGL],  AC_MSG_ERROR([
-*** OpenGL not found.  Do you have 'libgl-dev' or similar installed?]))
+OPENGL_LIBS=-lGL],  AC_MSG_ERROR([*** OpenGL not found.  Do you have 'libgl-dev' or similar installed?]))
 
-AC_CHECK_LIB(GLU, main, [GLU_LIBS=-lGLU],  AC_MSG_ERROR([
-*** GLU not found.  Do you have 'libglu-dev' or similar installed?]))
+AC_CHECK_LIB(GLU, main, [GLU_LIBS=-lGLU],  AC_MSG_ERROR([*** GLU not found.  Do you have 'libglu-dev' or similar installed?]))
 
-AC_CHECK_LIB(GLEW, main, [GLEW_LIBS=-lGLEW],  AC_MSG_ERROR([
-*** GLEW not found.  Do you have 'libglew-dev' or similar installed?]))
+AC_CHECK_LIB(GLEW, main, [GLEW_LIBS=-lGLEW],  AC_MSG_ERROR([*** GLEW not found.  Do you have 'libglew-dev' or similar installed?]))
 
 AC_MSG_CHECKING([libpng])
 if $PKG_CONFIG --atleast-version 1.2.0 libpng ; then
-        LIBPNG_VERSION=`$PKG_CONFIG --modversion libpng`
-        AC_MSG_RESULT($LIBPNG_VERSION)
-        LIBPNG_CFLAGS=`$PKG_CONFIG --cflags libpng`
-        LIBPNG_LIBS=`$PKG_CONFIG --libs libpng`
+	LIBPNG_VERSION=`$PKG_CONFIG --modversion libpng`
+	AC_MSG_RESULT($LIBPNG_VERSION)
+	LIBPNG_CFLAGS=`$PKG_CONFIG --cflags libpng`
+	LIBPNG_LIBS=`$PKG_CONFIG --libs libpng`
 else
-        AC_MSG_RESULT([Lower than 1.2.0 or not found])
-        AC_MSG_ERROR([
-*** libPNG not found.  Do you have 'libpng-dev' or similar installed?])
+	AC_MSG_RESULT([Lower than 1.2.0 or not found])
+	AC_MSG_ERROR([*** libPNG not found.  Do you have 'libpng-dev' or similar installed?])
 fi
 
-CFLAGS="$CFLAGS $LIBSDL_CFLAGS $OPENGL_CFLAGS $LIBPNG_CFLAGS"
-LIBS="$LIBS $LIBSDL_LIBS $OPENGL_LIBS $GLU_LIBS $GLEW_LIBS $LIBPNG_LIBS"
+AC_MSG_CHECKING([vorbisfile])
+if $PKG_CONFIG --exists vorbisfile ; then
+	VORBISFILE_CFLAGS=`$PKG_CONFIG --cflags vorbisfile`
+	VORBISFILE_LIBS=`$PKG_CONFIG --libs vorbisfile`
+	AC_MSG_RESULT([yes])
+else
+	AC_MSG_RESULT([no])
+	AC_MSG_ERROR([*** vorbisfile not found.  Do you have 'libvorbis-dev' or similar installed?])
+fi
+
+CFLAGS="$CFLAGS $LIBSDL_CFLAGS $OPENGL_CFLAGS $LIBPNG_CFLAGS $VORBISFILE_CFLAGS"
+LIBS="$LIBS $LIBSDL_LIBS $OPENGL_LIBS $GLU_LIBS $GLEW_LIBS $LIBPNG_LIBS $VORBISFILE_LIBS"
 
 AC_OUTPUT(Makefile src/Makefile data/Makefile)