1 files changed, 137 insertions, 2 deletions

diff --git a/configure.in b/configure.in
index 14f1993..6a9aba1 100644
--- a/configure.in
+++ b/configure.in
@@ -2,6 +2,16 @@ dnl Initialize autoconf and automake
 AC_INIT(src/main.cc)
 AC_PREREQ(2.52)
 AM_INIT_AUTOMAKE(fluxbox,1.3.2, no-define)
+LT_INIT
+
+dnl Force autoconf to not set CFLAGS and CXXFLAGS.
+if test "x$CFLAGS" = "x"; then
+  ${CFLAGS=""}
+fi
+
+if test "x$CXXFLAGS" = "x"; then
+  ${CXXFLAGS=""}
+fi
 
 dnl Determine default prefix
 test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@ -296,13 +306,13 @@ AC_ARG_ENABLE(
 AM_CONDITIONAL(NEWWMSPEC, test x$NEWWMSPEC = xtrue)
 
 dnl Check whether to include debugging code
-DEBUG=""
+DEBUG="-O2"
 AC_MSG_CHECKING([whether to include verbose debugging code])
 AC_ARG_ENABLE(debug,
   [  --enable-debug          include verbose debugging code ([default=no])],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
-    DEBUG="-DDEBUG -Wall"
+    DEBUG="-DDEBUG -Wall -g -O0"
   else
     AC_MSG_RESULT([no])
   fi,
@@ -624,6 +634,111 @@ else
 fi
 
 
+dnl Check for compositor features.
+
+enableval="yes"
+AC_MSG_CHECKING([whether fbcompose should be built])
+AC_ARG_ENABLE(fbcompose,
+  AC_HELP_STRING([--enable-fbcompose],
+                 [build the fluxbox compositor [default=yes]]), ,
+              [enableval=yes])
+if test "x$enableval" = "xyes"; then
+  AC_MSG_RESULT([yes])
+  BUILD_FBCOMPOSE=true
+else
+  AC_MSG_RESULT([no])
+  BUILD_FBCOMPOSE=false
+fi
+AM_CONDITIONAL(BUILD_FBCOMPOSE, test x$BUILD_FBCOMPOSE = xtrue)
+
+
+if test "x$BUILD_FBCOMPOSE" = "xtrue"; then
+  AC_CHECK_LIB([Xcomposite],[XCompositeRedirectSubwindows])
+  LDFLAGS="$LDFLAGS -export-dynamic"
+
+  AC_CHECK_HEADERS([ctime time.h], [break;], [AC_MSG_ERROR([Could not find neither ctime nor time.h headers.])])
+  AC_CHECK_HEADER([sys/time.h], , [AC_MSG_ERROR([Could not find sys/time.h header.])])
+fi
+
+
+enableval="yes"
+AC_MSG_CHECKING([whether to have XRender compositing support])
+AC_ARG_ENABLE(xrender-compositing,
+  AC_HELP_STRING([--enable-xrender-compositing],
+                 [XRender support for fbcompose [default=yes]]), ,
+              [enableval=yes])
+if test "x$enableval" = "xyes" -a "x$BUILD_FBCOMPOSE" = "xtrue"; then
+  AC_MSG_RESULT([yes])
+  AC_CHECK_LIB([dl], [dlopen],
+               [AC_DEFINE(HAVE_DL, [1], [Define to 1 if you have DL.])],
+               [AC_MSG_ERROR([Could not find DL library.])])
+  AC_CHECK_LIB([Xdamage], [XDamageCreate],
+               [AC_DEFINE(HAVE_XDAMAGE, [1], [Define to 1 if you have XDamage.])],
+               [AC_MSG_ERROR([Could not find X damage extension.])])
+  AC_CHECK_LIB([Xrender], [XRenderCreatePicture],
+               [AC_DEFINE(HAVE_XRENDER, [1], [Define to 1 if you have XRender.])],
+               [AC_MSG_ERROR([Could not find X render extension.])])
+  AC_CHECK_LIB([Xfixes], [XFixesCreateRegion],
+               [AC_DEFINE(HAVE_XFIXES,[1],[Define to 1 if you have XFixes.])],
+               [AC_MSG_ERROR([Could not find X fixes extension.])])
+  AC_CHECK_LIB([Xext], [XShapeCombineShape],
+               [AC_DEFINE(SHAPE,[1],[Define to 1 if you have SHAPE.])],
+               [AC_MSG_ERROR([Could not find X shape extension.])])
+  AC_DEFINE(USE_XRENDER_COMPOSITING, [1], [Define to 1 if you want XRender compositing.])
+  LIBS="$LIBS -ldl -lXext -lXdamage -lXrender -lXfixes"
+  XRENDER_COMPOSITING=true
+else
+  AC_MSG_RESULT([no])
+  XRENDER_COMPOSITING=false
+fi
+AM_CONDITIONAL(XRENDER_COMPOSITING, test x$XRENDER_COMPOSITING = xtrue)
+
+
+enableval="yes"
+AC_MSG_CHECKING([whether to have OpenGL compositing support])
+AC_ARG_ENABLE(opengl-compositing,
+  AC_HELP_STRING([--enable-opengl-compositing],
+                 [OpenGL support for fbcompose [default=yes]]), ,
+              [enableval=yes])
+if test "x$enableval" = "xyes" -a "x$BUILD_FBCOMPOSE" = "xtrue"; then
+  AC_MSG_RESULT([yes])
+  AC_CHECK_LIB([dl], [dlopen],
+               [AC_DEFINE(HAVE_DL, [1], [Define to 1 if you have DL.])],
+               [AC_MSG_ERROR([Could not find DL library.])])
+  AC_CHECK_LIB([GL], [glXMakeCurrent],
+               [AC_DEFINE(HAVE_GL, [1], [Define to 1 if you have GL.])],
+               [AC_MSG_ERROR([Could not find OpenGL/GLX.])])
+  AC_CHECK_LIB([GLEW], [glewInit],
+               [AC_DEFINE(HAVE_GLEW,[1],[Define to 1 if you have GLEW.])],
+               [AC_MSG_ERROR([Could not find GLEW.])])
+  AC_CHECK_LIB([Xdamage], [XDamageCreate],
+               [AC_DEFINE(HAVE_XDAMAGE, [1], [Define to 1 if you have XDamage.])],
+               [AC_MSG_ERROR([Could not find X damage extension.])])
+  AC_CHECK_LIB([Xrender], [XRenderCreatePicture],
+               [AC_DEFINE(HAVE_XRENDER, [1], [Define to 1 if you have XRender.])],
+               [AC_MSG_ERROR([Could not find X render extension.])])
+  AC_CHECK_LIB([Xfixes], [XFixesCreateRegion],
+               [AC_DEFINE(HAVE_XFIXES,[1],[Define to 1 if you have XFixes.])],
+               [AC_MSG_ERROR([Could not find X fixes extension.])])
+  AC_CHECK_LIB([Xext], [XShapeCombineShape],
+               [AC_DEFINE(SHAPE,[1],[Define to 1 if you have SHAPE.])],
+               [AC_MSG_ERROR([Could not find X shape extension.])])
+  AC_DEFINE(USE_OPENGL_COMPOSITING, [1], [Define to 1 if you want OpenGL compositing.])
+  LIBS="$LIBS -ldl -lXext -lXdamage -lGL -lGLEW -lXfixes"
+  OPENGL_COMPOSITING=true
+else
+  AC_MSG_RESULT([no])
+  OPENGL_COMPOSITING=false
+fi
+AM_CONDITIONAL(OPENGL_COMPOSITING, test x$OPENGL_COMPOSITING = xtrue)
+
+
+if test x$OPENGL_COMPOSITING = xfalse -a x$XRENDER_COMPOSITING = xfalse; then
+  AM_CONDITIONAL(SERVERAUTO_COMPOSITING_ONLY, true)
+  AC_DEFINE(SERVERAUTO_COMPOSITING_ONLY, [1], [Set to 1 only if both OPENGL_COMPOSITING and XRENDER_COMPOSITING are undefined or 0.])
+else
+  AM_CONDITIONAL(SERVERAUTO_COMPOSITING_ONLY, false)
+fi
 
 
 
@@ -695,6 +810,18 @@ AC_ARG_WITH(
 )
 AC_SUBST(LOCALE_PATH)
 
+AC_ARG_WITH(
+  fbcompose,
+  [  --with-fbcompose=path   location of fbcompose files (PREFIX/share/fluxbox/fbcompose)]
+  ,
+  FBCOMPOSE_PATH=$with_fbcompose
+  AC_DEFINE_UNQUOTED(FBCOMPOSE_PATH, "$FBCOMPOSE_PATH", "Location of fbcompose data")
+  ,
+  FBCOMPOSE_PATH=\$\(prefix\)/share/fluxbox/fbcompose
+  AC_DEFINE_UNQUOTED(FBCOMPOSE_PATH, "$prefix/share/fluxbox/fbcompose", "Location of fbcompose data"),
+)
+AC_SUBST(FBCOMPOSE_PATH)
+
 AC_SUBST(program_prefix)
 AC_SUBST(program_suffix)
 
@@ -713,6 +840,14 @@ src/Makefile
 src/FbTk/Makefile
 src/tests/Makefile
 util/Makefile
+util/fbcompose/Makefile
+util/fbcompose/plugins/Makefile
+util/fbcompose/plugins/opengl/Makefile
+util/fbcompose/plugins/opengl/fade/Makefile
+util/fbcompose/plugins/opengl/preview/Makefile
+util/fbcompose/plugins/xrender/Makefile
+util/fbcompose/plugins/xrender/fade/Makefile
+util/fbcompose/plugins/xrender/preview/Makefile
 util/fbrun/Makefile
 data/Makefile
 data/styles/Makefile