mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-03 18:47:53 +00:00
Generate dependencies automatically when compiling a file on win32.
Bug #1677442 r=pavlov
This commit is contained in:
seawood%netscape.com
parent
5ed0f33e34
commit
a55cc20fd2
52
configure
vendored
52
configure
vendored
@ -12766,11 +12766,7 @@ fi
|
||||
|
||||
# Build dependencies
|
||||
|
||||
if test "$_WIN32_MSVC"; then
|
||||
MOZ_AUTO_DEPS=
|
||||
else
|
||||
MOZ_AUTO_DEPS=1
|
||||
fi
|
||||
# Check whether --enable-auto-deps or --disable-auto-deps was given.
|
||||
if test "${enable_auto_deps+set}" = set; then
|
||||
enableval="$enable_auto_deps"
|
||||
@ -12887,7 +12883,7 @@ case "$target" in
|
||||
# Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
|
||||
set dummy makeC++SharedLib_r; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:12891: checking for $ac_word" >&5
|
||||
echo "configure:12887: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12986,7 +12982,7 @@ then
|
||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||
set dummy pkg-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:12990: checking for $ac_word" >&5
|
||||
echo "configure:12986: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -13031,19 +13027,19 @@ fi
|
||||
echo "*** See http://www.freedesktop.org/software/pkgconfig"
|
||||
else
|
||||
echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
|
||||
echo "configure:13035: checking for libIDL-2.0 >= 0.8.0" >&5
|
||||
echo "configure:13031: checking for libIDL-2.0 >= 0.8.0" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:13042: checking LIBIDL_CFLAGS" >&5
|
||||
echo "configure:13038: checking LIBIDL_CFLAGS" >&5
|
||||
LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
|
||||
echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:13047: checking LIBIDL_LIBS" >&5
|
||||
echo "configure:13043: checking LIBIDL_LIBS" >&5
|
||||
LIBIDL_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"`
|
||||
echo "$ac_t""$LIBIDL_LIBS" 1>&6
|
||||
else
|
||||
@ -13160,7 +13156,7 @@ fi
|
||||
# Extract the first word of "glib-config", so it can be a program name with args.
|
||||
set dummy glib-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:13164: checking for $ac_word" >&5
|
||||
echo "configure:13160: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -13195,7 +13191,7 @@ fi
|
||||
|
||||
min_glib_version=1.2.0
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:13199: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:13195: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
@ -13218,7 +13214,7 @@ echo "configure:13199: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13222 "configure"
|
||||
#line 13218 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -13294,7 +13290,7 @@ main ()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:13298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:13294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -13328,7 +13324,7 @@ fi
|
||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13332 "configure"
|
||||
#line 13328 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -13338,7 +13334,7 @@ int main() {
|
||||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:13338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
|
||||
@ -13382,7 +13378,7 @@ rm -f conftest*
|
||||
# Extract the first word of "libIDL-config", so it can be a program name with args.
|
||||
set dummy libIDL-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:13386: checking for $ac_word" >&5
|
||||
echo "configure:13382: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -13417,7 +13413,7 @@ fi
|
||||
|
||||
min_libIDL_version=$LIBIDL_VERSION
|
||||
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
||||
echo "configure:13421: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
echo "configure:13417: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
no_libIDL=""
|
||||
if test "$LIBIDL_CONFIG" = "no" ; then
|
||||
no_libIDL=yes
|
||||
@ -13444,7 +13440,7 @@ echo "configure:13421: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13448 "configure"
|
||||
#line 13444 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
@ -13530,7 +13526,7 @@ main ()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:13534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:13530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -13564,7 +13560,7 @@ fi
|
||||
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
||||
LIBS="$LIBS $LIBIDL_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13568 "configure"
|
||||
#line 13564 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
@ -13575,7 +13571,7 @@ int main() {
|
||||
return IDL_get_libver_string ? 1 : 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:13575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding libIDL or finding the wrong"
|
||||
@ -13615,7 +13611,7 @@ do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:13619: checking for $ac_word" >&5
|
||||
echo "configure:13615: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -13741,7 +13737,7 @@ fi
|
||||
# Extract the first word of "glib-config", so it can be a program name with args.
|
||||
set dummy glib-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:13745: checking for $ac_word" >&5
|
||||
echo "configure:13741: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -13776,7 +13772,7 @@ fi
|
||||
|
||||
min_glib_version=${GLIB_VERSION}
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:13780: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:13776: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
@ -13799,7 +13795,7 @@ echo "configure:13780: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13803 "configure"
|
||||
#line 13799 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -13875,7 +13871,7 @@ main ()
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:13879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:13875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
@ -13909,7 +13905,7 @@ fi
|
||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 13913 "configure"
|
||||
#line 13909 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
@ -13919,7 +13915,7 @@ int main() {
|
||||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:13923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:13919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
|
||||
|
||||
@ -4057,11 +4057,7 @@ MOZ_ARG_HEADER(Build dependencies)
|
||||
dnl ========================================================
|
||||
dnl = Do not auto generate dependency info
|
||||
dnl ========================================================
|
||||
if test "$_WIN32_MSVC"; then
|
||||
MOZ_AUTO_DEPS=
|
||||
else
|
||||
MOZ_AUTO_DEPS=1
|
||||
fi
|
||||
MOZ_ARG_DISABLE_BOOL(auto-deps,
|
||||
[ --disable-auto-deps Do not automatically generate dependency info],
|
||||
MOZ_AUTO_DEPS=,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user