X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=configure.ac;h=62c8716e6dd4082948c3b741f5164b88f097347a;hp=36ebf02cd35c00ac13dd394ffed2496ee571dde9;hb=HEAD;hpb=923a1c77954f93d107b54c39da7ff63d4f5ffadd

diff --git a/configure.ac b/configure.ac
index 36ebf02..62c8716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT(VoR, 0.5.5, jason@jasonwoof.com, vor)
+AC_INIT(VoR, 0.5.8, jason@jasonwoof.com, vor)
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
 
@@ -12,14 +12,15 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
 # Checks for libraries.
+PKG_CHECK_MODULES([SDL], [sdl >= 1.2])
+PKG_CHECK_MODULES([SDL_IMAGE], [SDL_image >= 1.2],,
+	[SDL_IMAGE_LIBS="-lSDL_image"]) # <-- else
+PKG_CHECK_MODULES([SDL_MIXER], [SDL_mixer >= 1.2],,
+	[SDL_MIXER_LIBS="-lSDL_mixer"]) # <-- else
+# Make sure SDL_image was compiled with png support
 AC_CHECK_LIB([SDL_image], [IMG_LoadPNG_RW])
-AC_CHECK_LIB([SDL_mixer], [Mix_OpenAudio])
-
-SDL_VERSION=1.2.0
-AM_PATH_SDL($SDL_VERSION,
-            :,
-            AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
-)
+# Make sure SDL_mixer was compiled with ogg vorbis support
+AC_CHECK_LIB([SDL_mixer], [Mix_InitOgg])
 
 # Checks for header files.
 AC_CHECK_HEADERS([inttypes.h stddef.h stdlib.h string.h unistd.h time.h])