summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2003-01-11 18:09:12 +0000
committerHavoc Pennington <hp@src.gnome.org>2003-01-11 18:09:12 +0000
commit339a86150b1d777ef3ba61e642ba0a603fe22218 (patch)
tree44d7d660bd06509169aca40309fee99bbd2861db
parent374e5d400d0f7785c9fa84e5fcee4f0874442bca (diff)
downloadmetacity-339a86150b1d777ef3ba61e642ba0a603fe22218.tar.gz
metacity-339a86150b1d777ef3ba61e642ba0a603fe22218.tar.bz2
add ability to --disable-shape
2003-01-11 Havoc Pennington <hp@pobox.com> * configure.in: add ability to --disable-shape
-rw-r--r--ChangeLog4
-rw-r--r--configure.in13
-rw-r--r--src/frames.c2
3 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fa17e61..ad6fb56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-11 Havoc Pennington <hp@pobox.com>
+
+ * configure.in: add ability to --disable-shape
+
2003-01-11 Akira TAGOH <tagoh@gnome.gr.jp>
* configure.in: fix the behavior of --enable-*.
diff --git a/configure.in b/configure.in
index e7f40ce..72e5736 100644
--- a/configure.in
+++ b/configure.in
@@ -111,6 +111,8 @@ AC_ARG_ENABLE(startup-notification, [ --disable-startup-notification
AC_ARG_ENABLE(xsync, [ --disable-xsync disable metacity's use of the XSync extension],,enable_xsync=auto)
+AC_ARG_ENABLE(shape, [ --disable-shape disable metacity's use of the shaped window extension],,enable_shape=auto)
+
## try definining HAVE_BACKTRACE
AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
@@ -218,6 +220,17 @@ AC_CHECK_LIB(Xext, XShapeQueryExtension,
SHAPE_LIBS=-lXext found_shape=yes)],
, $ALL_X_LIBS)
+if test x$enable_shape = xno; then
+ found_shape=no
+fi
+
+if test x$enable_shape = xyes; then
+ if test "$found_shape" = "no"; then
+ AC_MSG_ERROR([--enable-shape forced and Shape not found])
+ exit 1
+ fi
+fi
+
if test "x$found_shape" = "xyes"; then
AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library])
fi
diff --git a/src/frames.c b/src/frames.c
index 5fcd3ec..7e9d2d3 100644
--- a/src/frames.c
+++ b/src/frames.c
@@ -919,7 +919,7 @@ meta_frames_apply_shapes (MetaFrames *frames,
frame->shape_applied = TRUE;
XDestroyRegion (window_xregion);
-#endif
+#endif /* HAVE_SHAPE */
}
void