diff --git a/configure.ac b/configure.ac
index fb3239ab6e39f0040699f8f925085198fd7d16fc..63df4b56814b8a2cb2b6a7d9eb96258442408c1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -488,7 +488,7 @@ if test x$with_libgl != xno; then
   fi
 
   if test "$have_gl" = yes ; then
-    AC_CHECK_X_LIB(GL, glXChooseVisual, have_libgl=yes, have_libgl=no, -lm)
+    AC_CHECK_X_LIB(GL, glXChooseVisual, have_libgl=yes, have_libgl=no)
   fi
 fi
 
@@ -1083,7 +1083,7 @@ fi
 AC_SUBST(DEBUG_CFLAGS)
 
 # Flags
-CFLAGS="$CFLAGS -lm"
+LDFLAGS="$LDFLAGS -lm"
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
diff --git a/savers/Makefile.am b/savers/Makefile.am
index fbab810d2132a4f8d92c87af0bbf2e0ade81ef89..1b20c547199b407f9a6847a0f95d30c713011ade 100644
--- a/savers/Makefile.am
+++ b/savers/Makefile.am
@@ -80,7 +80,6 @@ floaters_SOURCES = \
 floaters_LDADD = \
 	libgs-theme-engine.a            \
 	$(XFCE_SCREENSAVER_SAVER_LIBS)  \
-	-lm                             \
 	$(NULL)
 
 popsquares_SOURCES = \