mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 05:41:12 +00:00
Add hooks to turn on module dep tracking by setting MOZ_TRACK_MODULE_DEPS=1 when running configure. Bug #59454
This commit is contained in:
cls%seawood.org
parent
c8af3a99af
commit
bce67763ee
@ -29,6 +29,7 @@ BUILD_MODULES = @BUILD_MODULES@
|
||||
DIST = $(DEPTH)/dist
|
||||
|
||||
MOZ_DISABLE_JAR_PACKAGING = @MOZ_DISABLE_JAR_PACKAGING@
|
||||
MOZ_TRACK_MODULE_DEPS = @MOZ_TRACK_MODULE_DEPS@
|
||||
|
||||
MOZ_WIDGET_TOOLKIT = @MOZ_WIDGET_TOOLKIT@
|
||||
MOZ_GFX_TOOLKIT = $(MOZ_WIDGET_TOOLKIT)
|
||||
|
||||
@ -303,7 +303,11 @@ JAVA_OPTIMIZER = -g
|
||||
XBCFLAGS = -FR$*
|
||||
endif
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES) -I$(PUBLIC) $(OS_INCLUDES)
|
||||
ifdef MOZ_TRACK_MODULE_DEPS
|
||||
REQ_INCLUDES = $(foreach d,$(REQUIRES),-I$(DIST)/include/$d)
|
||||
endif
|
||||
|
||||
INCLUDES = $(LOCAL_INCLUDES) $(REQ_INCLUDES) -I$(PUBLIC) -I$(DIST)/include $(OS_INCLUDES)
|
||||
|
||||
LIBNT = $(DIST)/lib/libnt.$(LIB_SUFFIX)
|
||||
LIBAWT = $(DIST)/lib/libawt.$(LIB_SUFFIX)
|
||||
@ -358,7 +362,11 @@ LIBS_DIR = -L$(DIST)/bin -L$(DIST)/lib
|
||||
# Default location of include files
|
||||
# Note: NSPR doesn't have $(PUBLIC) and
|
||||
# will always install its headers to $(DIST)/include
|
||||
ifdef MOZ_TRACK_MODULE_DEPS
|
||||
PUBLIC = $(DIST)/include/$(MODULE)
|
||||
else
|
||||
PUBLIC = $(DIST)/include
|
||||
endif
|
||||
|
||||
DEPENDENCIES = .md
|
||||
|
||||
|
||||
@ -1057,10 +1057,12 @@ endif
|
||||
################################################################################
|
||||
# Copy each element of EXPORTS to $(PUBLIC)
|
||||
|
||||
ifneq ($(EXPORTS),)
|
||||
ifneq ($(EXPORTS)$(XPIDLSRCS),)
|
||||
$(PUBLIC)::
|
||||
@if test ! -d $@; then echo Creating $@; rm -rf $@; $(NSINSTALL) -D $@; else true; fi
|
||||
endif
|
||||
|
||||
ifneq ($(EXPORTS),)
|
||||
export:: $(EXPORTS) $(PUBLIC)
|
||||
$(INSTALL) $(IFLAGS1) $^
|
||||
endif
|
||||
|
||||
41
configure
vendored
41
configure
vendored
@ -11646,6 +11646,8 @@ esac
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -11665,7 +11667,7 @@ if test "$JPEG_DIR" = no; then
|
||||
SYSTEM_JPEG=
|
||||
else
|
||||
echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:11669: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:11671: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -11673,7 +11675,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11677 "configure"
|
||||
#line 11679 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -11684,7 +11686,7 @@ int main() {
|
||||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -11713,7 +11715,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
||||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11717 "configure"
|
||||
#line 11719 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -11727,7 +11729,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:11731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:11733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
@ -11765,16 +11767,16 @@ if test "$ZLIB_DIR" = no; then
|
||||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:11769: checking "for zlib.h"" >&5
|
||||
echo "configure:11771: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11771 "configure"
|
||||
#line 11773 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
@ -11788,7 +11790,7 @@ rm -f conftest*
|
||||
fi
|
||||
if test "$SYSTEM_ZLIB" = 1; then
|
||||
echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
|
||||
echo "configure:11792: checking for gzread in -lz" >&5
|
||||
echo "configure:11794: checking for gzread in -lz" >&5
|
||||
ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -11796,7 +11798,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11800 "configure"
|
||||
#line 11802 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -11807,7 +11809,7 @@ int main() {
|
||||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -11853,7 +11855,7 @@ if test "$PNG_DIR" = no; then
|
||||
SYSTEM_PNG=
|
||||
else
|
||||
echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
|
||||
echo "configure:11857: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:11859: checking for png_get_valid in -lpng" >&5
|
||||
ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -11861,7 +11863,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11865 "configure"
|
||||
#line 11867 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -11872,7 +11874,7 @@ int main() {
|
||||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -11900,7 +11902,7 @@ if test "$SYSTEM_PNG" = 1; then
|
||||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11904 "configure"
|
||||
#line 11906 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -11914,7 +11916,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:11918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:11920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
@ -11981,9 +11983,9 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
|
||||
LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
|
||||
LIBS="-lfullsoft $LIBS"
|
||||
echo $ac_n "checking "for FCInitialize in -lfullsoft"""... $ac_c" 1>&6
|
||||
echo "configure:11985: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
echo "configure:11987: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11987 "configure"
|
||||
#line 11989 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include "fullsoft.h"
|
||||
@ -11991,7 +11993,7 @@ int main() {
|
||||
FCInitialize(); exit(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
FULLCIRCLE_LIBS="-I${FULLCIRCLE_DIR} -L${FULLCIRCLE_DIR} -lfullsoft" result="yes"
|
||||
else
|
||||
@ -12601,6 +12603,7 @@ s%@MDDEPDIR@%$MDDEPDIR%g
|
||||
s%@DETECT_WEBSHELL_LEAKS@%$DETECT_WEBSHELL_LEAKS%g
|
||||
s%@MOZ_DEMANGLE_SYMBOLS@%$MOZ_DEMANGLE_SYMBOLS%g
|
||||
s%@AIX_SHLIB_BIN@%$AIX_SHLIB_BIN%g
|
||||
s%@MOZ_TRACK_MODULE_DEPS@%$MOZ_TRACK_MODULE_DEPS%g
|
||||
s%@AR_FLAGS@%$AR_FLAGS%g
|
||||
s%@AR_LIST@%$AR_LIST%g
|
||||
s%@AR_EXTRACT@%$AR_EXTRACT%g
|
||||
|
||||
@ -3653,6 +3653,13 @@ case "$target" in
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Maintainer debug option (no --enable equivalent)
|
||||
dnl =
|
||||
dnl ========================================================
|
||||
AC_SUBST(MOZ_TRACK_MODULE_DEPS)
|
||||
|
||||
AC_SUBST(AR)
|
||||
AC_SUBST(AR_FLAGS)
|
||||
AC_SUBST(AR_LIST)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user