diff options
| author | Alon Levy <alevy@redhat.com> | 2011-01-05 15:02:30 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-01-05 15:02:56 +0200 |
| commit | 64c330793eb9e00faa79acb5a58eab2e592283d6 (patch) | |
| tree | d15f0ce8e17b08adcb8d94839141ac704ff170a3 | |
| parent | 9f93db6f0732e1e8e9bc8690c1a080d2e6013d68 (diff) | |
| download | spice-64c330793eb9e00faa79acb5a58eab2e592283d6.tar.gz spice-64c330793eb9e00faa79acb5a58eab2e592283d6.tar.xz spice-64c330793eb9e00faa79acb5a58eab2e592283d6.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 511d94e3..e6ca48d5 100644 --- a/configure.ac +++ b/configure.ac @@ -167,11 +167,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 |