diff options
| author | Alon Levy <alevy@redhat.com> | 2011-01-05 15:02:30 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2011-01-19 14:40:03 +0100 |
| commit | fafda4f588157c5ac7759e9455d0362a03bcac2c (patch) | |
| tree | fd5e13838101b21a337a0ac1765746c8430ba4cb | |
| parent | d51e213eab8c2a65525557f9ab0cf3a13ae196d5 (diff) | |
| download | spice-fafda4f588157c5ac7759e9455d0362a03bcac2c.tar.gz spice-fafda4f588157c5ac7759e9455d0362a03bcac2c.tar.xz spice-fafda4f588157c5ac7759e9455d0362a03bcac2c.zip | |
client: CEGUI: search for CEGUI-0.6 to work in F15 (rawhide)
| -rw-r--r-- | client/x11/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 19 |
2 files changed, 16 insertions, 5 deletions
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am index 42b8b0ab..7504833c 100644 --- a/client/x11/Makefile.am +++ b/client/x11/Makefile.am @@ -25,6 +25,7 @@ INCLUDES = \ $(XFIXES_CFLAGS) \ $(MISC_X_CFLAGS) \ $(CEGUI_CFLAGS) \ + $(CEGUI06_CFLAGS) \ $(WARN_CFLAGS) \ $(SPICE_NONPKGCONFIG_CFLAGS) \ $(SMARTCARD_CFLAGS) \ @@ -206,6 +207,7 @@ spicec_LDFLAGS = \ $(CELT051_LIBS) \ $(SSL_LIBS) \ $(CEGUI_LIBS) \ + $(CEGUI06_LIBS) \ $(JPEG_LIBS) \ $(Z_LIBS) \ $(SMARTCARD_LIBS) \ diff --git a/configure.ac b/configure.ac index ed0d989c..f9e85be9 100644 --- a/configure.ac +++ b/configure.ac @@ -163,11 +163,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 |