--- configure.orig	Tue Dec  9 18:13:38 1997
+++ configure	Tue Dec 23 21:46:31 1997
@@ -13,9 +13,9 @@
 
 # $Id: patch-aa,v 1.1 1998/02/21 15:49:36 steve Exp $
 
-bindir=/usr/local/bin
-libdir=/usr/local/lib/ocaml
-mandir=/usr/local/man/man1
+bindir='${PREFIX}/bin'
+libdir='${PREFIX}/lib/ocaml'
+mandir='${PREFIX}/man/man1'
 manext=1
 host_type=unknown
 cc=''
@@ -35,7 +35,7 @@
         libdir=$2; shift;;
     -mandir|--mandir)
         mandir=$2
-        manext=`echo $mandir | sed -e 's/^.*\(.\)$/\1/'`
+        manext=`eval echo $mandir | sed -e 's/^.*\(.\)$/\1/'`
         shift;;
     -host*|--host*)
         host_type=$2; shift;;
@@ -56,15 +56,15 @@
 
 # Sanity checks
 
-case "$bindir" in
+case "`eval echo $bindir`" in
   /*) ;;
    *) echo "The -bindir directory must be absolute." 1>&2; exit 2;;
 esac
-case "$libdir" in
+case "`eval echo $libdir`" in
   /*) ;;
    *) echo "The -libdir directory must be absolute." 1>&2; exit 2;;
 esac
-case "$mandir" in
+case "`eval echo $mandir`" in
   /*) ;;
    *) echo "The -mandir directory must be absolute." 1>&2; exit 2;;
 esac
@@ -110,6 +110,8 @@
 
 # Check for buggy versions of GCC
 
+if [ ! "${BATCH}" ]; then
+
 case "$host,$cc" in
   i[3456]86-*-*,gcc*)
     case `$cc --version` in
@@ -132,6 +134,8 @@
     esac;;
 esac
 
+fi
+
 # Configure the bytecode compiler
 
 bytecc="$cc"
@@ -338,9 +342,9 @@
   echo "#! appears to work in shell scripts"
   case "$host" in
     *-*-sunos*)
-      if test `echo $bindir/ocamlrun | wc -c` -gt 32; then
+      if test `eval echo $bindir/ocamlrun | wc -c` -gt 32; then
         echo "We won't use it, though, because the path"
-        echo "      $bindir/ocamlrun"
+        eval echo "      $bindir/ocamlrun"
         echo "is too long (more than 32 characters -- some kernels don't support this)"
         echo "SHARPBANGSCRIPTS=false" >> Makefile
       else
@@ -620,14 +624,14 @@
 x11_link="not found"
 
 for dir in $x11_include_dir \
-  /usr/X11R6/include /usr/X11R5/include /usr/X11R4/include \
+  ${X11BASE}/include /usr/X11R5/include /usr/X11R4/include \
   /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 \
-  /usr/local/X11R6/include /usr/local/X11R5/include /usr/local/X11R4/include \
-  /usr/local/include/X11R6 /usr/local/include/X11R5 /usr/local/include/X11R4 \
-  /usr/X11/include /usr/include/X11 /usr/local/X11/include \
-  /usr/local/include/X11 /usr/X386/include /usr/x386/include \
-  /usr/XFree86/include/X11 /usr/include /usr/local/include \
-  /usr/unsupported/include /usr/athena/include /usr/local/x11r5/include \
+  ${PREFIX}/X11R6/include ${PREFIX}/X11R5/include ${PREFIX}/X11R4/include \
+  ${PREFIX}/include/X11R6 ${PREFIX}/include/X11R5 ${PREFIX}/include/X11R4 \
+  /usr/X11/include /usr/include/X11 ${PREFIX}/X11/include \
+  ${PREFIX}/include/X11 /usr/X386/include /usr/x386/include \
+  /usr/XFree86/include/X11 /usr/include ${PREFIX}/include \
+  /usr/unsupported/include /usr/athena/include ${PREFIX}/x11r5/include \
   /usr/lpp/Xamples/include /usr/openwin/include /usr/openwin/share/include \
   /opt/X11R6/include /opt/X11R5/include
 do
@@ -638,14 +642,14 @@
 done
 
 for dir in $x11_lib_dir \
-  /usr/X11R6/lib /usr/X11R5/lib /usr/X11R4/lib \
+  ${X11BASE}/lib /usr/X11R5/lib /usr/X11R4/lib \
   /usr/lib/X11R6 /usr/lib/X11R5 /usr/lib/X11R4 \
-  /usr/local/X11R6/lib /usr/local/X11R5/lib /usr/local/X11R4/lib \
-  /usr/local/lib/X11R6 /usr/local/lib/X11R5 /usr/local/lib/X11R4 \
-  /usr/X11/lib /usr/lib/X11 /usr/local/X11/lib \
-  /usr/local/lib/X11 /usr/X386/lib /usr/x386/lib \
-  /usr/XFree86/lib/X11 /usr/lib /usr/local/lib \
-  /usr/unsupported/lib /usr/athena/lib /usr/local/x11r5/lib \
+  ${PREFIX}/X11R6/lib ${PREFIX}/X11R5/lib ${PREFIX}/X11R4/lib \
+  ${PREFIX}/lib/X11R6 ${PREFIX}/lib/X11R5 ${PREFIX}/lib/X11R4 \
+  /usr/X11/lib /usr/lib/X11 ${PREFIX}/X11/lib \
+  ${PREFIX}/lib/X11 /usr/X386/lib /usr/x386/lib \
+  /usr/XFree86/lib/X11 /usr/lib ${PREFIX}/lib \
+  /usr/unsupported/lib /usr/athena/lib ${PREFIX}/x11r5/lib \
   /usr/lpp/Xamples/lib /usr/openwin/lib /usr/openwin/share/lib \
   /opt/X11R6/lib /opt/X11R5/lib
 do
@@ -701,9 +705,9 @@
 echo "** Configuration summary **"
 echo
 echo "Directories where Objective Caml will be installed:"
-echo "	binaries.................. $bindir"
-echo "	standard library.......... $libdir"
-echo "	manual pages.............. $mandir (with extension .$manext)"
+eval echo "	binaries.................. $bindir"
+eval echo "	standard library.......... $libdir"
+echo "	manual pages.............. `eval echo $mandir` (with extension .$manext)"
 
 echo "Configuration for the bytecode compiler:"
 echo "	C compiler used........... $bytecc"
