File config.diff of Package smlnj

--- _arch-n-opsys
+++ _arch-n-opsys
@@ -97,8 +97,8 @@ case `uname -s` in
 	;;
     # As long as we do not natively support the amd64 architecture,
     # we should fallback to the x86 compatibility mode.  --Stef
-      x86_64) ARCH=x86;;
-      ppc)
+      x86_64 | ia64) ARCH=x86;;
+      ppc|ppc64)
 	ARCH=ppc
 	case `uname -r` in
 	  *osfmach*) OPSYS=mklinux ;;
--- _link-sml
+++ _link-sml
@@ -21,12 +21,18 @@ unset ENV
 # the path of the directory in which executables (like this file) are kept.
 if [ x"$SMLNJ_HOME" = x ] ; then
     BIN_DIR="@BINDIR@"
+    LIB_DIR="@LIBDIR@"
     if [ ! -d "$BIN_DIR" ]; then
 	cmddir=`dirname $0`
 	case "$cmddir" in
 	    /* ) BIN_DIR="$cmddir";;
 	    * ) BIN_DIR=`cd $cmddir; pwd` ;;
 	esac
+	LIB_DIR=`cd $BIN_DIR/../lib; pwd`
+    fi
+    if [ x"$CM_PATHCONFIG" = x ] ; then
+	CM_PATHCONFIG=${LIB_DIR}/pathconfig
+	export CM_PATHCONFIG
     fi
 else
     if [ x"$CM_PATHCONFIG" = x ] ; then
--- _ml-makedepend
+++ _ml-makedepend
@@ -2,6 +2,11 @@
 
 if [ x${SMLNJ_HOME} = x ] ; then
     BIN_DIR="@BINDIR@"
+    LIB_DIR="@LIBDIR@"
+    if [ x"$CM_PATHCONFIG" = x ] ; then
+	CM_PATHCONFIG=${LIB_DIR}/pathconfig
+	export CM_PATHCONFIG
+    fi
 else
     if [ x${CM_PATHCONFIG} = x ] ; then
 	CM_PATHCONFIG=${SMLNJ_HOME}/lib/pathconfig
--- _run-sml
+++ _run-sml
@@ -33,12 +33,18 @@ fi
 # the path of the directory in which executables (like this file) are kept.
 if [ x"$SMLNJ_HOME" = x ] ; then
     BIN_DIR="@BINDIR@"
+    LIB_DIR="@LIBDIR@"
     if [ ! -d "$BIN_DIR" ]; then
 	cmddir=`dirname "$0"`
 	case "$cmddir" in
 	    /* ) BIN_DIR="$cmddir";;
 	    * ) BIN_DIR=`cd $cmddir; pwd` ;;
 	esac
+	LIB_DIR=`cd $BIN_DIR/../lib; pwd`
+    fi
+    if [ x"$CM_PATHCONFIG" = x ] ; then
+	CM_PATHCONFIG=${LIB_DIR}/pathconfig
+	export CM_PATHCONFIG
     fi
 else
     if [ x"$CM_PATHCONFIG" = x ] ; then
--- install.sh
+++ install.sh
@@ -319,7 +319,7 @@ else
     "$CONFIGDIR"/unpack "$ROOT" runtime
     cd "$BASEDIR"/runtime/objs
     echo $this: Compiling the run-time system.
-    $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
+    $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS CFLAGS="${CFLAGS:--O2}"
     if [ -x run.$ARCH-$OPSYS ]; then
 	mv run.$ARCH-$OPSYS "$RUNDIR"
 	if [ -f runx.$ARCH-$OPSYS ]; then
--- preloads
+++ preloads
@@ -22,13 +22,13 @@ autoload $smlnj/smlnj-lib/smlnj-lib.cm
 ##################### ADDITIONAL LIBRARIES ############################
 
 # The "Pretty-Printing" portion of the SML/NJ library
-#autoload $smlnj/smlnj-lib/pp-lib.cm
+autoload $smlnj/smlnj-lib/pp-lib.cm
 
 # The "Configurable Controls" portion of the SML/NJ library
-#autoload $smlnj/smlnj-lib/controls-lib.cm
+autoload $smlnj/smlnj-lib/controls-lib.cm
 
 # The "HTML" portion of the SML/NJ library
-#autoload $smlnj/smlnj-lib/html-lib.cm
+autoload $smlnj/smlnj-lib/html-lib.cm
 
 
 ################## FOR SML/NJ COMPILER HACKERS ########################
--- targets
+++ targets
@@ -91,7 +91,7 @@ request ml-lpt-lib
 
 # build ML-Burg
 #
-#request ml-burg
+request ml-burg
 
 # pre-compile and install the remaining components of the SML/NJ library
 # (everything except smlnj-lib.cm, aka Util, itself)
@@ -100,7 +100,7 @@ request smlnj-lib
 
 # pre-compile and install CM "portable graph" utility library
 #
-#request pgraph-util
+request pgraph-util
 
 # pre-compile and install "Trace-Debug-Profile" utility library
 # (provides simple back-trace- and coverage facilities)
@@ -120,7 +120,7 @@ request cml-lib
 # pre-compile and install eXene, which is a library for X-Windows programming.
 # EXene requires CML.
 #
-#request eXene
+request eXene
 
 # pre-compile (certain) parts of MLRISC that are not already part of the SML/NJ
 # compiler itself
@@ -155,7 +155,7 @@ request mlrisc
 # This library is for parsing and pretty printing SML code.
 # It's used by various MLRISC code generator generator.
 #
-#request mlrisc-tools
+request mlrisc-tools
 
 # Build and install the 'nowhere' program translator.
 # This tool translates programs with conditional patterns (where clauses) 
@@ -163,7 +163,7 @@ request mlrisc
 # (bad) documentation.
 # (Requires the mlrisc-tools library!)
 #
-#request nowhere
+request nowhere
 
 # Build and install 'heap2asm' - an experimental component of
 # a new facility for producing true stand-alone executables.