From 4431655b92096ca5e63ff6fc6ab88a088773d61f Mon Sep 17 00:00:00 2001 From: "ted.mielczarek%gmail.com" Date: Thu, 19 Jul 2007 04:28:05 +0000 Subject: [PATCH] bug 386841 - crashreporter linked with libsso.so.4, libcrypto.so.4. r=bsmedberg --- config/autoconf.mk.in | 3 - configure.in | 33 ++++----- toolkit/airbag/client/Makefile.in | 112 ------------------------------ 3 files changed, 12 insertions(+), 136 deletions(-) diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 719c50b8a08..a7385471480 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -464,9 +464,6 @@ MOZ_ENABLE_XREMOTE = @MOZ_ENABLE_XREMOTE@ MOZ_GTK2_CFLAGS = @MOZ_GTK2_CFLAGS@ MOZ_GTK2_LIBS = @MOZ_GTK2_LIBS@ -MOZ_LIBCURL_CFLAGS = @MOZ_LIBCURL_CFLAGS@ -MOZ_LIBCURL_LIBS = @MOZ_LIBCURL_LIBS@ - MOZ_DBUS_GLIB_CFLAGS = @MOZ_DBUS_GLIB_CFLAGS@ MOZ_DBUS_GLIB_LIBS = @MOZ_DBUS_GLIB_LIBS@ MOZ_ENABLE_DBUS = @MOZ_ENABLE_DBUS@ diff --git a/configure.in b/configure.in index 9bd484c0760..14b21c308d6 100644 --- a/configure.in +++ b/configure.in @@ -5342,32 +5342,23 @@ MOZ_ARG_DISABLE_BOOL(airbag, if test -n "$MOZ_AIRBAG"; then AC_DEFINE(MOZ_AIRBAG) - if test "$OS_ARCH" = "Linux"; then - PKG_CHECK_MODULES(MOZ_LIBCURL, libcurl, _CURL_FOUND=1, _CURL_FOUND=) - if test -z "$_CURL_FOUND"; then - AC_PATH_PROGS(CURL_CONFIG, $CURL_CONFIG curl-config) - if test -n "$CURL_CONFIG"; then - AC_MSG_CHECKING(MOZ_LIBCURL_CFLAGS) - MOZ_LIBCURL_CFLAGS=`${CURL_CONFIG} --cflags` - AC_MSG_RESULT($MOZ_LIBCURL_CFLAGS) - - AC_MSG_CHECKING(MOZ_LIBCURL_LIBS) - MOZ_LIBCURL_LIBS=`${CURL_CONFIG} --libs` - AC_MSG_RESULT($MOZ_LIBCURL_LIBS) - - _CURL_FOUND=1 - fi - fi - - if test -z "$_CURL_FOUND" && test -z "$SKIP_LIBRARY_CHECKS"; then + if test "$OS_ARCH" = "Linux" && \ + test -z "$SKIP_LIBRARY_CHECKS"; then + _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -lcurl" + AC_CACHE_CHECK(for libcurl, + ac_cv_have_libcurl, + [AC_TRY_LINK([#include ], + [curl_easy_init();], + ac_cv_have_libcurl="yes", + ac_cv_have_libcurl="no")]) + if test "$ac_cv_have_libcurl" = "no"; then AC_MSG_ERROR([Couldn't find libcurl, which is required for the crash reporter. Use --disable-airbag to disable the crash reporter.]) fi + LDFLAGS=$_SAVE_LDFLAGS fi fi -AC_SUBST(MOZ_LIBCURL_CFLAGS) -AC_SUBST(MOZ_LIBCURL_LIBS) - dnl ======================================================== dnl = Build mochitest JS/DOM tests (on by default) dnl ======================================================== diff --git a/toolkit/airbag/client/Makefile.in b/toolkit/airbag/client/Makefile.in index 0471a28b50a..e69de29bb2d 100644 --- a/toolkit/airbag/client/Makefile.in +++ b/toolkit/airbag/client/Makefile.in @@ -1,112 +0,0 @@ -# vim:set ts=8 sw=8 sts=8 noet: -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is Mozilla Toolkit Crash Reporter -# -# The Initial Developer of the Original Code is -# Ted Mielczarek - -# Portions created by the Initial Developer are Copyright (C) 2005 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -PROGRAM = crashreporter$(BIN_SUFFIX) -DIST_PROGRAM = crashreporter$(BIN_SUFFIX) -REQUIRES = sender - -#XXX: should move to toolkit/locale -DIST_FILES = crashreporter.ini - -LOCAL_INCLUDES = -I$(srcdir)/../airbag/src - -CPPSRCS = crashreporter.cpp - -ifeq ($(OS_ARCH),WINNT) -CPPSRCS += crashreporter_win.cpp -LIBS += \ - $(DEPTH)/toolkit/airbag/airbag/src/client/windows/sender/$(LIB_PREFIX)crash_report_sender_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/airbag/airbag/src/common/windows/$(LIB_PREFIX)breakpad_windows_common_s.$(LIB_SUFFIX) \ - $(NULL) -LOCAL_INCLUDES += -I$(srcdir) -RCINCLUDE = crashreporter.rc -DEFINES += -DUNICODE -D_UNICODE -OS_LIBS += $(call EXPAND_LIBNAME,comctl32 shell32 wininet shlwapi) -MOZ_WINCONSOLE = 0 -endif - -ifeq ($(OS_ARCH),Darwin) -CMMSRCS += crashreporter_osx.mm -OS_LIBS += -framework Cocoa -LIBS += \ - $(DEPTH)/toolkit/airbag/airbag/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/airbag/airbag/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) \ - $(NULL) - -LOCAL_INCLUDES += -I$(srcdir) -I$(srcdir)/../airbag/src/common/mac/ -endif - -ifeq ($(OS_ARCH),Linux) -CPPSRCS += crashreporter_linux.cpp -LIBS += \ - $(DEPTH)/toolkit/airbag/airbag/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \ - $(NULL) -LOCAL_INCLUDES += -I$(srcdir) -OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_LIBCURL_CFLAGS) -OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_LIBCURL_LIBS) -CPPSRCS += http_upload.cc -FORCE_USE_PIC=1 -endif - -include $(topsrcdir)/config/rules.mk - -ifeq ($(OS_ARCH),Darwin) -libs:: - $(NSINSTALL) -D $(DIST)/bin/crashreporter.app - rsync -a -C --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/bin/crashreporter.app - sed -e "s/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \ - iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/crashreporter.app/Contents/Resources/English.lproj/InfoPlist.strings - $(NSINSTALL) -D $(DIST)/bin/crashreporter.app/Contents/MacOS - $(NSINSTALL) $(DIST)/bin/crashreporter $(DIST)/bin/crashreporter.app/Contents/MacOS - rm -f $(DIST)/bin/crashreporter - $(NSINSTALL) $(DIST)/bin/crashreporter.ini $(DIST)/bin/crashreporter.app/Contents/MacOS - rm -f $(DIST)/bin/crashreporter.ini -endif - -ifeq ($(OS_ARCH),Linux) -export:: $(srcdir)/../airbag/src/common/linux/http_upload.cc - $(INSTALL) $^ . -endif