bug 383463, --disable-compile-environment checks too much, r=bsmedberg
authoraxel@pike.org
Mon, 11 Jun 2007 08:56:41 -0700
changeset 2271 f24877cf9a5a5b0209760706b8d013d1c3bebab5
parent 2270 4fbd26670f9a6292875b7837e88bd1180036543e
child 2272 98a6b6409767c3f8a1ab797b540e770d84fba9ef
push id1
push userbsmedberg@mozilla.com
push dateThu, 20 Mar 2008 16:49:24 +0000
treeherdermozilla-central@61007906a1f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs383463
milestone1.9a6pre
bug 383463, --disable-compile-environment checks too much, r=bsmedberg
build/autoconf/pkg.m4
configure.in
--- a/build/autoconf/pkg.m4
+++ b/build/autoconf/pkg.m4
@@ -45,13 +45,15 @@ AC_DEFUN([PKG_CHECK_MODULES],
         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
         echo "*** See http://www.freedesktop.org/software/pkgconfig"
      fi
   fi
 
   if test $succeeded = yes; then
      ifelse([$3], , :, [$3])
   else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+     if test "$COMPILE_ENVIRONMENT"; then 
+       ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+     fi
   fi
 ])
 
 
--- a/configure.in
+++ b/configure.in
@@ -2432,16 +2432,17 @@ case "$target" in
         if test -n "$GNU_CC"; then
            MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
         fi
         ;;
 esac
 
 if test -z "$COMPILE_ENVIRONMENT"; then
     SKIP_COMPILER_CHECKS=1
+    SKIP_LIBRARY_CHECKS=1
 fi
 
 if test -z "$SKIP_COMPILER_CHECKS"; then
 dnl Checks for typedefs, structures, and compiler characteristics.
 dnl ========================================================
 AC_LANG_C
 AC_HEADER_STDC
 AC_C_CONST