wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 386841 - crashreporter linked with libsso.so.4, libcrypto.so.4. r=bsmedberg

Browse Source
This commit is contained in:
ted.mielczarek@gmail.com 2007-07-18 21:28:05 -07:00
parent 66a57bb5ca
commit 31369cfdd9
3 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/autoconf.mk.in
View File

@ -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@

33
configure.in
View File

@ -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/curl.h>],
[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 ========================================================

4
toolkit/airbag/client/Makefile.in
View File

@ -85,8 +85,8 @@ 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)
OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS)
OS_LIBS += $(MOZ_GTK2_LIBS) -lcurl
CPPSRCS += http_upload.cc
FORCE_USE_PIC=1
endif