Pileus Git - ~andy/sunrise/blob - dev-libs/google-breakpad/files/google-breakpad-0_pre20120725-curl.patch

   1 --- configure.ac
   2 +++ configure.ac
   3 @@ -138,5 +138,7 @@
   4                [selftest=false])
   5  AM_CONDITIONAL(SELFTEST, test x$selftest = xtrue)
   6
   7 +AC_CHECK_HEADERS([curl/curl.h],        [CURL_HEADER=yes; break;])
   8 +
   9  AC_CONFIG_FILES([Makefile])
  10  AC_OUTPUT
  11
  12 --- src/common/linux/http_upload.cc
  13 +++ src/common/linux/http_upload.cc
  14 @@ -31,7 +31,14 @@
  15
  16  #include <assert.h>
  17  #include <dlfcn.h>
  18 +
  19 +#include "config.h"
  20 +
  21 +#ifdef HAVE_CURL_CURL_H
  22 +#include <curl/curl.h>
  23 +#else
  24  #include "third_party/curl/curl.h"
  25 +#endif
  26
  27  namespace {
  28
  29 --- src/common/linux/libcurl_wrapper.h
  30 +++ src/common/linux/libcurl_wrapper.h
  31 @@ -34,7 +34,14 @@
  32  #include <map>
  33
  34  #include "common/using_std_string.h"
  35 +
  36 +#include "config.h"
  37 +
  38 +#ifdef HAVE_CURL_CURL_H
  39 +#include <curl/curl.h>
  40 +#else
  41  #include "third_party/curl/curl.h"
  42 +#endif
  43
  44  namespace google_breakpad {
  45  class LibcurlWrapper {