[Gemrb-commits] gemrb acinclude.m4,1.10,1.11 configure.in,1.52,1.53

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11596

Modified Files:
	acinclude.m4 configure.in 
Log Message:
Added wjp's patch to detect both openal library versions (alut/openal)


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/gemrb/gemrb/acinclude.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** acinclude.m4	14 Aug 2005 20:15:12 -0000	1.10
--- acinclude.m4	22 Oct 2005 20:56:05 -0000	1.11
***************
*** 32,35 ****
--- 32,56 ----
  dnl
  
+ AC_DEFUN([GEMRB_CHECK_ALUT],[
+ 	AC_CHECK_LIB(openal, alutInit,
+ 			     alut_in_openal=yes,
+ 			     alut_in_openal=no)
+ 
+ 	if test x$alut_in_openal = xno; then
+ 		AC_CHECK_LIB(alut, alutInit,
+ 				   have_libalut=yes,
+ 				   have_libalut=no)
+ 
+ 		if test x$have_libalut = xyes; then
+ 			OPENAL_LIBS="-lalut"
+ 		else
+ 			AC_MSG_ERROR([*** You need OpenAL (www.openal.org) to compile GemRB])
+ 		fi
+ 	else
+ 		OPENAL_LIBS="-lopenal"
+ 	fi
+ 	AC_SUBST(OPENAL_LIBS)
+ ]);
+ 
  AC_DEFUN([AM_PATH_SDL],
  [dnl 

Index: configure.in
===================================================================
RCS file: /cvsroot/gemrb/gemrb/configure.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** configure.in	14 Aug 2005 20:15:12 -0000	1.52
--- configure.in	22 Oct 2005 20:56:05 -0000	1.53
***************
*** 124,131 ****
  
  dnl Check for OpenAL, fail if not found.
! AC_CHECK_LIB([openal], [alutInit], [ $(which true) ], [AC_MSG_ERROR([
  
! *** You need OpenAL (www.openal.org) to compile GemRB
! ])])
  
  dnl Check for Python version >= 2.3.0, fail if not found.
--- 124,133 ----
  
  dnl Check for OpenAL, fail if not found.
! #AC_CHECK_LIB([alut], [alutInit], [ $(which true) ], [AC_MSG_ERROR([
  
! #*** You need OpenAL (www.openal.org) to compile GemRB
! #])])
! 
! GEMRB_CHECK_ALUT()
  
  dnl Check for Python version >= 2.3.0, fail if not found.