* config-ml.in: Handle GCJ and GCJFLAGS.

From-SVN: r40721

diff --git a/ChangeLog b/ChangeLog
index c2e73c1a80b2904f224ba59bce9fc41c856dc149..4bb4e800723b16db315677967ea2e2fd02d0cd4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-19  Tom Tromey  <tromey@redhat.com>
+
+       * config-ml.in: Handle GCJ and GCJFLAGS.
+
 2001-03-21  Michael Chastain  <chastain@redhat.com>
 
        * Makefile.in: all-m4 depends on all-texinfo.

diff --git a/config-ml.in b/config-ml.in
index d528ac7c5eb8d2893280896fc0af1afa2ea41e07..8c879184384ebcfc8eb0b3c95a09be8eb10cda72 100644 (file)
--- a/config-ml.in
+++ b/config-ml.in
@@ -526,6 +526,7 @@ multi-do:
                                CFLAGS="$(CFLAGS) $${flags}" \
                                prefix="$(prefix)" \
                                exec_prefix="$(exec_prefix)" \
+                               GCJFLAGS="$(GCJFLAGS) $${flags}" \
                                CXXFLAGS="$(CXXFLAGS) $${flags}" \
                                LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
                                LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
@@ -748,11 +749,12 @@ 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" GCJ="${GCJ_}$flags"'
 
     if [ "${with_target_subdir}" = "." ]; then
        CC_=$CC' '
        CXX_=$CXX' '
+       GCJ_=$GCJ' '
     else
        # Create a regular expression that matches any string as long
        # as ML_POPDIR.
@@ -781,6 +783,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
          esac
        done
 
+       GCJ_=
+       for arg in ${GCJ}; do
+         case $arg in
+         -[BIL]"${ML_POPDIR}"/*)
+           GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         "${ML_POPDIR}"/*)
+           GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         *)
+           GCJ_="${GCJ_}${arg} " ;;
+         esac
+       done
+
        if test "x${LD_LIBRARY_PATH+set}" = xset; then
          LD_LIBRARY_PATH_=
          for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do