|
 |
517615c |
Patch by Robert Scheck <robert@fedoraproject.org> for xfce4-sensors-plugin >= 1.0.0, which adds
|
|
|
517615c |
the missing (former implicit) linking to libm. It corrects the typo with the missing backslash in
|
|
|
517615c |
the Makefile.am as well to get linking to libxfce4panel and libsensors again. As implicit linking
|
|
|
517615c |
can be dangerous, Fedora has changed this behaviour. For more information have a look to Red Hat
|
|
|
517615c |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=564840
|
|
|
517615c |
|
|
|
517615c |
--- xfce4-sensors-plugin-1.0.0/configure.in 2010-03-27 16:12:11.000000000 +0100
|
|
|
517615c |
+++ xfce4-sensors-plugin-1.0.0/configure.in.dso 2010-06-04 01:38:29.000000000 +0200
|
|
|
517615c |
@@ -276,6 +276,9 @@
|
|
|
517615c |
AC_CHECK_LIB(nsl, kstat_open, SOLLIBS="$SOLLIBS -linet_ntop", SOLLIBS="$SOLLIBS")
|
|
|
517615c |
AC_SUBST(SOLLIBS)
|
|
|
517615c |
|
|
|
517615c |
+AC_CHECK_LIB(m, ceilf, LIBM="-lm", AC_MSG_ERROR(Missing working libm math lib))
|
|
|
517615c |
+AC_SUBST(LIBM)
|
|
|
517615c |
+
|
|
|
517615c |
dnl **************************************
|
|
|
517615c |
dnl *** Substitute version information ***
|
|
|
517615c |
dnl **************************************
|
|
|
517615c |
--- xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am 2009-11-06 12:02:11.000000000 +0100
|
|
|
517615c |
+++ xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am.dso 2010-06-04 01:39:38.000000000 +0200
|
|
|
517615c |
@@ -28,10 +28,11 @@
|
|
|
517615c |
# @GLIB_CFLAGS@
|
|
|
517615c |
|
|
|
517615c |
xfce4_sensors_plugin_LDFLAGS = \
|
|
|
517615c |
- $(top_builddir)/lib/libxfce4sensors.la
|
|
|
517615c |
+ $(top_builddir)/lib/libxfce4sensors.la \
|
|
|
517615c |
@LIBXFCE4PANEL_LIBS@ \
|
|
|
517615c |
@SOLLIBS@ \
|
|
|
517615c |
- @LIBSENSORS_LDFLAGS@
|
|
|
517615c |
+ @LIBSENSORS_LDFLAGS@ \
|
|
|
517615c |
+ @LIBM@
|
|
|
517615c |
|
|
|
517615c |
# @GTK_LIBS@ \
|
|
|
517615c |
# @GLIB_LIBS@
|
|
|
517615c |
--- xfce4-sensors-plugin-1.0.0/configure 2010-03-27 16:12:32.000000000 +0100
|
|
|
517615c |
+++ xfce4-sensors-plugin-1.0.0/configure.dso 2010-06-04 01:44:43.000000000 +0200
|
|
|
517615c |
@@ -787,6 +787,7 @@
|
|
|
517615c |
GTK_VERSION
|
|
|
517615c |
PKG_CONFIG
|
|
|
517615c |
LIBXFCE4SENSORS_VERINFO
|
|
|
517615c |
+LIBM
|
|
|
517615c |
SOLLIBS
|
|
|
517615c |
PLATFORM_CFLAGS
|
|
|
517615c |
HAVE_SYSFS_ACPI_FALSE
|
|
|
517615c |
@@ -5779,13 +5780,13 @@
|
|
|
517615c |
else
|
|
|
517615c |
lt_cv_nm_interface="BSD nm"
|
|
|
517615c |
echo "int some_variable = 0;" > conftest.$ac_ext
|
|
|
517615c |
- (eval echo "\"\$as_me:5782: $ac_compile\"" >&5)
|
|
|
517615c |
+ (eval echo "\"\$as_me:5783: $ac_compile\"" >&5)
|
|
|
517615c |
(eval "$ac_compile" 2>conftest.err)
|
|
|
517615c |
cat conftest.err >&5
|
|
|
517615c |
- (eval echo "\"\$as_me:5785: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
|
517615c |
+ (eval echo "\"\$as_me:5786: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
|
517615c |
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
|
|
517615c |
cat conftest.err >&5
|
|
|
517615c |
- (eval echo "\"\$as_me:5788: output\"" >&5)
|
|
|
517615c |
+ (eval echo "\"\$as_me:5789: output\"" >&5)
|
|
|
517615c |
cat conftest.out >&5
|
|
|
517615c |
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
|
|
517615c |
lt_cv_nm_interface="MS dumpbin"
|
|
|
517615c |
@@ -6990,7 +6991,7 @@
|
|
|
517615c |
;;
|
|
|
517615c |
*-*-irix6*)
|
|
|
517615c |
# Find out which ABI we are using.
|
|
|
517615c |
- echo '#line 6993 "configure"' > conftest.$ac_ext
|
|
|
517615c |
+ echo '#line 6994 "configure"' > conftest.$ac_ext
|
|
|
517615c |
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
|
517615c |
(eval $ac_compile) 2>&5
|
|
|
517615c |
ac_status=$?
|
|
|
517615c |
@@ -8248,11 +8249,11 @@
|
|
|
517615c |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
|
517615c |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
|
517615c |
-e 's:$: $lt_compiler_flag:'`
|
|
|
517615c |
- (eval echo "\"\$as_me:8251: $lt_compile\"" >&5)
|
|
|
517615c |
+ (eval echo "\"\$as_me:8252: $lt_compile\"" >&5)
|
|
|
517615c |
(eval "$lt_compile" 2>conftest.err)
|
|
|
517615c |
ac_status=$?
|
|
|
517615c |
cat conftest.err >&5
|
|
|
517615c |
- echo "$as_me:8255: \$? = $ac_status" >&5
|
|
|
517615c |
+ echo "$as_me:8256: \$? = $ac_status" >&5
|
|
|
517615c |
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
|
517615c |
# The compiler can only warn and ignore the option if not recognized
|
|
|
517615c |
# So say no if there are warnings other than the usual output.
|
|
|
517615c |
@@ -8587,11 +8588,11 @@
|
|
|
517615c |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
|
517615c |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
|
517615c |
-e 's:$: $lt_compiler_flag:'`
|
|
|
517615c |
- (eval echo "\"\$as_me:8590: $lt_compile\"" >&5)
|
|
|
517615c |
+ (eval echo "\"\$as_me:8591: $lt_compile\"" >&5)
|
|
|
517615c |
(eval "$lt_compile" 2>conftest.err)
|
|
|
517615c |
ac_status=$?
|
|
|
517615c |
cat conftest.err >&5
|
|
|
517615c |
- echo "$as_me:8594: \$? = $ac_status" >&5
|
|
|
517615c |
+ echo "$as_me:8595: \$? = $ac_status" >&5
|
|
|
517615c |
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
|
517615c |
# The compiler can only warn and ignore the option if not recognized
|
|
|
517615c |
# So say no if there are warnings other than the usual output.
|
|
|
517615c |
@@ -8692,11 +8693,11 @@
|
|
|
517615c |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
|
517615c |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
|
517615c |
-e 's:$: $lt_compiler_flag:'`
|
|
|
517615c |
- (eval echo "\"\$as_me:8695: $lt_compile\"" >&5)
|
|
|
517615c |
+ (eval echo "\"\$as_me:8696: $lt_compile\"" >&5)
|
|
|
517615c |
(eval "$lt_compile" 2>out/conftest.err)
|
|
|
517615c |
ac_status=$?
|
|
|
517615c |
cat out/conftest.err >&5
|
|
|
517615c |
- echo "$as_me:8699: \$? = $ac_status" >&5
|
|
|
517615c |
+ echo "$as_me:8700: \$? = $ac_status" >&5
|
|
|
517615c |
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
|
517615c |
then
|
|
|
517615c |
# The compiler can only warn and ignore the option if not recognized
|
|
|
517615c |
@@ -8747,11 +8748,11 @@
|
|
|
517615c |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
|
517615c |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
|
517615c |
-e 's:$: $lt_compiler_flag:'`
|
|
|
517615c |
- (eval echo "\"\$as_me:8750: $lt_compile\"" >&5)
|
|
|
517615c |
+ (eval echo "\"\$as_me:8751: $lt_compile\"" >&5)
|
|
|
517615c |
(eval "$lt_compile" 2>out/conftest.err)
|
|
|
517615c |
ac_status=$?
|
|
|
517615c |
cat out/conftest.err >&5
|
|
|
517615c |
- echo "$as_me:8754: \$? = $ac_status" >&5
|
|
|
517615c |
+ echo "$as_me:8755: \$? = $ac_status" >&5
|
|
|
517615c |
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
|
517615c |
then
|
|
|
517615c |
# The compiler can only warn and ignore the option if not recognized
|
|
|
517615c |
@@ -11131,7 +11132,7 @@
|
|
|
517615c |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
|
517615c |
lt_status=$lt_dlunknown
|
|
|
517615c |
cat > conftest.$ac_ext <<_LT_EOF
|
|
|
517615c |
-#line 11134 "configure"
|
|
|
517615c |
+#line 11135 "configure"
|
|
|
517615c |
#include "confdefs.h"
|
|
|
517615c |
|
|
|
517615c |
#if HAVE_DLFCN_H
|
|
|
517615c |
@@ -11227,7 +11228,7 @@
|
|
|
517615c |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
|
517615c |
lt_status=$lt_dlunknown
|
|
|
517615c |
cat > conftest.$ac_ext <<_LT_EOF
|
|
|
517615c |
-#line 11230 "configure"
|
|
|
517615c |
+#line 11231 "configure"
|
|
|
517615c |
#include "confdefs.h"
|
|
|
517615c |
|
|
|
517615c |
#if HAVE_DLFCN_H
|
|
|
517615c |
@@ -12973,6 +12974,50 @@
|
|
|
517615c |
|
|
|
517615c |
|
|
|
517615c |
|
|
|
517615c |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ceilf in -lm" >&5
|
|
|
517615c |
+$as_echo_n "checking for ceilf in -lm... " >&6; }
|
|
|
517615c |
+if test "${ac_cv_lib_m_ceilf+set}" = set; then :
|
|
|
517615c |
+ $as_echo_n "(cached) " >&6
|
|
|
517615c |
+else
|
|
|
517615c |
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
517615c |
+LIBS="-lm $LIBS"
|
|
|
517615c |
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
517615c |
+/* end confdefs.h. */
|
|
|
517615c |
+
|
|
|
517615c |
+/* Override any GCC internal prototype to avoid an error.
|
|
|
517615c |
+ Use char because int might match the return type of a GCC
|
|
|
517615c |
+ builtin and then its argument prototype would still apply. */
|
|
|
517615c |
+#ifdef __cplusplus
|
|
|
517615c |
+extern "C"
|
|
|
517615c |
+#endif
|
|
|
517615c |
+char ceilf ();
|
|
|
517615c |
+int
|
|
|
517615c |
+main ()
|
|
|
517615c |
+{
|
|
|
517615c |
+return ceilf ();
|
|
|
517615c |
+ ;
|
|
|
517615c |
+ return 0;
|
|
|
517615c |
+}
|
|
|
517615c |
+_ACEOF
|
|
|
517615c |
+if ac_fn_c_try_link "$LINENO"; then :
|
|
|
517615c |
+ ac_cv_lib_m_ceilf=yes
|
|
|
517615c |
+else
|
|
|
517615c |
+ ac_cv_lib_m_ceilf=no
|
|
|
517615c |
+fi
|
|
|
517615c |
+rm -f core conftest.err conftest.$ac_objext \
|
|
|
517615c |
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
517615c |
+LIBS=$ac_check_lib_save_LIBS
|
|
|
517615c |
+fi
|
|
|
517615c |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_ceilf" >&5
|
|
|
517615c |
+$as_echo "$ac_cv_lib_m_ceilf" >&6; }
|
|
|
517615c |
+if test "x$ac_cv_lib_m_ceilf" = x""yes; then :
|
|
|
517615c |
+ LIBM="-lm"
|
|
|
517615c |
+else
|
|
|
517615c |
+ as_fn_error "Missing working libm math lib" "$LINENO" 5
|
|
|
517615c |
+fi
|
|
|
517615c |
+
|
|
|
517615c |
+
|
|
|
517615c |
+
|
|
|
517615c |
LIBXFCE4SENSORS_VERINFO=1:0:0
|
|
|
517615c |
|
|
|
517615c |
|
|
|
517615c |
--- xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.in 2010-03-27 16:12:30.000000000 +0100
|
|
|
517615c |
+++ xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.in.dso 2010-06-04 01:39:58.000000000 +0200
|
|
|
517615c |
@@ -302,8 +302,11 @@
|
|
|
517615c |
# @GTK_CFLAGS@ \
|
|
|
517615c |
# @GLIB_CFLAGS@
|
|
|
517615c |
xfce4_sensors_plugin_LDFLAGS = \
|
|
|
517615c |
- $(top_builddir)/lib/libxfce4sensors.la
|
|
|
517615c |
-
|
|
|
517615c |
+ $(top_builddir)/lib/libxfce4sensors.la \
|
|
|
517615c |
+ @LIBXFCE4PANEL_LIBS@ \
|
|
|
517615c |
+ @SOLLIBS@ \
|
|
|
517615c |
+ @LIBSENSORS_LDFLAGS@ \
|
|
|
517615c |
+ @LIBM@
|
|
|
517615c |
|
|
|
517615c |
# @GTK_LIBS@ \
|
|
|
517615c |
# @GLIB_LIBS@
|