summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-08-03 14:46:05 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-10 13:05:36 -0500
commitb1d5a277d248b0a9c6d74a70a515de2cf20bdd80 (patch)
treed93189684b360e1744ff0e38ea22717b4b0e46f2
parent9784cde552f862204e3adeb148fc012cd97f6152 (diff)
downloadqemu-b1d5a277d248b0a9c6d74a70a515de2cf20bdd80.tar.gz
Add CURL_CFLAGS
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
-rw-r--r--Makefile1
-rwxr-xr-xconfigure4
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1182966929..91d68e60b0 100644
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,7 @@ LIBS+=$(VDE_LIBS)
obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o
+CPPFLAGS+=$(CURL_CFLAGS)
LIBS+=$(CURL_LIBS)
cocoa.o: cocoa.m
diff --git a/configure b/configure
index 84b537a416..29e3a701c5 100755
--- a/configure
+++ b/configure
@@ -1107,8 +1107,9 @@ if test "$curl" = "yes" ; then
#include <curl/curl.h>
int main(void) { return curl_easy_init(); }
EOF
+ curl_cflags=`curl-config --cflags 2>/dev/null`
curl_libs=`curl-config --libs 2>/dev/null`
- if compile_prog "" "$curl_libs" ; then
+ if compile_prog "$curl_cflags" "$curl_libs" ; then
curl=yes
fi
fi # test "$curl"
@@ -1695,6 +1696,7 @@ if test "$bswap_h" = "yes" ; then
fi
if test "$curl" = "yes" ; then
echo "CONFIG_CURL=y" >> $config_host_mak
+ echo "CURL_CFLAGS=$curl_cflags" >> $config_host_mak
echo "CURL_LIBS=$curl_libs" >> $config_host_mak
fi
if test "$brlapi" = "yes" ; then