add ability to --disable-shape

2003-01-11  Havoc Pennington  <hp@pobox.com>

	* configure.in: add ability to --disable-shape
This commit is contained in:
Havoc Pennington 2003-01-11 18:09:12 +00:00 committed by Havoc Pennington
parent 374e5d400d
commit 339a86150b
3 changed files with 18 additions and 1 deletions

View File

@ -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> 2003-01-11 Akira TAGOH <tagoh@gnome.gr.jp>
* configure.in: fix the behavior of --enable-*. * configure.in: fix the behavior of --enable-*.

View File

@ -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(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 ## try definining HAVE_BACKTRACE
AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(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)], SHAPE_LIBS=-lXext found_shape=yes)],
, $ALL_X_LIBS) , $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 if test "x$found_shape" = "xyes"; then
AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library]) AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library])
fi fi

View File

@ -919,7 +919,7 @@ meta_frames_apply_shapes (MetaFrames *frames,
frame->shape_applied = TRUE; frame->shape_applied = TRUE;
XDestroyRegion (window_xregion); XDestroyRegion (window_xregion);
#endif #endif /* HAVE_SHAPE */
} }
void void