nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move #define SHAPE to config.h instead of -DSHAPE on command line

Browse source
This commit is contained in:
Mark Tiefenbruck 2007-12-28 12:55:51 -08:00
parent 8e96ffb74b
commit e90c3678d9
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
configure.in
View file

@ -178,32 +178,23 @@ fi
Xext_lib="" Xext_lib=""
dnl Check for XShape extension support and proper library files. dnl Check for XShape extension support and proper library files.
SHAPE=""
AC_MSG_CHECKING([whether to build support for the XShape extension]) AC_MSG_CHECKING([whether to build support for the XShape extension])
AC_ARG_ENABLE( AC_ARG_ENABLE(
shape, [ --enable-shape enable support of the XShape extension ([default=yes])]) shape, [ --enable-shape enable support of the XShape extension ([default=yes])],
if test x$enableval = "xyes"; then
AC_MSG_RESULT([yes])
AC_CHECK_LIB(Xext, XShapeCombineShape,
AC_DEFINE(SHAPE, 1, "shaped window support")
LIBS="$LIBS -lXext")
else
AC_MSG_RESULT([no])
fi,
: ${enableval="yes"}
if test x$enableval = "xyes"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_CHECK_LIB(Xext, XShapeCombineShape, AC_CHECK_LIB(Xext, XShapeCombineShape,
AC_MSG_CHECKING([for X11/extensions/shape.h]) AC_DEFINE(SHAPE, 1, "shaped window support")
AC_TRY_LINK( LIBS="$LIBS -lXext")
#include <X11/Xlib.h> )
#include <X11/Xutil.h>
#include <X11/extensions/shape.h>
, long foo = ShapeSet,
AC_MSG_RESULT([yes])
SHAPE="-DSHAPE"; Xext_lib="-lXext",
AC_MSG_RESULT([no])
)
)
else
AC_MSG_RESULT([no])
fi
AC_SUBST(SHAPE)
CXXFLAGS="$CXXFLAGS $SHAPE"
LIBS="$LIBS $Xext_lib"
dnl Check for the Slit dnl Check for the Slit
AC_MSG_CHECKING([whether to include the Slit]) AC_MSG_CHECKING([whether to include the Slit])