Snap. Gets through igen's checks.
[deliverable/binutils-gdb.git] / configure
index 20c00484a3d4cdcffc0c94175b533e04b693158e..3fae2e7354cc1ec4cb86d2ac147f5b5e4064d65c 100755 (executable)
--- a/configure
+++ b/configure
@@ -96,6 +96,7 @@ case "${OSTYPE}" in
     if [ ! -f /bin/sh ]; then
       if [ x${SHELL} != x ] && [ -f ${SHELL} ]; then
        CONFIG_SHELL=${SHELL}
+       export CONFIG_SHELL
       else
        for prog in sh sh.exe bash bash.exe; do
          IFS="${IFS=   }"; save_ifs="$IFS"; IFS="${IFS}:"
@@ -103,6 +104,7 @@ case "${OSTYPE}" in
            test -z "$dir" && dir=.
            if test -f $dir/$prog; then
              CONFIG_SHELL=$dir/$prog
+             export CONFIG_SHELL
              break
            fi
          done
@@ -710,6 +712,16 @@ t loop
   rm -f Makefile.cc
 fi
 
+if [ -z "${CFLAGS}" -a -r Makefile ]; then
+  sed -n -e ':loop
+/\\$/ N
+s/\\\n//g
+t loop
+/^CFLAGS[      ]*=/ s/CFLAGS[  ]*=[    ]*\(.*\)/\1/p' < Makefile > Makefile.cc
+  CFLAGS=`tail -1 Makefile.cc`
+  rm -f Makefile.cc
+fi
+
 if [ -z "${CXX}" -a -r Makefile ]; then
   sed -n -e ':loop
 /\\$/ N
@@ -720,6 +732,16 @@ t loop
   rm -f Makefile.cc
 fi
 
+if [ -z "${CXXFLAGS}" -a -r Makefile ]; then
+  sed -n -e ':loop
+/\\$/ N
+s/\\\n//g
+t loop
+/^CXXFLAGS[    ]*=/ s/CXXFLAGS[        ]*=[    ]*\(.*\)/\1/p' < Makefile > Makefile.cc
+  CXXFLAGS=`tail -1 Makefile.cc`
+  rm -f Makefile.cc
+fi
+
 # Generate a default definition for YACC.  This is used if the makefile can't
 # locate bison or byacc in objdir.
 
@@ -767,7 +789,7 @@ if [ "${build}" != "${host}" ]; then
   tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET HOST_PREFIX"
   tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
   tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET"
-  tools="${tools} WINDRES WINDRES_FOR_TARGET"
+  tools="${tools} WINDRES WINDRES_FOR_TARGET YACC"
 
   for var in ${tools}; do
     if [ -z "`eval 'echo $'"${var}"`" -a -r Makefile ]; then
@@ -789,6 +811,7 @@ t loop
   AR_FOR_TARGET=${AR_FOR_TARGET-${target_alias}-ar}
   AS=${AS-${host_alias}-as}
   AS_FOR_TARGET=${AS_FOR_TARGET-${target_alias}-as}
+  BISON=${BISON-bison}
   CC=${CC-${host_alias}-gcc}
   CFLAGS=${CFLAGS-"-g -O2"}
   CXX=${CXX-${host_alias}-c++}
@@ -811,26 +834,26 @@ t loop
   WINDRES=${WINDRES-${host_alias}-windres}
   WINDRES_FOR_TARGET=${WINDRES_FOR_TARGET-${target_alias}-windres}
 
-  if [ -z "${BISON}" ]; then
+  if [ -z "${YACC}" ]; then
     IFS="${IFS=        }"; save_ifs="$IFS"; IFS="${IFS}:"
     for dir in $PATH; do
       test -z "$dir" && dir=.
-      if test -f $dir/byacc; then
-       BISON=byacc
+      if test -f $dir/bison; then
+       YACC="bison -y"
        break
       fi
-      if test -f $dir/bison; then
-       BISON="bison -y"
+      if test -f $dir/byacc; then
+       YACC=byacc
        break
       fi
       if test -f $dir/yacc; then
-       BISON=yacc
+       YACC=yacc
        break
       fi
     done
     IFS="$save_ifs"
-    if [ -z "${BISON}" ]; then
-      BISON="bison -y"
+    if [ -z "${YACC}" ]; then
+      YACC="bison -y"
     fi
   fi
 
@@ -1022,78 +1045,77 @@ EOF
 
         if [ -f ${srcdir}/${subdir}/${Makefile_in} ] ; then
 
