1 --- CEGUI-0.6.1/acinclude.m4.orig 2008-06-07 18:04:08.000000000 +0200
2 +++ CEGUI-0.6.1/acinclude.m4 2008-08-29 21:31:32.846436662 +0200
7 - dnl save lots of linker aggro ;)
8 - LIBS="$xerces_LIBS $LIBS"
10 dnl Find out what user disabled as far as parsers go
11 AC_ARG_ENABLE([xerces-c], AC_HELP_STRING([--disable-xerces-c], [Disables building of the Xerces-C++ XML parser module.]),
12 [cegui_with_xerces=$enableval], [cegui_with_xerces=yes])
17 - LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
18 + LIBS="$X_LIBS $X_EXTRA_LIBS"
20 AC_SEARCH_LIBS(glInterleavedArrays, MesaGL GL, cegui_found_lib_GL=yes, cegui_found_lib_GL=no)
21 AC_SEARCH_LIBS(gluOrtho2D, MesaGLU GLU, cegui_found_lib_GLU=yes, cegui_found_lib_GLU=no)
23 if test "x$prefix" != xNONE ; then
24 PATH="$prefix/bin:$prefix/usr/bin:$PATH"
26 - AC_PATH_PROG(cegui_corona_config, corona-config, no, [PATH])
27 + AC_PATH_PROG(cegui_corona_config, corona-config, no, [$PATH])
28 AC_MSG_CHECKING([for corona - version >= 1.2.0])
30 if test "$cegui_corona_config" = "no" ; then
33 dnl If that did not work, try again with an alternate name for the packages (as used on (K)Ubuntu etc)
34 if test x$cegui_found_lua = xno; then
35 - PKG_CHECK_MODULES(Lua, lua5.1,
36 + PKG_CHECK_MODULES(Lua, lua51,
37 [cegui_found_lua=yes; Lua_CFLAGS="$Lua_CFLAGS -DCEGUI_LUA_VER=51"],
38 [PKG_CHECK_MODULES(Lua, lua50,
39 [cegui_found_lua=yes; Lua_CFLAGS="$Lua_CFLAGS -DCEGUI_LUA_VER=50"],