Updating branch refs/heads/master
to bb2e9dd619e86d77c079cf0a3a007d142db2128b (commit)
from 97c6c8a08da90be0dc16dfe1427a343169205c57 (commit)
commit bb2e9dd619e86d77c079cf0a3a007d142db2128b
Author: Olivier Fourdan <[email protected]>
Date: Tue Feb 23 09:11:47 2010 +0100
Add linkage to libm when compositor is used (bug #6231)
configure.ac.in | 5 +++++
src/Makefile.am | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 047037f..36cd027 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -164,6 +164,7 @@ dnl Xcomposite and related extensions
dnl
compositor="no"
ENABLE_COMPOSITOR=""
+MATH_LIBS=""
AC_ARG_ENABLE([compositor],
AC_HELP_STRING([--enable-compositor], [enable compositor in xfwm4 (default)])
AC_HELP_STRING([--disable-compositor], [disable compositor in xfwm4]),
@@ -175,10 +176,14 @@ if test x"$enable_compositor" = x"yes"; then
PKG_CHECK_MODULES(COMPOSITOR, xcomposite >= [xcomposite_minimum_version]
xfixes xdamage)
AC_DEFINE([HAVE_COMPOSITOR], [1], [Define to enable compositor])
ENABLE_COMPOSITOR="--enable-compositor"
+ AC_DEFINE([HAVE_COMPOSITOR], [1], [Define to enable compositor])
compositor="yes"
+ dnl Math lib is required for compositor internals
+ MATH_LIBS=" -lm"
fi
fi
fi
+AC_SUBST([MATH_LIBS])
AC_SUBST(ENABLE_COMPOSITOR)
dnl
diff --git a/src/Makefile.am b/src/Makefile.am
index d64e50c..cc3cb36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,7 +107,8 @@ xfwm4_LDADD =
\
$(LIBSTARTUP_NOTIFICATION_LIBS) \
$(RENDER_LIBS) \
$(COMPOSITOR_LIBS) \
- $(RANDR_LIBS)
+ $(RANDR_LIBS) \
+ $(MATH_LIBS)
EXTRA_DIST = \
inline-default-icon.h default_icon.png default_icon.svg \
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
