client: CEGUI: search for CEGUI-0.6 to work in F15 (rawhide)

This commit is contained in:
Alon Levy 2011-01-05 15:02:30 +02:00 committed by Hans de Goede
parent 6ba68ee566
commit faae857c08
2 changed files with 16 additions and 5 deletions

View File

@ -25,6 +25,7 @@ INCLUDES = \
$(XFIXES_CFLAGS) \
$(MISC_X_CFLAGS) \
$(CEGUI_CFLAGS) \
$(CEGUI06_CFLAGS) \
$(WARN_CFLAGS) \
$(SPICE_NONPKGCONFIG_CFLAGS) \
$(NULL)
@ -198,6 +199,7 @@ spicec_LDFLAGS = \
$(CELT051_LIBS) \
$(SSL_LIBS) \
$(CEGUI_LIBS) \
$(CEGUI06_LIBS) \
$(JPEG_LIBS) \
$(Z_LIBS) \
$(SPICE_NONPKGCONFIG_LIBS)

View File

@ -153,11 +153,20 @@ AC_DEFINE_UNQUOTED(POSIX_YIELD_FUNC,$posix_yield_func,[The POSIX RT yield functi
SPICE_REQUIRES=""
if test "x$use_gui" = "xyes"; then
PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.6.0 CEGUI < 0.7.0)
AC_SUBST(CEGUI_CFLAGS)
AC_SUBST(CEGUI_LIBS)
SPICE_REQUIRES+=" CEGUI"
CEGUI_CFLAGS+="-DUSE_GUI"
PKG_CHECK_MODULES(CEGUI06, CEGUI-0.6 >= 0.6.0 CEGUI-0.6 < 0.7.0,
[
AC_SUBST(CEGUI06_CFLAGS)
AC_SUBST(CEGUI06_LIBS)
SPICE_REQUIRES+=" CEGUI-0.6"
CEGUI06_CFLAGS+="-DUSE_GUI"
],
[
PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.6.0 CEGUI < 0.7.0)
AC_SUBST(CEGUI_CFLAGS)
AC_SUBST(CEGUI_LIBS)
SPICE_REQUIRES+=" CEGUI"
CEGUI_CFLAGS+="-DUSE_GUI"
])
fi
if test "x$have_tunnel" = "xyes"; then