* config-ml.in (CC, CXX): Avoid trailing whitespace.

(LD_LIBRARY_PATH, SHLIB_PATH): Adjust for multilibs and export to
sub-configures.

diff --git a/ChangeLog b/ChangeLog
index 13546c040b7e8456cf8b98604c788223c3cbab11..ec81736f0023794cbdfd8420d1a4ec9a86fdde66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-22  Alexandre Oliva  <aoliva@redhat.com>
+
+       * config-ml.in (CC, CXX): Avoid trailing whitespace.
+       (LD_LIBRARY_PATH, SHLIB_PATH): Adjust for multilibs and export to
+       sub-configures.
+
 2000-08-20  Doug Evans  <dje@casey.transmeta.com>
 
        * Makefile.in (ALL_MODULES): Add all-cgen.

diff --git a/config-ml.in b/config-ml.in
index d4e7fe63bae8e3f214b217c88a09aed017fa8ada..c968bf0d71918eaaa41665555836e0aa030475f2 100644 (file)
--- a/config-ml.in
+++ b/config-ml.in
@@ -753,11 +753,11 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
         break
       fi
     done
-    ml_config_env='CC="${CC_} $flags" CXX="${CXX_} $flags"'
+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags"'
 
     if [ "${with_target_subdir}" = "." ]; then
-       CC_=$CC
-       CXX_=$CXX
+       CC_=$CC' '
+       CXX_=$CXX' '
     else
        # Create a regular expression that matches any string as long
        # as ML_POPDIR.
@@ -786,6 +786,39 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
          esac
        done
 
+       if test "x${LD_LIBRARY_PATH+set}" = xset; then
+         LD_LIBRARY_PATH_=
+         for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
+           case "$arg" in
+           "${ML_POPDIR}"/*)
+             arg=`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`
+             ;;
+           esac
+           if test "x$LD_LIBRARY_PATH_" != x; then
+             LD_LIBRARY_PATH_=$LD_LIBRARY_PATH_:$arg
+           else
+             LD_LIBRARY_PATH_=$arg
+           fi
+          done
+         ml_config_env="$ml_config_env LD_LIBRARY_PATH=$LD_LIBRARY_PATH_"
+       fi
+
+       if test "x${SHLIB_PATH+set}" = xset; then
+         SHLIB_PATH_=
+         for arg in `echo "$SHLIB_PATH" | tr ':' ' '`; do
+           case "$arg" in
+           "${ML_POPDIR}"/*)
+             arg=`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`
+             ;;
+           esac
+           if test "x$SHLIB_PATH_" != x; then
+             SHLIB_PATH_=$SHLIB_PATH_:$arg
+           else
+             SHLIB_PATH_=$arg
+           fi
+          done
+         ml_config_env="$ml_config_env SHLIB_PATH=$SHLIB_PATH_"
+       fi
     fi
 
     if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \