aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2008-03-07 00:03:32 +0000
committerRobert Bragg <robert@linux.intel.com>2008-03-07 00:03:32 +0000
commit044b326f965c762df32a32cf767c060027fa0e9b (patch)
tree7c6e6b8da6d19fba16ceab9fad455dd52c7fcc61 /configure.ac
parent6d33b35918803befd4a14849d8fb0b91631a3379 (diff)
downloadlibmatchboxwm2-044b326f965c762df32a32cf767c060027fa0e9b.tar.gz
libmatchboxwm2-044b326f965c762df32a32cf767c060027fa0e9b.tar.bz2
libmatchboxwm2-044b326f965c762df32a32cf767c060027fa0e9b.zip
2008-03-06 Robert Bragg <bob@o-hand.com>
* configure.ac * doc/MBWM2-Overview.xml * matchbox/core/mb-wm-types.h * matchbox/mb-wm-config.h.in * matchbox/theme-engines/Makefile.am * matchbox/theme-engines/mb-wm-theme-cairo.c * matchbox/theme-engines/mb-wm-theme-cairo.h * matchbox/theme-engines/mb-wm-theme.c * matchbox/theme-engines/mb-wm-theme.h Removes all references to the cairo theme engine
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac20
1 files changed, 3 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index 93b53bd..9283612 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,9 +38,6 @@ AC_CHECK_FUNCS([memset strdup strncasecmp])
needed_pkgs="x11 "
-AC_ARG_ENABLE(cairo-theme,
- [ --enable-cairo-theme Disable Cairo graphics rendering support],
- [use_cairo=$enableval], [use_cairo=no])
AC_ARG_ENABLE(png-theme,
[ --enable-png-theme Enable PNG-based theme],
@@ -79,9 +76,6 @@ AC_ARG_ENABLE(matchbox-remote,
[ --enable-matchbox-remote Enable matchbox remote control utility],
[matchbox_remote=$enableval], [matchbox_remote=no])
-if test "x$use_cairo" = "xyes"; then
- needed_pkgs="$needed_pkgs pangocairo "
-fi
if test "x$use_pango" = "xyes"; then
needed_pkgs="$needed_pkgs pangoxft "
@@ -124,13 +118,6 @@ PKG_CHECK_MODULES(MBWM, $needed_pkgs)
MBWM2_PKGREQUIRES="$needed_pkgs"
AC_SUBST(MBWM2_PKGREQUIRES)
-USE_CAIRO=0
-AM_CONDITIONAL(THEME_CAIRO, [test "x$use_cairo" = "xyes"])
-if test "$use_cairo" = yes; then
- USE_CAIRO=1
-fi
-AC_SUBST(USE_CAIRO)
-
USE_PANGO=0
if test "$use_pango" = yes; then
USE_PANGO=1
@@ -145,10 +132,10 @@ if test "$png_theme" = yes; then
fi
AC_SUBST(THEME_PNG)
-# only build simple theme if cairo theme disabled
+# only build simple theme if png theme disabled
THEME_SIMPLE=0
-AM_CONDITIONAL(THEME_SIMPLE, [test "x$use_cairo" != "xyes"])
-if test "$use_cairo" != yes; then
+AM_CONDITIONAL(THEME_SIMPLE, [test "x$use_png" != "xyes"])
+if test "$use_png" != yes; then
THEME_SIMPLE=1
fi
AC_SUBST(THEME_SIMPLE)
@@ -279,7 +266,6 @@ echo "
Xcursor : ${have_xcursor}
Themes:
- Cairo theme : ${use_cairo}
PNG theme : ${png_theme}
GTK integration : ${use_gtk}
Pango integration : ${use_pango}