summaryrefslogtreecommitdiff
blob: ef3437472febb65dd8bec6b0d8084cec1e1d4bab (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
--- configure.ac.orig	2008-11-28 13:16:29.372873219 -0800
+++ configure.ac	2008-11-28 13:15:20.523374056 -0800
@@ -52,6 +52,7 @@
 dnl Check for SDL
 AC_ARG_WITH([sdl], [  --without-sdl           do not use SDL])
 AC_ARG_WITH([gl], [  --without-gl            do not use GL])
+AC_ARG_WITH([mixer-sdl], [  --without-mixer-sdl            do not use SDL_Mixer])
 AC_ARG_ENABLE([linked-engine], [  --enable-linked-engine  statically link with `dreamer' engine], [enable_linked_engine=yes])
 
 AC_DEFUN([AC_CHECK_SDL_HEADER],
@@ -191,6 +192,7 @@
 	with_ui_sdl="no"
 fi
 
+if test x"$with_mixer_sdl" = xyes; then
 AC_CHECK_SDL_HEADER([SDL_mixer.h], [have_sdl_mixer_h="yes"],
 	[have_sdl_mixer_h="no"]
 	)
@@ -205,6 +207,7 @@
 	x"$have_sdl" = xyes -a \
 	x"$have_sdl_mixer" = xyes; then supported_mixer_sdl="yes"
 else supported_mixer_sdl="no"
+	AC_MSG_ERROR([SDL_Mixer was not found, please check your SDL installation.])
 fi
 
 if test x"$supported_mixer_sdl" = xno; then
@@ -214,6 +217,7 @@
 else
 	with_mixer_sdl="yes"
 fi
+fi
 
 AC_DEFUN([AC_PRINT_LIB],
 	if test x"$2" = xyes; then
@@ -293,7 +297,6 @@
 fi
 
 AC_CHECK_HEADER([mxml.h], [], [AC_MSG_ERROR([Cannot find Mini-XML header file.])])
-AC_CHECK_LIB(mxml, mxmlLoadFile, [], [AC_MSG_ERROR([Cannot find Mini-XML library.])])
 
 AM_CONDITIONAL(BEOS_RC, test x"$beos_rc" = x"yes")
 AC_SUBST(DREAMCHESS_LIBS)