diff --git a/configure.ac b/configure.ac
index 1d0add5aab..3ab3c4ed31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1840,16 +1840,6 @@ if test "$with_xenapi" = "yes" ; then
 fi
 AM_CONDITIONAL([WITH_XENAPI], [test "$with_xenapi" = "yes"])
 
-# XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version
-# of <curl/curl.h> that #defines several wrapper macros around underlying
-# functions to add type safety for gcc only.  However, these macros
-# spuriously trip gcc's -Wlogical-op warning.  Avoid the warning by
-# disabling the wrappers; even if it removes some type-check safety.
-LIBCURL_CFLAGS="-DCURL_DISABLE_TYPECHECK $LIBCURL_CFLAGS"
-
-AC_SUBST([LIBCURL_CFLAGS])
-AC_SUBST([LIBCURL_LIBS])
-
 
 dnl
 dnl check for Hyper-V
diff --git a/m4/virt-curl.m4 b/m4/virt-curl.m4
index d735098e0a..8b71119b86 100644
--- a/m4/virt-curl.m4
+++ b/m4/virt-curl.m4
@@ -19,6 +19,14 @@ dnl
 
 AC_DEFUN([LIBVIRT_CHECK_CURL],[
   LIBVIRT_CHECK_PKG([CURL], [libcurl], [7.18.0])
+
+  # XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version
+  # of <curl/curl.h> that #defines several wrapper macros around underlying
+  # functions to add type safety for gcc only.  However, these macros
+  # spuriously trip gcc's -Wlogical-op warning.  Avoid the warning by
+  # disabling the wrappers; even if it removes some type-check safety.
+  CURL_CFLAGS="-DCURL_DISABLE_TYPECHECK $CURL_CFLAGS"
+  AC_SUBST(CURL_CFLAGS)
 ])
 
 AC_DEFUN([LIBVIRT_RESULT_CURL],[
diff --git a/src/Makefile.am b/src/Makefile.am
index 033a1ce149..83c27230d1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -882,10 +882,10 @@ endif
 if WITH_XENAPI
 noinst_LTLIBRARIES += libvirt_driver_xenapi.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
-libvirt_driver_xenapi_la_CFLAGS = $(LIBXENSERVER_CFLAGS) $(LIBCURL_CFLAGS) \
+libvirt_driver_xenapi_la_CFLAGS = $(LIBXENSERVER_CFLAGS) $(CURL_CFLAGS) \
 		-I$(top_srcdir)/src/conf $(AM_CFLAGS)
 libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(LIBCURL_LIBS)
+libvirt_driver_xenapi_la_LIBADD = $(LIBXENSERVER_LIBS) $(CURL_LIBS)
 libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
 endif
 
@@ -1029,10 +1029,10 @@ MAINTAINERCLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP)
 if WITH_ESX
 noinst_LTLIBRARIES += libvirt_driver_esx.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_esx.la
-libvirt_driver_esx_la_CFLAGS = $(LIBCURL_CFLAGS) \
+libvirt_driver_esx_la_CFLAGS = $(CURL_CFLAGS) \
 		-I$(top_srcdir)/src/conf -I$(top_srcdir)/src/vmx $(AM_CFLAGS)
 libvirt_driver_esx_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_esx_la_LIBADD = $(LIBCURL_LIBS)
+libvirt_driver_esx_la_LIBADD = $(CURL_LIBS)
 libvirt_driver_esx_la_SOURCES = $(ESX_DRIVER_SOURCES)
 libvirt_driver_esx_la_DEPENDENCIES = $(ESX_DRIVER_GENERATED)
 endif