diff --git a/libtorrent/configure.ac b/libtorrent/configure.ac
index c3480fe3..e4b6334e 100644
--- a/libtorrent/configure.ac
+++ b/libtorrent/configure.ac
@@ -64,9 +64,9 @@ AX_PTHREAD
 PKG_CHECK_MODULES([ZLIB], [zlib])
 PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
 
-CFLAGS="$PTHREAD_CFLAGS $ZLIB_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
-CXXFLAGS="$PTHREAD_CFLAGS $ZLIB_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
-LIBS="$PTHREAD_LIBS $ZLIB_CFLAGS $CPPUNIT_LIBS $LIBS"
+CFLAGS="$PTHREAD_CFLAGS $ZLIB_CFLAGS $CFLAGS"
+CXXFLAGS="$PTHREAD_CFLAGS $ZLIB_CFLAGS $CXXFLAGS"
+LIBS="$PTHREAD_LIBS $ZLIB_CFLAGS $LIBS"
 
 AC_ARG_ENABLE(openssl,
   [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],
diff --git a/rtorrent/configure.ac b/rtorrent/configure.ac
index 19866763..439e5d77 100644
--- a/rtorrent/configure.ac
+++ b/rtorrent/configure.ac
@@ -61,9 +61,9 @@ CC_ATTRIBUTE_UNUSED(
 
 dnl Only update global build variables immediately before generating the output,
 dnl to avoid affecting the global build environment for other autoconf checks.
-LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $CPPUNIT_LIBS $LIBCURL $LIBCURL_LIBS $DEPENDENCIES_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
-CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
+LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $LIBCURL $LIBCURL_LIBS $DEPENDENCIES_LIBS $LIBS"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
+CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
 
 AC_OUTPUT([
 	Makefile