diff -NurB SashXB-1.0.1/configure SashXB-1.0.1-new/configure --- SashXB-1.0.1/configure 2002-06-20 12:37:03.000000000 -0500 +++ SashXB-1.0.1-new/configure 2002-06-24 21:00:07.000000000 -0500 @@ -1841,10 +1841,17 @@ else #we're using whatever comes from the rpms - MOZILLA_INCLUDE_DIR="`mozilla-config --cflags | cut -d " " -f 1 | perl -ne \"s/^..//;print;\"`" - MOZILLA_LIB_DIR="`mozilla-config --libs | perl -ne \"s/..(.*)/\1/;print;\"`" + if [ -x /usr/lib/mozilla/mozilla-config ] + then + MOZ_CONFIG='/usr/lib/mozilla/mozilla-config' + else + MOZ_CONFIG='mozilla-config' + fi + + MOZILLA_INCLUDE_DIR="`$MOZ_CONFIG --cflags | cut -d " " -f 1 | perl -ne \"s/^..//;print;\"`" + MOZILLA_LIB_DIR="`$MOZ_CONFIG --libs | perl -ne \"s/..(.*)/\1/;print;\"`" MOZILLA_BIN_DIR="/usr/bin" - MOZILLA_IDL_DIR="`mozilla-config --cflags | cut -d " " -f 1 | perl -ne \"s/^..//;s/include/share\/idl/;print;\"`" + MOZILLA_IDL_DIR="`$MOZ_CONFIG --cflags | cut -d " " -f 1 | perl -ne \"s/^..//;s/include/share\/idl/;print;\"`" if ! test -f $MOZILLA_IDL_DIR/nsISupports.idl; then MOZILLA_IDL_DIR="/usr/share/idl/mozilla" fi diff -NurB SashXB-1.0.1/sashmacros/mozilla.m4 SashXB-1.0.1-new/sashmacros/mozilla.m4 --- SashXB-1.0.1/sashmacros/mozilla.m4 2002-06-20 12:36:56.000000000 -0500 +++ SashXB-1.0.1-new/sashmacros/mozilla.m4 2002-06-24 21:09:27.000000000 -0500 @@ -14,10 +14,17 @@ MOZILLA_IDL_DIR="$withval/idl" ], [ #we're using whatever comes from the rpms - MOZILLA_INCLUDE_DIR="`mozilla-config --cflags | cut -d " " -f 1 | perl -ne \"s/^..//;print;\"`" - MOZILLA_LIB_DIR="`mozilla-config --libs | perl -ne \"s/..(.*)/\1/;print;\"`" + if [ -x /usr/lib/mozilla/mozilla-config ] + then + MOZ_CONFIG='/usr/lib/mozilla/mozilla-config' + else + MOZ_CONFIG='mozilla-config' + fi + + MOZILLA_INCLUDE_DIR="`$MOZ_CONFIG --cflags | cut -d " " -f 1 | perl -ne \"s/^..//;print;\"`" + MOZILLA_LIB_DIR="`$MOZ_CONFIG --libs | perl -ne \"s/..(.*)/\1/;print;\"`" MOZILLA_BIN_DIR="/usr/bin" - MOZILLA_IDL_DIR="`mozilla-config --cflags | cut -d " " -f 1 | perl -ne \"s/^..//;s/include/share\/idl/;print;\"`" + MOZILLA_IDL_DIR="`$MOZ_CONFIG --cflags | cut -d " " -f 1 | perl -ne \"s/^..//;s/include/share\/idl/;print;\"`" if ! test -f $MOZILLA_IDL_DIR/nsISupports.idl; then MOZILLA_IDL_DIR="/usr/share/idl/mozilla" fi diff -NurB SashXB-1.0.1/tools/sash-loader.sh SashXB-1.0.1-new/tools/sash-loader.sh --- SashXB-1.0.1/tools/sash-loader.sh 2002-06-20 12:36:39.000000000 -0500 +++ SashXB-1.0.1-new/tools/sash-loader.sh 2002-06-24 21:07:32.000000000 -0500 @@ -39,10 +39,17 @@ dist_moz=$sashdir/mozilla-bin local_components=$sashdir/components -mozilla_config=`which mozilla-config` +if [ -x /usr/lib/mozilla/mozilla-config ] +then + MOZ_CONFIG='/usr/lib/mozilla/mozilla-config' +else + MOZ_CONFIG='mozilla-config' +fi + +mozilla_config=$MOZ_CONFIG if [ "$mozilla_config" != "" ]; then - mozilla_config_dir=`mozilla-config --libs | perl -ne 's/..(.*)/\1/;print;'` + mozilla_config_dir=`$MOZ_CONFIG --libs | perl -ne 's/..(.*)/\1/;print;'` fi if test -n "$MOZILLA_FIVE_HOME"; then