Add CURL_CFLAGS
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
This commit is contained in:
parent
9784cde552
commit
b1d5a277d2
1
Makefile
1
Makefile
@ -167,6 +167,7 @@ LIBS+=$(VDE_LIBS)
|
|||||||
obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
|
obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
|
||||||
obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o
|
obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o
|
||||||
|
|
||||||
|
CPPFLAGS+=$(CURL_CFLAGS)
|
||||||
LIBS+=$(CURL_LIBS)
|
LIBS+=$(CURL_LIBS)
|
||||||
|
|
||||||
cocoa.o: cocoa.m
|
cocoa.o: cocoa.m
|
||||||
|
4
configure
vendored
4
configure
vendored
@ -1107,8 +1107,9 @@ if test "$curl" = "yes" ; then
|
|||||||
#include <curl/curl.h>
|
#include <curl/curl.h>
|
||||||
int main(void) { return curl_easy_init(); }
|
int main(void) { return curl_easy_init(); }
|
||||||
EOF
|
EOF
|
||||||
|
curl_cflags=`curl-config --cflags 2>/dev/null`
|
||||||
curl_libs=`curl-config --libs 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
|
curl=yes
|
||||||
fi
|
fi
|
||||||
fi # test "$curl"
|
fi # test "$curl"
|
||||||
@ -1695,6 +1696,7 @@ if test "$bswap_h" = "yes" ; then
|
|||||||
fi
|
fi
|
||||||
if test "$curl" = "yes" ; then
|
if test "$curl" = "yes" ; then
|
||||||
echo "CONFIG_CURL=y" >> $config_host_mak
|
echo "CONFIG_CURL=y" >> $config_host_mak
|
||||||
|
echo "CURL_CFLAGS=$curl_cflags" >> $config_host_mak
|
||||||
echo "CURL_LIBS=$curl_libs" >> $config_host_mak
|
echo "CURL_LIBS=$curl_libs" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
if test "$brlapi" = "yes" ; then
|
if test "$brlapi" = "yes" ; then
|
||||||
|
Loading…
Reference in New Issue
Block a user