configure,makefile: make possible to not build upload tools (requiring curl)

LICENSE

@@ -389,40 +389,6 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
---------------------------------------------------------------------
-License for
-src/third_party/curl/curl.h
-src/third_party/curl/curlbuild.h
-src/third_party/curl/curlrules.h
-src/third_party/curl/curlver.h
-src/third_party/curl/easy.h
-src/third_party/curl/mprintf.h
-src/third_party/curl/multi.h
-src/third_party/curl/stdcheaders.h
-src/third_party/curl/typecheck-gcc.h
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright (c) 1996 - 2011, Daniel Stenberg, <daniel@haxx.se>.
-
-All rights reserved.
-
-Permission to use, copy, modify, and distribute this software for any purpose
-with or without fee is hereby granted, provided that the above copyright
-notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
-NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization of the copyright holder.
-
 --------------------------------------------------------------------
 License for
 src/common/mac/GTMDefines.h

Makefile.am

@@ -272,9 +272,11 @@ if LINUX_HOST
 lib_LIBRARIES += src/client/linux/libbreakpad_client.a
 pkgconfig_DATA += breakpad-client.pc
 
+if ENABLE_UPLOAD_TOOLS
 check_PROGRAMS += \
 	src/client/linux/linux_client_unittest \
 	src/common/linux/google_crashdump_uploader_test
+endif
 
 EXTRA_PROGRAMS += \
 	src/client/linux/linux_dumper_unittest_helper \
@@ -300,13 +302,14 @@ bin_PROGRAMS += \
 check_PROGRAMS += \
 	src/common/dumper_unittest
 
-# slipher: disabling these to avoid curl dependency
-# bin_PROGRAMS += \
-#	src/tools/linux/symupload/minidump_upload \
-#	src/tools/linux/symupload/sym_upload
-
 if LINUX_HOST
 
+if ENABLE_UPLOAD_TOOLS
+bin_PROGRAMS += \
+	src/tools/linux/symupload/minidump_upload \
+	src/tools/linux/symupload/sym_upload
+endif
+
 bin_PROGRAMS += \
 	src/tools/linux/core2md/core2md \
 	src/tools/linux/pid2md/pid2md \
@@ -733,6 +736,8 @@ src_tools_linux_md2core_minidump_2_core_SOURCES = \
 	src/tools/linux/md2core/minidump-2-core.cc \
 	src/tools/linux/md2core/minidump_memory_range.h
 
+if LINUX_HOST
+if ENABLE_UPLOAD_TOOLS
 src_tools_linux_symupload_minidump_upload_SOURCES = \
 	src/common/linux/http_upload.cc \
 	src/common/path_helper.cc \
@@ -751,6 +756,8 @@ src_tools_linux_symupload_sym_upload_SOURCES = \
 	src/common/path_helper.cc \
 	src/tools/linux/symupload/sym_upload.cc
 src_tools_linux_symupload_sym_upload_LDADD = -ldl -lcurl
+endif
+endif
 
 src_tools_mac_dump_syms_dump_syms_mac_SOURCES = \
 	src/common/dwarf_cfi_to_module.cc \
@@ -913,6 +920,7 @@ src_common_mac_macho_reader_unittest_LDADD = \
 	$(TEST_LIBS) \
 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 
+if ENABLE_UPLOAD_TOOLS
 src_common_linux_google_crashdump_uploader_test_SOURCES = \
 	src/common/linux/google_crashdump_uploader.cc \
 	src/common/linux/google_crashdump_uploader_test.cc \
@@ -923,6 +931,7 @@ src_common_linux_google_crashdump_uploader_test_LDADD = \
 	$(TEST_LIBS) \
 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \
 	-ldl
+endif
 
 src_tools_linux_md2core_minidump_2_core_unittest_SOURCES = \
 	src/tools/linux/md2core/minidump_memory_range_unittest.cc

configure.ac

@@ -175,6 +175,13 @@ if test x$LINUX_HOST = xfalse -a "x$enable_processor" != xyes -a "x$enable_tools
    AC_MSG_ERROR([--disable-processor and --disable-tools were specified, and not building for Linux. Nothing to build!])
 fi
 
+AC_ARG_ENABLE([upload_tools],
+    [AS_HELP_STRING([--disable-upload-tools], [Do not build upload tools])],
+    [enable_upload_tools=$enableval],
+    [enable_upload_tools=yes])
+
+AM_CONDITIONAL([ENABLE_UPLOAD_TOOLS], [test "x$enable_upload_tools" = "xyes"])
+
 AC_ARG_ENABLE(system-test-libs,
               AS_HELP_STRING([--enable-system-test-libs],
                              [Use gtest/gmock/etc... from the system instead ]

src/common/linux/http_upload.cc

@@ -34,7 +34,7 @@
 
 #include <assert.h>
 #include <dlfcn.h>
-#include "third_party/curl/curl.h"
+#include <curl/curl.h>
 
 #include <string>