mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-27 23:02:20 +00:00
Bug 40967 - Avoid leaking MSYS paths in Makefiles: use c:/dir/path paths whenever possible, r=ted
This commit is contained in:
Benjamin Smedberg
parent
e3afda92d6
commit
ea55eb615e
3
aclocal.m4
vendored
3
aclocal.m4
vendored
@ -11,6 +11,9 @@ builtin(include, build/autoconf/pkg.m4)dnl
|
||||
builtin(include, build/autoconf/freetype2.m4)dnl
|
||||
builtin(include, build/autoconf/codeset.m4)dnl
|
||||
builtin(include, build/autoconf/altoptions.m4)dnl
|
||||
builtin(include, build/autoconf/mozprog.m4)dnl
|
||||
|
||||
MOZ_PROG_CHECKMSYS()
|
||||
|
||||
# Read the user's .mozconfig script. We can't do this in
|
||||
# configure.in: autoconf puts the argument parsing code above anything
|
||||
|
||||
@ -44,13 +44,20 @@
|
||||
|
||||
#$debug = 1;
|
||||
|
||||
if ($^O eq 'msys') {
|
||||
$pwdcmd = 'pwd -W';
|
||||
}
|
||||
else {
|
||||
$pwdcmd = 'pwd';
|
||||
}
|
||||
|
||||
# Determine various tree path variables
|
||||
#
|
||||
($topsrcdir, $ptopsrcdir, $depth, @makefiles) = parse_arguments(@ARGV);
|
||||
|
||||
$object_fullpath = `pwd`;
|
||||
$object_fullpath = `$pwdcmd`;
|
||||
chdir $depth;
|
||||
$object_root = `pwd`;
|
||||
$object_root = `$pwdcmd`;
|
||||
chomp $object_fullpath;
|
||||
chomp $object_root;
|
||||
|
||||
@ -257,7 +264,7 @@ sub update_makefiles {
|
||||
print "ac_file_in = $ac_file_in\n";
|
||||
print "srcdir = $srcdir\n";
|
||||
print "top_srcdir = $top_srcdir\n";
|
||||
print "cwd = " . `pwd` . "\n";
|
||||
print "cwd = " . `$pwdcmd` . "\n";
|
||||
}
|
||||
|
||||
# Copy the file and make substitutions.
|
||||
|
||||
70
build/autoconf/mozprog.m4
Normal file
70
build/autoconf/mozprog.m4
Normal file
@ -0,0 +1,70 @@
|
||||
dnl ***** BEGIN LICENSE BLOCK *****
|
||||
dnl Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
dnl
|
||||
dnl The contents of this file are subject to the Mozilla Public License Version
|
||||
dnl 1.1 (the "License"); you may not use this file except in compliance with
|
||||
dnl the License. You may obtain a copy of the License at
|
||||
dnl http://www.mozilla.org/MPL/
|
||||
dnl
|
||||
dnl Software distributed under the License is distributed on an "AS IS" basis,
|
||||
dnl WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
dnl for the specific language governing rights and limitations under the
|
||||
dnl License.
|
||||
dnl
|
||||
dnl The Original Code is mozilla.org code.
|
||||
dnl
|
||||
dnl The Initial Developer of the Original Code is the
|
||||
dnl Mozilla Foundation <http://www.mozilla.org>
|
||||
dnl
|
||||
dnl Portions created by the Initial Developer are Copyright (C) 2009
|
||||
dnl the Initial Developer. All Rights Reserved.
|
||||
dnl
|
||||
dnl Contributor(s):
|
||||
dnl Benjamin Smedberg
|
||||
dnl
|
||||
dnl Alternatively, the contents of this file may be used under the terms of
|
||||
dnl either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
dnl or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
dnl in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
dnl of those above. If you wish to allow use of your version of this file only
|
||||
dnl under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
dnl use your version of this file under the terms of the MPL, indicate your
|
||||
dnl decision by deleting the provisions above and replace them with the notice
|
||||
dnl and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
dnl the provisions above, a recipient may use your version of this file under
|
||||
dnl the terms of any one of the MPL, the GPL or the LGPL.
|
||||
dnl
|
||||
dnl ***** END LICENSE BLOCK *****
|
||||
|
||||
AC_DEFUN(MOZ_PROG_CHECKMSYS,
|
||||
[AC_REQUIRE([AC_INIT_BINSH])dnl
|
||||
if test `uname -o` = Msys; then
|
||||
msyshost=1
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN(MOZ_PATH_PROG,
|
||||
[ AC_PATH_PROG($1,$2,$3,$4)
|
||||
if test "$msyshost"; then
|
||||
case "[$]$1" in
|
||||
/*)
|
||||
$1="$(cd $(dirname [$]$1) && pwd -W)/$(basename [$]$1)"
|
||||
if test -e "[$]$1.exe"; then
|
||||
$1="[$]$1.exe"
|
||||
fi
|
||||
esac
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN(MOZ_PATH_PROGS,
|
||||
[ AC_PATH_PROGS($1,$2,$3,$4)
|
||||
if test "$msyshost"; then
|
||||
case "[$]$1" in
|
||||
/*)
|
||||
$1="$(cd $(dirname [$]$1) && pwd -W)/$(basename [$]$1)"
|
||||
if test -e "[$]$1.exe"; then
|
||||
$1="[$]$1.exe"
|
||||
fi
|
||||
esac
|
||||
fi
|
||||
])
|
||||
@ -64,6 +64,8 @@ while (<>) {
|
||||
next;
|
||||
}
|
||||
|
||||
$line =~ s|\\|/|g;
|
||||
|
||||
my ($obj,$rest) = split /\s*:\s+/, $line, 2;
|
||||
$line = '';
|
||||
next if !$obj || !$rest;
|
||||
|
||||
@ -81,8 +81,7 @@ endif
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
||||
PWD := $(shell pwd)
|
||||
_VPATH_SRCS = $(if $(filter /%,$<),$<,$(PWD)/$<)
|
||||
_VPATH_SRCS = $(if $(filter /%,$<),$<,$(CURDIR)/$<)
|
||||
else
|
||||
_VPATH_SRCS = $<
|
||||
endif
|
||||
|
||||
53
configure.in
53
configure.in
@ -367,7 +367,7 @@ if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
|
||||
|
||||
AC_CHECK_PROGS(RANLIB, $RANLIB "${target_alias}-ranlib" "${target}-ranlib", :)
|
||||
AC_CHECK_PROGS(AR, $AR "${target_alias}-ar" "${target}-ar", :)
|
||||
AC_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :)
|
||||
MOZ_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :)
|
||||
AC_CHECK_PROGS(LD, $LD "${target_alias}-ld" "${target}-ld", :)
|
||||
AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
|
||||
AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
|
||||
@ -376,7 +376,7 @@ else
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
AC_PROG_RANLIB
|
||||
AC_PATH_PROGS(AS, $AS as, $CC)
|
||||
MOZ_PATH_PROGS(AS, $AS as, $CC)
|
||||
AC_CHECK_PROGS(AR, ar, :)
|
||||
AC_CHECK_PROGS(LD, ld, :)
|
||||
AC_CHECK_PROGS(STRIP, strip, :)
|
||||
@ -743,7 +743,7 @@ dnl Checks for programs.
|
||||
dnl ========================================================
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
AC_PATH_PROGS(PERL, $PERL perl5 perl )
|
||||
MOZ_PATH_PROGS(PERL, $PERL perl5 perl )
|
||||
if test -z "$PERL" || test "$PERL" = ":"; then
|
||||
AC_MSG_ERROR([perl not found in \$PATH])
|
||||
fi
|
||||
@ -769,12 +769,12 @@ else
|
||||
AC_MSG_RESULT([yes])
|
||||
fi
|
||||
|
||||
AC_PATH_PROGS(PYTHON, $PYTHON python)
|
||||
MOZ_PATH_PROGS(PYTHON, $PYTHON python)
|
||||
if test -z "$PYTHON"; then
|
||||
AC_MSG_ERROR([python was not found in \$PATH])
|
||||
fi
|
||||
|
||||
AC_PATH_PROGS(NSINSTALL_BIN, nsinstall )
|
||||
MOZ_PATH_PROGS(NSINSTALL_BIN, nsinstall )
|
||||
if test -z "$COMPILE_ENVIRONMENT"; then
|
||||
if test -z "$NSINSTALL_BIN" || test "$NSINSTALL_BIN" = ":"; then
|
||||
NSINSTALL_BIN='$(PYTHON) $(topsrcdir)/config/nsinstall.py'
|
||||
@ -782,16 +782,16 @@ fi
|
||||
fi
|
||||
AC_SUBST(NSINSTALL_BIN)
|
||||
|
||||
AC_PATH_PROG(DOXYGEN, doxygen, :)
|
||||
AC_PATH_PROG(WHOAMI, whoami, :)
|
||||
AC_PATH_PROG(AUTOCONF, autoconf, :)
|
||||
AC_PATH_PROG(UNZIP, unzip, :)
|
||||
AC_PATH_PROGS(ZIP, zip)
|
||||
MOZ_PATH_PROG(DOXYGEN, doxygen, :)
|
||||
MOZ_PATH_PROG(WHOAMI, whoami, :)
|
||||
MOZ_PATH_PROG(AUTOCONF, autoconf, :)
|
||||
MOZ_PATH_PROG(UNZIP, unzip, :)
|
||||
MOZ_PATH_PROGS(ZIP, zip)
|
||||
if test -z "$ZIP" || test "$ZIP" = ":"; then
|
||||
AC_MSG_ERROR([zip not found in \$PATH])
|
||||
fi
|
||||
AC_PATH_PROG(SYSTEM_MAKEDEPEND, makedepend)
|
||||
AC_PATH_PROG(XARGS, xargs)
|
||||
MOZ_PATH_PROG(SYSTEM_MAKEDEPEND, makedepend)
|
||||
MOZ_PATH_PROG(XARGS, xargs)
|
||||
if test -z "$XARGS" || test "$XARGS" = ":"; then
|
||||
AC_MSG_ERROR([xargs not found in \$PATH .])
|
||||
fi
|
||||
@ -828,7 +828,7 @@ from building Mozilla. Upgrade to Xcode 2.1 or later.])
|
||||
dnl xcodebuild needs GCC_VERSION defined in the environment, since it
|
||||
dnl doesn't respect the CC/CXX setting. With GCC_VERSION set, it will use
|
||||
dnl /usr/bin/g(cc|++)-$GCC_VERSION.
|
||||
AC_PATH_PROGS(PBBUILD, pbbuild xcodebuild pbxbuild)
|
||||
MOZ_PATH_PROGS(PBBUILD, pbbuild xcodebuild pbxbuild)
|
||||
|
||||
case "$PBBUILD" in
|
||||
*xcodebuild*)
|
||||
@ -843,7 +843,7 @@ from building Mozilla. Upgrade to Xcode 2.1 or later.])
|
||||
|
||||
dnl sdp was formerly in /Developer/Tools. As of Mac OS X 10.4 (Darwin 8),
|
||||
dnl it has moved into /usr/bin.
|
||||
AC_PATH_PROG(SDP, sdp, :, [$PATH:/usr/bin:/Developer/Tools])
|
||||
MOZ_PATH_PROG(SDP, sdp, :, [$PATH:/usr/bin:/Developer/Tools])
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -976,10 +976,10 @@ dnl Be sure the make we use is GNU make.
|
||||
dnl on win32, gmake.exe is the generally the wrong version
|
||||
case "$host_os" in
|
||||
cygwin*|mingw*|mks*|msvc*)
|
||||
AC_PATH_PROGS(MAKE, $MAKE make gmake, :)
|
||||
MOZ_PATH_PROGS(MAKE, $MAKE make gmake, :)
|
||||
;;
|
||||
*)
|
||||
AC_PATH_PROGS(MAKE, $MAKE gmake make, :)
|
||||
MOZ_PATH_PROGS(MAKE, $MAKE gmake make, :)
|
||||
;;
|
||||
esac
|
||||
_make_try=`$MAKE --version 2>/dev/null | grep GNU`
|
||||
@ -2225,17 +2225,18 @@ case "$target" in
|
||||
AC_MSG_ERROR([MOZ_TOOLS is not set])
|
||||
fi
|
||||
|
||||
MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd`
|
||||
MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd -W`
|
||||
if test "$?" != "0" || test -z "$MOZ_TOOLS_DIR"; then
|
||||
AC_MSG_ERROR([cd \$MOZ_TOOLS failed. MOZ_TOOLS ==? $MOZ_TOOLS])
|
||||
fi
|
||||
if test `echo ${PATH}: | grep -ic "$MOZ_TOOLS_DIR/bin:"` = 0; then
|
||||
MOZ_TOOLS_BIN_DIR="$(cd "$MOZ_TOOLS_DIR/bin" && pwd)"
|
||||
if test `echo ${PATH}: | grep -ic "$MOZ_TOOLS_BINDIR:"` = 0; then
|
||||
AC_MSG_ERROR([\$MOZ_TOOLS\\bin must be in your path.])
|
||||
fi
|
||||
MOZ_TOOLS_DIR=`$CYGPATH_W $MOZ_TOOLS_DIR | $CYGPATH_S`
|
||||
|
||||
if test -n "$GLIB_PREFIX"; then
|
||||
_GLIB_PREFIX_DIR=`cd $GLIB_PREFIX && pwd`
|
||||
_GLIB_PREFIX_DIR=`cd $GLIB_PREFIX && pwd -W`
|
||||
if test "$?" = "0"; then
|
||||
if test `echo ${PATH}: | grep -ic "$_GLIB_PREFIX_DIR/bin:"` = 0; then
|
||||
AC_MSG_ERROR([GLIB_PREFIX must be in your \$PATH.])
|
||||
@ -2260,7 +2261,7 @@ case "$target" in
|
||||
fi
|
||||
|
||||
if test -n "$LIBIDL_PREFIX"; then
|
||||
_LIBIDL_PREFIX_DIR=`cd $LIBIDL_PREFIX && pwd`
|
||||
_LIBIDL_PREFIX_DIR=`cd $LIBIDL_PREFIX && pwd -W`
|
||||
if test "$?" = "0"; then
|
||||
if test `echo ${PATH}: | grep -ic "$_LIBIDL_PREFIX_DIR/bin:"` = 0; then
|
||||
AC_MSG_ERROR([LIBIDL_PREFIX must be in your \$PATH.])
|
||||
@ -5608,9 +5609,9 @@ if test -n "${MOZ_JAVAXPCOM}"; then
|
||||
JAVA_PATH="$JAVA_HOME/bin:$PATH"
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(JAVA, java, :, [$JAVA_PATH])
|
||||
AC_PATH_PROG(JAVAC, javac, :, [$JAVA_PATH])
|
||||
AC_PATH_PROG(JAR, jar, :, [$JAVA_PATH])
|
||||
MOZ_PATH_PROG(JAVA, java, :, [$JAVA_PATH])
|
||||
MOZ_PATH_PROG(JAVAC, javac, :, [$JAVA_PATH])
|
||||
MOZ_PATH_PROG(JAR, jar, :, [$JAVA_PATH])
|
||||
if test -z "$JAVA" || test "$JAVA" = ":" || test -z "$JAVAC" || test "$JAVAC" = ":" || test -z "$JAR" || test "$JAR" = ":"; then
|
||||
AC_MSG_ERROR([The programs java, javac and jar were not found. Set \$JAVA_HOME to your java sdk directory, use --with-java-bin-path={java-bin-dir}, or reconfigure with --disable-javaxpcom.])
|
||||
fi
|
||||
@ -5907,13 +5908,13 @@ MOZ_ARG_DISABLE_BOOL(installer,
|
||||
if test -n "$MOZ_INSTALLER" -a "$OS_ARCH" = "WINNT"; then
|
||||
# Disable installer for Windows builds that use the new toolkit if NSIS
|
||||
# isn't in the path.
|
||||
AC_PATH_PROGS(MAKENSIS, makensis)
|
||||
MOZ_PATH_PROGS(MAKENSIS, makensis)
|
||||
if test -z "$MAKENSIS" || test "$MAKENSIS" = ":"; then
|
||||
AC_MSG_ERROR([To build the installer makensis is required in your path. To build without the installer reconfigure using --disable-installer.])
|
||||
fi
|
||||
# The Windows build for NSIS requires the iconv command line utility to
|
||||
# convert the charset of the locale files.
|
||||
AC_PATH_PROGS(HOST_ICONV, $HOST_ICONV "iconv", "")
|
||||
MOZ_PATH_PROGS(HOST_ICONV, $HOST_ICONV "iconv", "")
|
||||
if test -z "$HOST_ICONV"; then
|
||||
AC_MSG_ERROR([To build the installer iconv is required in your path. To build without the installer reconfigure using --disable-installer.])
|
||||
fi
|
||||
@ -7428,7 +7429,7 @@ then
|
||||
dnl look for orbit-config instead.
|
||||
dnl
|
||||
if test -z "$_LIBIDL_FOUND" && test -z "$CROSS_COMPILE"; then
|
||||
AC_PATH_PROGS(ORBIT_CONFIG, $ORBIT_CONFIG orbit-config)
|
||||
MOZ_PATH_PROGS(ORBIT_CONFIG, $ORBIT_CONFIG orbit-config)
|
||||
if test -n "$ORBIT_CONFIG"; then
|
||||
AC_MSG_CHECKING([for ORBit libIDL usability])
|
||||
_ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags`
|
||||
|
||||
3
js/src/aclocal.m4
vendored
3
js/src/aclocal.m4
vendored
@ -7,3 +7,6 @@ builtin(include, build/autoconf/pkg.m4)dnl
|
||||
builtin(include, build/autoconf/nspr.m4)dnl
|
||||
builtin(include, build/autoconf/altoptions.m4)dnl
|
||||
builtin(include, build/autoconf/moznbytetype.m4)dnl
|
||||
builtin(include, build/autoconf/mozprog.m4)dnl
|
||||
|
||||
MOZ_PROG_CHECKMSYS()
|
||||
|
||||
@ -44,13 +44,20 @@
|
||||
|
||||
#$debug = 1;
|
||||
|
||||
if ($^O eq 'msys') {
|
||||
$pwdcmd = 'pwd -W';
|
||||
}
|
||||
else {
|
||||
$pwdcmd = 'pwd';
|
||||
}
|
||||
|
||||
# Determine various tree path variables
|
||||
#
|
||||
($topsrcdir, $ptopsrcdir, $depth, @makefiles) = parse_arguments(@ARGV);
|
||||
|
||||
$object_fullpath = `pwd`;
|
||||
$object_fullpath = `$pwdcmd`;
|
||||
chdir $depth;
|
||||
$object_root = `pwd`;
|
||||
$object_root = `$pwdcmd`;
|
||||
chomp $object_fullpath;
|
||||
chomp $object_root;
|
||||
|
||||
@ -257,7 +264,7 @@ sub update_makefiles {
|
||||
print "ac_file_in = $ac_file_in\n";
|
||||
print "srcdir = $srcdir\n";
|
||||
print "top_srcdir = $top_srcdir\n";
|
||||
print "cwd = " . `pwd` . "\n";
|
||||
print "cwd = " . `$pwdcmd` . "\n";
|
||||
}
|
||||
|
||||
# Copy the file and make substitutions.
|
||||
|
||||
70
js/src/build/autoconf/mozprog.m4
Normal file
70
js/src/build/autoconf/mozprog.m4
Normal file
@ -0,0 +1,70 @@
|
||||
dnl ***** BEGIN LICENSE BLOCK *****
|
||||
dnl Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
dnl
|
||||
dnl The contents of this file are subject to the Mozilla Public License Version
|
||||
dnl 1.1 (the "License"); you may not use this file except in compliance with
|
||||
dnl the License. You may obtain a copy of the License at
|
||||
dnl http://www.mozilla.org/MPL/
|
||||
dnl
|
||||
dnl Software distributed under the License is distributed on an "AS IS" basis,
|
||||
dnl WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
dnl for the specific language governing rights and limitations under the
|
||||
dnl License.
|
||||
dnl
|
||||
dnl The Original Code is mozilla.org code.
|
||||
dnl
|
||||
dnl The Initial Developer of the Original Code is the
|
||||
dnl Mozilla Foundation <http://www.mozilla.org>
|
||||
dnl
|
||||
dnl Portions created by the Initial Developer are Copyright (C) 2009
|
||||
dnl the Initial Developer. All Rights Reserved.
|
||||
dnl
|
||||
dnl Contributor(s):
|
||||
dnl Benjamin Smedberg
|
||||
dnl
|
||||
dnl Alternatively, the contents of this file may be used under the terms of
|
||||
dnl either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
dnl or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
dnl in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
dnl of those above. If you wish to allow use of your version of this file only
|
||||
dnl under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
dnl use your version of this file under the terms of the MPL, indicate your
|
||||
dnl decision by deleting the provisions above and replace them with the notice
|
||||
dnl and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
dnl the provisions above, a recipient may use your version of this file under
|
||||
dnl the terms of any one of the MPL, the GPL or the LGPL.
|
||||
dnl
|
||||
dnl ***** END LICENSE BLOCK *****
|
||||
|
||||
AC_DEFUN(MOZ_PROG_CHECKMSYS,
|
||||
[AC_REQUIRE([AC_INIT_BINSH])dnl
|
||||
if test `uname -o` = Msys; then
|
||||
msyshost=1
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN(MOZ_PATH_PROG,
|
||||
[ AC_PATH_PROG($1,$2,$3,$4)
|
||||
if test "$msyshost"; then
|
||||
case "[$]$1" in
|
||||
/*)
|
||||
$1="$(cd $(dirname [$]$1) && pwd -W)/$(basename [$]$1)"
|
||||
if test -e "[$]$1.exe"; then
|
||||
$1="[$]$1.exe"
|
||||
fi
|
||||
esac
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN(MOZ_PATH_PROGS,
|
||||
[ AC_PATH_PROGS($1,$2,$3,$4)
|
||||
if test "$msyshost"; then
|
||||
case "[$]$1" in
|
||||
/*)
|
||||
$1="$(cd $(dirname [$]$1) && pwd -W)/$(basename [$]$1)"
|
||||
if test -e "[$]$1.exe"; then
|
||||
$1="[$]$1.exe"
|
||||
fi
|
||||
esac
|
||||
fi
|
||||
])
|
||||
@ -64,6 +64,8 @@ while (<>) {
|
||||
next;
|
||||
}
|
||||
|
||||
$line =~ s|\\|/|g;
|
||||
|
||||
my ($obj,$rest) = split /\s*:\s+/, $line, 2;
|
||||
$line = '';
|
||||
next if !$obj || !$rest;
|
||||
|
||||
@ -81,8 +81,7 @@ endif
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
||||
PWD := $(shell pwd)
|
||||
_VPATH_SRCS = $(if $(filter /%,$<),$<,$(PWD)/$<)
|
||||
_VPATH_SRCS = $(if $(filter /%,$<),$<,$(CURDIR)/$<)
|
||||
else
|
||||
_VPATH_SRCS = $<
|
||||
endif
|
||||
|
||||
@ -285,7 +285,7 @@ if test "$target" != "$host"; then
|
||||
|
||||
AC_CHECK_PROGS(RANLIB, $RANLIB "${target_alias}-ranlib" "${target}-ranlib", :)
|
||||
AC_CHECK_PROGS(AR, $AR "${target_alias}-ar" "${target}-ar", :)
|
||||
AC_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :)
|
||||
MOZ_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :)
|
||||
AC_CHECK_PROGS(LD, $LD "${target_alias}-ld" "${target}-ld", :)
|
||||
AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
|
||||
AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
|
||||
@ -300,7 +300,7 @@ else
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
AC_PROG_RANLIB
|
||||
AC_PATH_PROGS(AS, $AS as, $CC)
|
||||
MOZ_PATH_PROGS(AS, $AS as, $CC)
|
||||
AC_CHECK_PROGS(AR, ar, :)
|
||||
AC_CHECK_PROGS(LD, ld, :)
|
||||
AC_CHECK_PROGS(STRIP, strip, :)
|
||||
@ -616,7 +616,7 @@ dnl Checks for programs.
|
||||
dnl ========================================================
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
AC_PATH_PROGS(PERL, $PERL perl5 perl )
|
||||
MOZ_PATH_PROGS(PERL, $PERL perl5 perl )
|
||||
if test -z "$PERL" || test "$PERL" = ":"; then
|
||||
AC_MSG_ERROR([perl not found in \$PATH])
|
||||
fi
|
||||
@ -642,12 +642,12 @@ else
|
||||
AC_MSG_RESULT([yes])
|
||||
fi
|
||||
|
||||
AC_PATH_PROGS(PYTHON, $PYTHON python)
|
||||
MOZ_PATH_PROGS(PYTHON, $PYTHON python)
|
||||
if test -z "$PYTHON"; then
|
||||
AC_MSG_ERROR([python was not found in \$PATH])
|
||||
fi
|
||||
|
||||
AC_PATH_PROGS(NSINSTALL_BIN, nsinstall )
|
||||
MOZ_PATH_PROGS(NSINSTALL_BIN, nsinstall )
|
||||
if test -z "$COMPILE_ENVIRONMENT"; then
|
||||
if test -z "$NSINSTALL_BIN" || test "$NSINSTALL_BIN" = ":"; then
|
||||
NSINSTALL_BIN='$(PYTHON) $(topsrcdir)/config/nsinstall.py'
|
||||
@ -655,16 +655,16 @@ fi
|
||||
fi
|
||||
AC_SUBST(NSINSTALL_BIN)
|
||||
|
||||
AC_PATH_PROG(DOXYGEN, doxygen, :)
|
||||
AC_PATH_PROG(WHOAMI, whoami, :)
|
||||
AC_PATH_PROG(AUTOCONF, autoconf, :)
|
||||
AC_PATH_PROG(UNZIP, unzip, :)
|
||||
AC_PATH_PROGS(ZIP, zip)
|
||||
MOZ_PATH_PROG(DOXYGEN, doxygen, :)
|
||||
MOZ_PATH_PROG(WHOAMI, whoami, :)
|
||||
MOZ_PATH_PROG(AUTOCONF, autoconf, :)
|
||||
MOZ_PATH_PROG(UNZIP, unzip, :)
|
||||
MOZ_PATH_PROGS(ZIP, zip)
|
||||
if test -z "$ZIP" || test "$ZIP" = ":"; then
|
||||
AC_MSG_ERROR([zip not found in \$PATH])
|
||||
fi
|
||||
AC_PATH_PROG(SYSTEM_MAKEDEPEND, makedepend)
|
||||
AC_PATH_PROG(XARGS, xargs)
|
||||
MOZ_PATH_PROG(SYSTEM_MAKEDEPEND, makedepend)
|
||||
MOZ_PATH_PROG(XARGS, xargs)
|
||||
if test -z "$XARGS" || test "$XARGS" = ":"; then
|
||||
AC_MSG_ERROR([xargs not found in \$PATH .])
|
||||
fi
|
||||
@ -701,7 +701,7 @@ from building Mozilla. Upgrade to Xcode 2.1 or later.])
|
||||
dnl xcodebuild needs GCC_VERSION defined in the environment, since it
|
||||
dnl doesn't respect the CC/CXX setting. With GCC_VERSION set, it will use
|
||||
dnl /usr/bin/g(cc|++)-$GCC_VERSION.
|
||||
AC_PATH_PROGS(PBBUILD, pbbuild xcodebuild pbxbuild)
|
||||
MOZ_PATH_PROGS(PBBUILD, pbbuild xcodebuild pbxbuild)
|
||||
|
||||
case "$PBBUILD" in
|
||||
*xcodebuild*)
|
||||
@ -716,7 +716,7 @@ from building Mozilla. Upgrade to Xcode 2.1 or later.])
|
||||
|
||||
dnl sdp was formerly in /Developer/Tools. As of Mac OS X 10.4 (Darwin 8),
|
||||
dnl it has moved into /usr/bin.
|
||||
AC_PATH_PROG(SDP, sdp, :, [$PATH:/usr/bin:/Developer/Tools])
|
||||
MOZ_PATH_PROG(SDP, sdp, :, [$PATH:/usr/bin:/Developer/Tools])
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -849,10 +849,10 @@ dnl Be sure the make we use is GNU make.
|
||||
dnl on win32, gmake.exe is the generally the wrong version
|
||||
case "$host_os" in
|
||||
cygwin*|mingw*|mks*|msvc*)
|
||||
AC_PATH_PROGS(MAKE, $MAKE make gmake, :)
|
||||
MOZ_PATH_PROGS(MAKE, $MAKE make gmake, :)
|
||||
;;
|
||||
*)
|
||||
AC_PATH_PROGS(MAKE, $MAKE gmake make, :)
|
||||
MOZ_PATH_PROGS(MAKE, $MAKE gmake make, :)
|
||||
;;
|
||||
esac
|
||||
_make_try=`$MAKE --version 2>/dev/null | grep GNU`
|
||||
|
||||
@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = crash_generation
|
||||
LIBRARY_NAME = crash_generation_s
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../../..
|
||||
LOCAL_INCLUDES = -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src
|
||||
DEFINES += -DUNICODE -D_UNICODE
|
||||
|
||||
#XXX: We're not currently building the other parts,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user