[Xfce4-commits] <xfce4-sensors-plugin:master> - apply patch from redhat for explicit linking of libmath - fix additional Makefile.ams not included in patch

[Fabian Nowak]

Updating branch refs/heads/master
         to 9593faeaea60af30ebcaaa4d7832ba5183af4b41 (commit)
       from a4aa91a1ece1f5c9744d721ffd363e86cc9a2e41 (commit)

commit 9593faeaea60af30ebcaaa4d7832ba5183af4b41
Author: Fabian Nowak <timystery at arcor.de>
Date:   Fri Jun 4 21:34:29 2010 +0200

    - apply patch from redhat for explicit linking of libmath
    - fix additional Makefile.ams not included in patch

 configure.in.in          |    3 +++
 lib/Makefile.am          |    3 ++-
 panel-plugin/Makefile.am |   12 +++++++-----
 src/Makefile.am          |    3 ++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 00e14a5..f718f37 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -279,6 +279,9 @@ AC_CHECK_LIB(kstat, kstat_open, SOLLIBS="-lkstat -lsocket", SOLLIBS="")
 AC_CHECK_LIB(nsl, kstat_open, SOLLIBS="$SOLLIBS -linet_ntop", SOLLIBS="$SOLLIBS")
 AC_SUBST(SOLLIBS)
 
+AC_CHECK_LIB(m, ceilf, LIBM="-lm", AC_MSG_ERROR(Missing math library))
+AC_SUBST(LIBM)
+
 dnl **************************************
 dnl *** Substitute version information ***
 dnl **************************************
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d140b0f..7daad8a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -73,7 +73,8 @@ libxfce4sensors_la_LIBADD = 										\
 	@LIBXFCE4UTIL_LIBS@												\
 	@LIBXFCEGUI4_LIBS@												\
 	@LIBXFCE4PANEL_LIBS@											\
-	@LIBSENSORS_LDFLAGS@
+	@LIBSENSORS_LDFLAGS@											\
+	@LIBM@
 
 if HAVE_LIBNOTIFY
 libxfce4sensors_la_LIBADD += @LIBNOTIFY_LIBS@
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index a888f7e..b9f3ffe 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -27,11 +27,13 @@ xfce4_sensors_plugin_CFLAGS = \
 #	@GTK_CFLAGS@ \
 # @GLIB_CFLAGS@
 
-xfce4_sensors_plugin_LDFLAGS = 								\
-	$(top_builddir)/lib/libxfce4sensors.la
-	@LIBXFCE4PANEL_LIBS@											 \
-	@SOLLIBS@														\
-	@LIBSENSORS_LDFLAGS@
+
+xfce4_sensors_plugin_LDFLAGS = 							\
+	$(top_builddir)/lib/libxfce4sensors.la		\
+	@LIBXFCE4PANEL_LIBS@											\
+	@SOLLIBS@																	\
+	@LIBSENSORS_LDFLAGS@											\
+	@LIBM@
 
 #	@GTK_LIBS@ \
 # @GLIB_LIBS@
diff --git a/src/Makefile.am b/src/Makefile.am
index 1fa0788..387e63c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,8 @@ xfce4_sensors_LDADD = \
 	$(top_builddir)/lib/libxfce4sensors.la \
 	@LIBSENSORS_LDFLAGS@ \
 	@LIBXFCE4UTIL_LIBS@	\
-	@LIBXFCEGUI4_LIBS@ 
+	@LIBXFCEGUI4_LIBS@ 											\
+	@LIBM@
 
 # @GTK_LIBS@ \
 # @GLIB_LIBS@ \