[Xfce4-commits] <gtk-xfce-engine:master> Link against libm for floor() and ceil()

[Peter de Ridder]

Updating branch refs/heads/master
         to 8e816c51b4e405188b3d92f9580ce4142c7b05c6 (commit)
       from f624005960e8cfe24cbddd2c717a84e22f657227 (commit)

commit 8e816c51b4e405188b3d92f9580ce4142c7b05c6
Author: Lionel Le Folgoc <lionel at lefolgoc.net>
Date:   Sun Apr 8 17:45:18 2012 +0200

    Link against libm for floor() and ceil()

 configure.in.in     |    6 +++---
 gtk-2.0/Makefile.am |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 4aaa4f2..72934fb 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -56,6 +56,9 @@ dnl *** Check for required packages ***
 dnl ***********************************
 AM_PATH_GLIB_2_0([2.24.0])
 XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0])
+dnl libm is needed for floor() and ceil()
+AC_CHECK_LIBM
+AC_SUBST(LIBM)
 
 dnl ***********************************
 dnl *** Check for optional packages ***
@@ -75,9 +78,6 @@ then
   GTK3_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`
   AC_SUBST([GTK3_BINARY_VERSION])
   GTK_SUBDIRS="$GTK_SUBDIRS gtk-3.0"
-  dnl libm is needed for floor() and ceil()
-  AC_CHECK_LIBM
-  AC_SUBST(LIBM)
 fi
 AC_SUBST([GTK_SUBDIRS])
 
diff --git a/gtk-2.0/Makefile.am b/gtk-2.0/Makefile.am
index 6311eed..003ef8d 100644
--- a/gtk-2.0/Makefile.am
+++ b/gtk-2.0/Makefile.am
@@ -30,7 +30,8 @@ libxfce_la_CFLAGS = \
 libxfce_la_LIBADD = \
 	$(GTK2_LIBS) \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS)
+	$(GMODULE_LIBS) \
+	$(LIBM)
 
 libxfce_la_LDFLAGS = \
 	-module \