]> granicus.if.org Git - sysstat/commitdiff
configure: do not overwrite LDFLAGS in test for 32-bit libsensors
authorLukáš Zaoral <lzaoral@redhat.com>
Thu, 31 Mar 2022 12:33:08 +0000 (14:33 +0200)
committerLukáš Zaoral <lzaoral@redhat.com>
Thu, 31 Mar 2022 12:45:40 +0000 (14:45 +0200)
configure
configure.in

index aa5af958c1b069f387a338a91648f17f1d58a7ab..e999217c58711668db1e9ae252cac727108fee47 100755 (executable)
--- a/configure
+++ b/configure
@@ -4783,7 +4783,8 @@ HAVE_SENSORS32="n"
 if test $SENSORS_SUPPORT = "y"; then
        CFLAGS_SAVE=$CFLAGS
        CFLAGS+=" -m32"
-       LDFLAGS=" -lsensors"
+       LDFLAGS_SAVE=$LDFLAGS
+       LDFLAGS+=" -lsensors"
        SENSORS=no
 #      Check for another function to avoid using cached result
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sensors_cleanup in -lsensors" >&5
@@ -4852,6 +4853,7 @@ rm -f core conftest.err conftest.$ac_objext \
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SENSORS" >&5
 $as_echo "$SENSORS" >&6; }
        CFLAGS=$CFLAGS_SAVE
+       LDFLAGS=$LDFLAGS_SAVE
 fi
 
 
index 279347a76976c4ab510624c47f5d3ee480264177..11cb3a3430a132d4ab6fa8b279e998206d4a7840 100644 (file)
@@ -191,7 +191,8 @@ HAVE_SENSORS32="n"
 if test $SENSORS_SUPPORT = "y"; then
        CFLAGS_SAVE=$CFLAGS
        CFLAGS+=" -m32"
-       LDFLAGS=" -lsensors"
+       LDFLAGS_SAVE=$LDFLAGS
+       LDFLAGS+=" -lsensors"
        SENSORS=no
 #      Check for another function to avoid using cached result
        AC_CHECK_LIB(sensors, sensors_cleanup, LFSENSORS32="-lsensors", HAVE_SENSORS32="n")
@@ -201,6 +202,7 @@ if test $SENSORS_SUPPORT = "y"; then
                                        [[sensors_cleanup();]])], SENSORS=yes; HAVE_SENSORS32="y"; DFSENSORS32="-DHAVE_SENSORS32", HAVE_SENSORS32="n"; SENSORS=no)
        AC_MSG_RESULT($SENSORS)
        CFLAGS=$CFLAGS_SAVE
+       LDFLAGS=$LDFLAGS_SAVE
 fi
 AC_SUBST(HAVE_SENSORS32)
 AC_SUBST(LFSENSORS32)