]>
Commit | Line | Data |
---|---|---|
53c8b2f0 | 1 | --- CEGUI-0.7.1/acinclude.m4~ 2009-10-10 15:07:33.000000000 +0200 |
2 | +++ CEGUI-0.7.1/acinclude.m4 2010-05-10 14:15:47.593526472 +0200 | |
851bbaf9 JB |
3 | @@ -67,9 +67,6 @@ |
4 | cegui_found_tinyxml=no | |
5 | fi | |
ae5409c5 JB |
6 | |
7 | - dnl save lots of linker aggro ;) | |
8 | - LIBS="$xerces_LIBS $LIBS" | |
9 | - | |
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]) | |
53c8b2f0 | 13 | @@ -251,8 +248,8 @@ |
14 | if test "x$prefix" != xNONE ; then | |
15 | PATH="$prefix/bin:$prefix/usr/bin:$PATH" | |
16 | fi | |
17 | - AC_PATH_PROG(cegui_corona_config, corona-config, no, [PATH]) | |
18 | - AC_MSG_CHECKING([for corona - version >= 1.2.0]) | |
19 | + AC_PATH_PROG(cegui_corona_config, corona-config, no, [$PATH]) | |
20 | + AC_MSG_CHECKING([for corona - version >= 1.2.0]) | |
21 | cegui_with_corona=no | |
22 | if test "$cegui_corona_config" = "no" ; then | |
23 | cegui_with_corona=no | |
24 | @@ -570,7 +567,7 @@ | |
851bbaf9 JB |
25 | ;; |
26 | * ) | |
27 | AC_PATH_XTRA | |
28 | - LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" | |
53c8b2f0 | 29 | + LIBS="$X_LIBS $X_EXTRA_LIBS" |
851bbaf9 JB |
30 | |
31 | AC_SEARCH_LIBS(glInterleavedArrays, MesaGL GL, cegui_found_lib_GL=yes, cegui_found_lib_GL=no) | |
32 | AC_SEARCH_LIBS(gluOrtho2D, MesaGLU GLU, cegui_found_lib_GLU=yes, cegui_found_lib_GLU=no) | |
53c8b2f0 | 33 | @@ -732,7 +729,7 @@ |
851bbaf9 JB |
34 | |
35 | dnl If that did not work, try again with an alternate name for the packages (as used on (K)Ubuntu etc) | |
36 | if test x$cegui_found_lua = xno; then | |
37 | - PKG_CHECK_MODULES(Lua, lua5.1, | |
38 | + PKG_CHECK_MODULES(Lua, lua51, | |
39 | [cegui_found_lua=yes; Lua_CFLAGS="$Lua_CFLAGS -DCEGUI_LUA_VER=51"], | |
53c8b2f0 | 40 | [cegui_found_lua=no]) |
41 | fi |