diff --git a/configure.ac b/configure.ac
index 43cd3bb..240864a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,7 +147,7 @@ AC_ARG_WITH(bzip2,
 	  [Use libbz2 to support bzip2 compressed bitmap fonts (default: no)]),
 	[], [with_bzip2=no])
 if test "x$with_bzip2" = xyes; then
-	AC_CHECK_LIB(bz2, BZ2_bzopen, [Z_LIBS="$Z_LIBS -lbz2"],
+	AC_SEARCH_LIBS(BZ2_bzopen, [bz2 bz2d], [Z_LIBS="$Z_LIBS $ac_cv_search_BZ2_bzopen"],
 		AC_MSG_ERROR([*** libbz2 is required for bzip2 support]))
 	AC_DEFINE(X_BZIP2_FONT_COMPRESSION,1,[Support bzip2 for bitmap fonts])
 fi
@@ -222,8 +222,13 @@ if test "x$XFONT_FC" = xyes; then
 fi
 
 
-AC_CHECK_LIB(m, hypot, [MATH_LIBS=-lm
-AC_SUBST(MATH_LIBS)], AC_MSG_ERROR([*** libm is required]))
+AC_SEARCH_LIBS([hypot], [m], [MATH_LIBS=-lm AC_SUBST(MATH_LIBS)],
+[if test "x$ac_cv_search_hypot" != "xnone required"; then
+	AC_MSG_ERROR([*** libm is required])
+else
+	AC_MSG_ERROR([*** libm is not required])
+fi]
+)
 
 PKG_CHECK_MODULES(XFONT, [xproto xtrans fontsproto >= 2.1.3 fontenc])