-            # Conditionalize for this site from "Makefile.in" (or whatever it's called) into Makefile.tem
-            rm -f ${subdir}/Makefile.tem
-              case "${site}" in
+            # Conditionalize the makefile for this package from "Makefile.in" (or whatever it's called) into Makefile.tem.
+            rm -f ${subdir}/${Makefile}.tem
+            case "${package_makefile_frag}" in
               "") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;;
+              *)
+                      if [ ! -f ${package_makefile_frag} ] ; then
+                              package_makefile_frag=${srcdir}/${package_makefile_frag}
+                      fi
+                      if [ -f ${package_makefile_frag} ] ; then
+                              sed -e "/^####/  r ${package_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} > ${Makefile}.tem
+                      else
+                              echo '***' Expected package makefile fragment \"${package_makefile_frag}\" 1>&2
+                              echo '***' is missing in ${PWD=`pwd`}. 1>&2
+                              cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem
+                      fi
+            esac
+            # working copy now in ${Makefile}.tem
+
+            # Conditionalize for this site.
+            rm -f ${Makefile}
+              case "${site}" in
+              "") mv ${subdir}/Makefile.tem ${Makefile} ;;
               *)
                       site_makefile_frag=${srcdir}/config/ms-${site}
 
                       if [ -f ${site_makefile_frag} ] ; then
-                              sed -e "/^####/  r ${site_makefile_frag}" ${srcdir}/${subdir}/${Makefile_in} \
-                                      > ${subdir}/Makefile.tem
+                              sed -e "/^####/  r ${site_makefile_frag}" ${subdir}/Makefile.tem \
+                                      > ${Makefile}
                       else
-                              cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem
+                              mv ${subdir}/Makefile.tem ${Makefile}
                               site_makefile_frag=
                       fi
                       ;;
             esac
-            # working copy now in ${subdir}/Makefile.tem
+            # working copy now in ${Makefile}
 
             # Conditionalize the makefile for this host.
-            rm -f ${Makefile}
+            rm -f ${subdir}/Makefile.tem
             case "${host_makefile_frag}" in
-              "") mv ${subdir}/Makefile.tem ${Makefile} ;;
+              "") mv ${Makefile} ${subdir}/Makefile.tem ;;
               *)
                       if [ ! -f ${host_makefile_frag} ] ; then
                               host_makefile_frag=${srcdir}/${host_makefile_frag}
                       fi
                       if [ -f ${host_makefile_frag} ] ; then
-                              sed -e "/^####/  r ${host_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile}
+                              sed -e "/^####/  r ${host_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem
                       else
                               echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2
                               echo '***' is missing in ${PWD=`pwd`}. 1>&2
-                              mv ${subdir}/Makefile.tem ${Makefile}
+                              mv ${Makefile} ${subdir}/Makefile.tem
                       fi
             esac
-            # working copy now in ${Makefile}
+            # working copy now in ${subdir)/Makefile.tem
 
             # Conditionalize the makefile for this target.
-            rm -f ${subdir}/Makefile.tem
+            rm -f ${Makefile}
             case "${target_makefile_frag}" in
-              "") mv ${Makefile} ${subdir}/Makefile.tem ;;
+              "") mv ${subdir}/Makefile.tem ${Makefile} ;;
               *)
                       if [ ! -f ${target_makefile_frag} ] ; then
                               target_makefile_frag=${srcdir}/${target_makefile_frag}
                       fi
                       if [ -f ${target_makefile_frag} ] ; then
-                              sed -e "/^####/  r ${target_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem
+                              sed -e "/^####/  r ${target_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile}
                       else
-                              mv ${Makefile} ${subdir}/Makefile.tem
+                              mv ${subdir}/Makefile.tem ${Makefile}
                               target_makefile_frag=
                       fi
                       ;;
             esac
-            # real copy now in ${subdir}/Makefile.tem
-
-            # Conditionalize the makefile for this package.
-            rm -f ${Makefile}
-            case "${package_makefile_frag}" in
-              "") mv ${subdir}/Makefile.tem ${Makefile} ;;
-              *)
-                      if [ ! -f ${package_makefile_frag} ] ; then
-                              package_makefile_frag=${srcdir}/${package_makefile_frag}
-                      fi
-                      if [ -f ${package_makefile_frag} ] ; then
-                              sed -e "/^####/  r ${package_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile}
-                             rm -f ${subdir}/Makefile.tem
-                      else
-                              echo '***' Expected package makefile fragment \"${package_makefile_frag}\" 1>&2
-                              echo '***' is missing in ${PWD=`pwd`}. 1>&2
-                              mv ${subdir}/Makefile.tem ${Makefile}
-                      fi
-            esac
-            # working copy now in ${Makefile}
+            # real copy now in ${Makefile}
 
             mv ${Makefile} ${subdir}/Makefile.tem
 
This page took 0.030503 seconds and 4 git commands to generate.