--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6,20 +6,17 @@ dnl
builtin(include, mozilla/build/autoconf/glib.m4)dnl
builtin(include, mozilla/build/autoconf/libIDL.m4)dnl
builtin(include, mozilla/build/autoconf/nspr.m4)dnl
builtin(include, mozilla/build/autoconf/nss.m4)dnl
builtin(include, mozilla/build/autoconf/pkg.m4)dnl
builtin(include, mozilla/build/autoconf/freetype2.m4)dnl
builtin(include, mozilla/build/autoconf/codeset.m4)dnl
builtin(include, mozilla/build/autoconf/altoptions.m4)dnl
-builtin(include, mozilla/build/autoconf/mozprog.m4)dnl
dnl use mozilla/build below when we drop support for MOZILLA_1_9_2_BRANCH
builtin(include, build/autoconf/acwinpaths.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
# expanded from configure.in, and we need to get the configure options
# from .mozconfig in place before that argument parsing code.
MOZ_READ_MOZCONFIG(mozilla)
--- a/configure.in
+++ b/configure.in
@@ -78,17 +78,17 @@ dnl comm-central-specific options
dnl (MOZILLA_SRCDIR would fit here, but is needed to find autoconf tools)
COMM_BUILD=1
AC_SUBST(COMM_BUILD)
dnl export this, so the var is set for mozilla/configure
MOZCONFIG=`$_AUTOCONF_TOOLS_DIR/mozconfig-find $topsrcdir`
export MOZCONFIG
dnl Check for Perl first -- needed for win32 SDK checks
-MOZ_PATH_PROGS(PERL, $PERL perl5 perl)
+AC_PATH_PROGS(PERL, $PERL perl5 perl)
if test -z "$PERL" || test "$PERL" = ":"; then
AC_MSG_ERROR([perl not found in \$PATH])
fi
dnl Get mozilla version from central milestone file
MOZILLA_VERSION=`$PERL $MOZILLA_SRCDIR/config/milestone.pl -topsrcdir $MOZILLA_SRCDIR`
@@ -425,26 +425,26 @@ if test -n "$CROSS_COMPILE" && test "$ta
dnl (see --with-macos-sdk below).
CFLAGS=$_SAVE_CFLAGS
CXXFLAGS=$_SAVE_CXXFLAGS
;;
esac
AC_CHECK_PROGS(RANLIB, $RANLIB "${target_alias}-ranlib" "${target}-ranlib", :)
AC_CHECK_PROGS(AR, $AR "${target_alias}-ar" "${target}-ar", :)
- MOZ_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :)
+ AC_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", :)
AC_DEFINE(CROSS_COMPILE)
else
AC_PROG_CC
AC_PROG_CXX
AC_PROG_RANLIB
- MOZ_PATH_PROGS(AS, $AS as, $CC)
+ AC_PATH_PROGS(AS, $AS as, $CC)
AC_CHECK_PROGS(AR, ar, :)
AC_CHECK_PROGS(LD, ld, :)
AC_CHECK_PROGS(STRIP, strip, :)
AC_CHECK_PROGS(WINDRES, windres, :)
if test -z "$HOST_CC"; then
HOST_CC='$CC'
fi
if test -z "$HOST_CFLAGS"; then
@@ -857,36 +857,36 @@ AC_MSG_CHECKING([for full perl installat
_perl_res=$?
if test "$_perl_res" != 0; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([Cannot find Config.pm or \$Config{archlib}. A full perl installation is required.])
else
AC_MSG_RESULT([yes])
fi
-MOZ_PATH_PROGS(PYTHON, $PYTHON python2.6 python2.5 python2.4 python)
+AC_PATH_PROGS(PYTHON, $PYTHON python2.6 python2.5 python2.4 python)
if test -z "$PYTHON"; then
AC_MSG_ERROR([python was not found in \$PATH])
fi
if test -z "$COMPILE_ENVIRONMENT"; then
NSINSTALL_BIN='$(PYTHON) $(MOZILLA_SRCDIR)/config/nsinstall.py'
fi
AC_SUBST(NSINSTALL_BIN)
-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)
+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)
if test -z "$ZIP" || test "$ZIP" = ":"; then
AC_MSG_ERROR([zip not found in \$PATH])
fi
-MOZ_PATH_PROG(SYSTEM_MAKEDEPEND, makedepend)
-MOZ_PATH_PROG(XARGS, xargs)
+AC_PATH_PROG(SYSTEM_MAKEDEPEND, makedepend)
+AC_PATH_PROG(XARGS, xargs)
if test -z "$XARGS" || test "$XARGS" = ":"; then
AC_MSG_ERROR([xargs not found in \$PATH .])
fi
if test "$COMPILE_ENVIRONMENT"; then
dnl ========================================================
dnl = Mac OS X toolchain support
@@ -913,32 +913,32 @@ darwin*)
This compiler was supplied with Xcode 2.0, and contains bugs that prevent it
from building Mozilla. Upgrade to Xcode 2.1 or later.])
fi
fi
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.
- MOZ_PATH_PROGS(PBBUILD, pbbuild xcodebuild pbxbuild)
+ AC_PATH_PROGS(PBBUILD, pbbuild xcodebuild pbxbuild)
case "$PBBUILD" in
*xcodebuild*)
changequote(,)
XCODEBUILD_VERSION=`$PBBUILD -version 2>/dev/null | xargs | sed -e 's/.*DevToolsCore-\([0-9]*\).*/\1/'`
changequote([,])
if test -n "$XCODEBUILD_VERSION" && test "$XCODEBUILD_VERSION" -ge 620 ; then
HAS_XCODE_2_1=1;
fi
;;
esac
dnl sdp was formerly in /Developer/Tools. As of Mac OS X 10.4 (Darwin 8),
dnl it has moved into /usr/bin.
- MOZ_PATH_PROG(SDP, sdp, :, [$PATH:/usr/bin:/Developer/Tools])
+ AC_PATH_PROG(SDP, sdp, :, [$PATH:/usr/bin:/Developer/Tools])
;;
esac
AC_SUBST(GCC_VERSION)
AC_SUBST(XCODEBUILD_VERSION)
AC_SUBST(HAS_XCODE_2_1)
dnl The universal machinery sets UNIVERSAL_BINARY to inform packager.mk
@@ -1050,20 +1050,20 @@ tools are selected during the Xcode/Deve
fi
fi
fi # COMPILE_ENVIRONMENT
# Keep this 'case' until bug 492026 is fixed.
case "$host_os" in
cygwin*|mingw*|mks*|msvc*)
- MOZ_PATH_PROGS(MAKE, $MAKE make gmake, :)
+ AC_PATH_PROGS(MAKE, $MAKE make gmake, :)
;;
*)
- MOZ_PATH_PROGS(MAKE, $MAKE gmake make, :)
+ AC_PATH_PROGS(MAKE, $MAKE gmake make, :)
;;
esac
if test "$COMPILE_ENVIRONMENT"; then
AC_PATH_XTRA
XCFLAGS="$X_CFLAGS"
@@ -2333,28 +2333,27 @@ fi
esac
case "$host" in
*-mingw*|*-cygwin*|*-msvc*|*-mks*)
if test -z "$MOZ_TOOLS"; then
AC_MSG_ERROR([MOZ_TOOLS is not set])
fi
- MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd -W`
+ MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd`
if test "$?" != "0" || test -z "$MOZ_TOOLS_DIR"; then
AC_MSG_ERROR([cd \$MOZ_TOOLS failed. MOZ_TOOLS ==? $MOZ_TOOLS])
fi
- MOZ_TOOLS_BIN_DIR="$(cd "$MOZ_TOOLS_DIR/bin" && pwd)"
- if test `echo ${PATH}: | grep -ic "$MOZ_TOOLS_BINDIR:"` = 0; then
+ if test `echo ${PATH}: | grep -ic "$MOZ_TOOLS_DIR/bin:"` = 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 -W`
+ _GLIB_PREFIX_DIR=`cd $GLIB_PREFIX && pwd`
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.])
fi
_GLIB_PREFIX_DIR=`$CYGPATH_W $_GLIB_PREFIX_DIR | $CYGPATH_S`
else
AC_MSG_ERROR([GLIB_PREFIX is set but "${GLIB_PREFIX}" is not a directory.])
fi
@@ -5571,23 +5570,23 @@ esac
MOZ_ARG_DISABLE_BOOL(installer,
[ --disable-installer Disable building of installer],
MOZ_INSTALLER=,
MOZ_INSTALLER=1 )
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.
- MOZ_PATH_PROGS(MAKENSIS, makensis)
+ AC_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.
- MOZ_PATH_PROGS(HOST_ICONV, $HOST_ICONV "iconv", "")
+ AC_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
fi
# Automatically disable installer if xpinstall isn't built
if test -z "$MOZ_XPINSTALL"; then
MOZ_INSTALLER=