Bug 380540: Check curl-config if libcurl.pc isn't found, try enabling breakpad by default again on linux. r=luser

This commit is contained in:
dcamp%mozilla.com 2007-06-21 21:44:30 +00:00
Родитель b928716626
Коммит f339b14043
2 изменённых файлов: 729 добавлений и 764 удалений

1470
configure поставляемый

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -5334,7 +5334,8 @@ dnl = Airbag crash reporting (on by default on supported platforms)
dnl ========================================================
if test "$OS_ARCH" = "WINNT" -a -z "$GNU_CC" \
|| test "$OS_ARCH" = "Darwin"; then
|| test "$OS_ARCH" = "Darwin" \
|| test "$OS_ARCH" = "Linux"; then
MOZ_AIRBAG=1
fi
@ -5347,7 +5348,25 @@ if test -n "$MOZ_AIRBAG"; then
AC_DEFINE(MOZ_AIRBAG)
if test "$OS_ARCH" = "Linux"; then
PKG_CHECK_MODULES(MOZ_LIBCURL, libcurl)
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"; then
AC_MSG_ERROR([Couldn't find libcurl, which is required for the crash reporter. Use --disable-airbag to disable the crash reporter.])
fi
fi
fi