From eddc5fef3f6837e09dd6a610787bc50c15ce2aa6 Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com" <seawood%netscape.com>
Date: Tue, 5 Feb 2002 06:01:58 +0000
Subject: [PATCH] Since we build a program called nsinstall in the tree, make
 sure that uwe use the full path to the nsinstall.exe found in wintools.zip.
 Bug #123294 r=bryner

---
 config/autoconf.mk.in |  1 +
 config/config.mk      |  4 ++++
 configure             | 18 ++++++++++--------
 configure.in          | 15 ++++++++-------
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 907fd1288b0a..9eac40ff14e3 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -376,3 +376,4 @@ MOZ_PROFILE	= @MOZ_PROFILE@
 MOZ_COVERAGE	= @MOZ_COVERAGE@
 MOZ_MAPINFO	= @MOZ_MAPINFO@
 MOZ_BROWSE_INFO	= @MOZ_BROWSE_INFO@
+MOZ_TOOLS_DIR	= @MOZ_TOOLS_DIR@
diff --git a/config/config.mk b/config/config.mk
index 4f8e4341b9a6..3c76d758a08e 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -714,7 +714,11 @@ endif
 GARBAGE		+= $(DEPENDENCIES) $(MKDEPENDENCIES) $(MKDEPENDENCIES).bak core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB
 
 ifeq (,$(filter-out WINNT, $(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
+NSINSTALL	= $(MOZ_TOOLS_DIR)/bin/nsinstall
+else
 NSINSTALL	= nsinstall
+endif
 INSTALL		= $(NSINSTALL)
 else
 NSINSTALL	= $(CONFIG_TOOLS)/nsinstall
diff --git a/configure b/configure
index e315a9e49ac6..3e0535ed4fda 100755
--- a/configure
+++ b/configure
@@ -2816,7 +2816,7 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4773,15 +4773,15 @@ EOF
     fi
 
     if test "$MOZ_TOOLS"; then
-        _MOZTOOLS=`cd $MOZ_TOOLS && pwd`
-        if test "$?" != "0" || test -z "$_MOZTOOLS"; then
+        MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd`
+        if test "$?" != "0" || test -z "$MOZ_TOOLS_DIR"; then
             { echo "configure: error: cd \$MOZ_TOOLS failed. MOZ_TOOLS ==? $MOZ_TOOLS" 1>&2; exit 1; }
         fi
-        _MOZTOOLS=`echo $_MOZTOOLS | sed -e 's|^/cygdrive/||' -e 's|/|:/|'`
-        GLIB_CFLAGS="-I${_MOZTOOLS}/include"
-        GLIB_LIBS="${_MOZTOOLS}/lib/glib-1.2.lib"
-        LIBIDL_CFLAGS="-I${_MOZTOOLS}/include"
-        LIBIDL_LIBS="${_MOZTOOLS}/lib/libidl-0.6.lib ${_MOZTOOLS}/lib/glib-1.2.lib"
+        MOZ_TOOLS_DIR=`echo $MOZ_TOOLS_DIR | sed -e 's|^/cygdrive/||' -e 's|/|:/|'`
+        GLIB_CFLAGS='-I$(MOZ_TOOLS_DIR)/include'
+        GLIB_LIBS='$(MOZ_TOOLS_DIR)/lib/glib-1.2.lib'
+        LIBIDL_CFLAGS='-I$(MOZ_TOOLS_DIR)/include'
+        LIBIDL_LIBS='$(MOZ_TOOLS_DIR)/lib/libidl-0.6.lib $(MOZ_TOOLS_DIR)/lib/glib-1.2.lib'
    else
         { echo "configure: error: MOZ_TOOLS is not set" 1>&2; exit 1; }
     fi
@@ -13044,6 +13044,7 @@ EOF
 
 
 
+
 
 
 if test "$MOZ_BYPASS_PROFILE_AT_STARTUP"; then
@@ -13661,6 +13662,7 @@ s%@MOZ_PROFILE@%$MOZ_PROFILE%g
 s%@MOZ_COVERAGE@%$MOZ_COVERAGE%g
 s%@MOZ_MAPINFO@%$MOZ_MAPINFO%g
 s%@MOZ_BROWSE_INFO@%$MOZ_BROWSE_INFO%g
+s%@MOZ_TOOLS_DIR@%$MOZ_TOOLS_DIR%g
 s%@SYSTEM_JPEG@%$SYSTEM_JPEG%g
 s%@SYSTEM_PNG@%$SYSTEM_PNG%g
 s%@SYSTEM_MNG@%$SYSTEM_MNG%g
diff --git a/configure.in b/configure.in
index 630fb333c5a9..3752ec756016 100644
--- a/configure.in
+++ b/configure.in
@@ -966,15 +966,15 @@ case "$target" in
     fi
 
     if test "$MOZ_TOOLS"; then
-        _MOZTOOLS=`cd $MOZ_TOOLS && pwd`
-        if test "$?" != "0" || test -z "$_MOZTOOLS"; then
+        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
-        _MOZTOOLS=`echo $_MOZTOOLS | sed -e 's|^/cygdrive/||' -e 's|/|:/|'`
-        GLIB_CFLAGS="-I${_MOZTOOLS}/include"
-        GLIB_LIBS="${_MOZTOOLS}/lib/glib-1.2.lib"
-        LIBIDL_CFLAGS="-I${_MOZTOOLS}/include"
-        LIBIDL_LIBS="${_MOZTOOLS}/lib/libidl-0.6.lib ${_MOZTOOLS}/lib/glib-1.2.lib"
+        MOZ_TOOLS_DIR=`echo $MOZ_TOOLS_DIR | sed -e 's|^/cygdrive/||' -e 's|/|:/|'`
+        GLIB_CFLAGS='-I$(MOZ_TOOLS_DIR)/include'
+        GLIB_LIBS='$(MOZ_TOOLS_DIR)/lib/glib-1.2.lib'
+        LIBIDL_CFLAGS='-I$(MOZ_TOOLS_DIR)/include'
+        LIBIDL_LIBS='$(MOZ_TOOLS_DIR)/lib/libidl-0.6.lib $(MOZ_TOOLS_DIR)/lib/glib-1.2.lib'
    else
         AC_MSG_ERROR([MOZ_TOOLS is not set])
     fi
@@ -4213,6 +4213,7 @@ AC_SUBST(MOZ_PROFILE)
 AC_SUBST(MOZ_COVERAGE)
 AC_SUBST(MOZ_MAPINFO)
 AC_SUBST(MOZ_BROWSE_INFO)
+AC_SUBST(MOZ_TOOLS_DIR)
 
 dnl Disable profile at startup, hack for tinderbox.
 if test "$MOZ_BYPASS_PROFILE_AT_STARTUP"; then