diff options
| author | Havoc Pennington <hp@pobox.com> | 2003-01-11 18:09:12 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2003-01-11 18:09:12 +0000 |
| commit | 339a86150b1d777ef3ba61e642ba0a603fe22218 (patch) | |
| tree | 44d7d660bd06509169aca40309fee99bbd2861db | |
| parent | 374e5d400d0f7785c9fa84e5fcee4f0874442bca (diff) | |
| download | metacity-339a86150b1d777ef3ba61e642ba0a603fe22218.tar.gz | |
add ability to --disable-shape
2003-01-11 Havoc Pennington <hp@pobox.com>
* configure.in: add ability to --disable-shape
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | src/frames.c | 2 |
3 files changed, 18 insertions, 1 deletions
@@ -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 e7f40ce6..72e57369 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 5fcd3ec6..7e9d2d3e 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 |