From: Laszlo T. <ave...@us...> - 2007-02-26 19:20:53
|
Update of /cvsroot/gemrb/gemrb In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30667 Modified Files: acinclude.m4 configure.in Log Message: removed alut dependency from the makefiles Index: acinclude.m4 =================================================================== RCS file: /cvsroot/gemrb/gemrb/acinclude.m4,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** acinclude.m4 31 Oct 2006 21:21:15 -0000 1.15 --- acinclude.m4 26 Feb 2007 19:20:49 -0000 1.16 *************** *** 19,48 **** # $Header$ - AC_DEFUN([GEMRB_CHECK_ALUT],[ - AC_CHECK_LIB(openal, alutInit, - alut_in_openal=yes, - alut_in_openal=no, - $LIBPTHREAD) - - if test x$alut_in_openal = xno; then - AC_CHECK_LIB(alut, alutInit, - have_libalut=yes, - have_libalut=no, - $LIBPTHREAD -lopenal) - - if test x$have_libalut = xyes; then - OPENAL_LIBS="-lopenal -lalut" - AC_MSG_RESULT(You have openal and alut.) - else - AC_MSG_ERROR([*** You need OpenAL and possibly FreeAlut (www.openal.org) to compile GemRB]) - fi - else - OPENAL_LIBS="-lopenal" - AC_MSG_RESULT(You have openal w/o alut.) - fi - AC_SUBST(OPENAL_LIBS) - ]); - - ################################################### dnl Configure paths for SDL --- 19,22 ---- Index: configure.in =================================================================== RCS file: /cvsroot/gemrb/gemrb/configure.in,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** configure.in 17 Dec 2006 10:24:36 -0000 1.63 --- configure.in 26 Feb 2007 19:20:49 -0000 1.64 *************** *** 29,33 **** AC_PREREQ([2.57]) ! AC_INIT(gemrb, 0.2.7) AC_CONFIG_AUX_DIR([admin]) AC_CONFIG_SRCDIR([gemrb/]) --- 29,33 ---- AC_PREREQ([2.57]) ! AC_INIT(gemrb, 0.2.8) AC_CONFIG_AUX_DIR([admin]) AC_CONFIG_SRCDIR([gemrb/]) *************** *** 124,132 **** 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. --- 124,135 ---- dnl Check for OpenAL, fail if not found. + AC_CHECK_LIB([openal], [alGetError], [ $(which true) ], [AC_MSG_ERROR([ + *** You need OpenAL (www.openal.org) to compile GemRB + ])]) #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. |