This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

toplevel configure: reformat


This is the follow-up to my prior patch.  Tested by configuring on 
i686-pc-linux-gnu, no change in generated files.

	* configure: Reformat indentation.

--- configure.mid	2002-10-04 16:06:50.000000000 -0400
+++ configure.new	2002-10-04 16:07:09.000000000 -0400
@@ -1073,174 +1073,172 @@
   all_build_modules='$(ALL_BUILD_MODULES_LIST)'
 fi
 
-        # FIXME Should this be done recursively ??? (Useful for e.g. gdbtest)
-        # Set up the list of links to be made.
-        # ${links} is the list of link names, and ${files} is the list of names to link to.
-
-        # Make the links.
-        configlinks="${links}"
-        if [ -r ./config.status ] ; then
-                mv -f ./config.status ./config.back
-        fi
-        while [ -n "${files}" ] ; do
-                # set file to car of files, files to cdr of files
-                set ${files}; file=$1; shift; files=$*
-                set ${links}; link=$1; shift; links=$*
-
-                if [ ! -r ${srcdir}/${file} ] ; then
-                  if [ ! -r ${file} ] ; then
-		    
-                        echo '***' "${progname}: cannot create a link \"${link}\"," 1>&2
-                        echo '***' "since the file \"${srcdir}/${file}\" does not exist." 1>&2
-                        exit 1
-		  else
-			srcfile=${file}
-		  fi
-		else
-			srcfile=${srcdir}/${file}
-                fi
-
-                ${remove} -f ${link}
-		# Make a symlink if possible, otherwise try a hard link
-		if ${symbolic_link} ${srcfile} ${link} >/dev/null 2>&1 ; then
-			true
-		else
-			# We need to re-remove the file because Lynx leaves a 
-			# very strange directory there when it fails an NFS symlink.
-			${remove} -r -f ${link}
-			${hard_link} ${srcfile} ${link}
-		fi
-                if [ ! -r ${link} ] ; then
-                        echo '***' "${progname}: unable to link \"${link}\" to \"${srcfile}\"." 1>&2
-                        exit 1
-                fi
-
-                echo "Linked \"${link}\" to \"${srcfile}\"."
-        done
-
-        # Create a .gdbinit file which runs the one in srcdir
-        # and tells GDB to look there for source files.
-
-        if [ -r ${srcdir}/.gdbinit ] ; then
-                case ${srcdir} in
-                .) ;;
-                *) cat > ./.gdbinit <<EOF
+# FIXME Should this be done recursively ??? (Useful for e.g. gdbtest)
+# Set up the list of links to be made.
+# ${links} is the list of link names, and ${files} is the list of names to link to.
+
+# Make the links.
+configlinks="${links}"
+if [ -r ./config.status ] ; then
+  mv -f ./config.status ./config.back
+fi
+while [ -n "${files}" ] ; do
+  # set file to car of files, files to cdr of files
+  set ${files}; file=$1; shift; files=$*
+  set ${links}; link=$1; shift; links=$*
+
+  if [ ! -r ${srcdir}/${file} ] ; then
+    if [ ! -r ${file} ] ; then
+      echo '***' "${progname}: cannot create a link \"${link}\"," 1>&2
+      echo '***' "since the file \"${srcdir}/${file}\" does not exist." 1>&2
+      exit 1
+    else
+      srcfile=${file}
+    fi
+  else
+    srcfile=${srcdir}/${file}
+  fi
+
+  ${remove} -f ${link}
+  # Make a symlink if possible, otherwise try a hard link
+  if ${symbolic_link} ${srcfile} ${link} >/dev/null 2>&1 ; then
+    true
+  else
+    # We need to re-remove the file because Lynx leaves a 
+    # very strange directory there when it fails an NFS symlink.
+    ${remove} -r -f ${link}
+    ${hard_link} ${srcfile} ${link}
+  fi
+  if [ ! -r ${link} ] ; then
+    echo '***' "${progname}: unable to link \"${link}\" to \"${srcfile}\"." 1>&2
+    exit 1
+  fi
+
+  echo "Linked \"${link}\" to \"${srcfile}\"."
+done
+
+# Create a .gdbinit file which runs the one in srcdir
+# and tells GDB to look there for source files.
+
+if [ -r ${srcdir}/.gdbinit ] ; then
+  case ${srcdir} in
+    .) ;;
+    *) cat > ./.gdbinit <<EOF
 # ${NO_EDIT}
 dir ${srcdir}
 dir .
 source ${srcdir}/.gdbinit
 EOF
-                        ;;
-                esac
-        fi
-
-        # Install a makefile, and make it set VPATH
-        # if necessary so that the sources are found.
-        # Also change its value of srcdir.
-        # NOTE: Makefile generation constitutes the majority of the time in configure.  Hence, this section has
-        # been somewhat optimized and is perhaps a bit twisty.
-
-        # code is order so as to try to sed the smallest input files we know.
-        # so do these separately because I don't trust the order of sed -e expressions.
-
-        # the five makefile fragments MUST end up in the resulting Makefile in this order: 
-        # package macros, target, host, site, and package rules.
-
-        if [ -f ${srcdir}/${Makefile_in} ] ; then
-
-            # Conditionalize the makefile for this package from "Makefile.in" (or whatever it's called) into Makefile.tem.
-            rm -f ./${Makefile}.tem
-            case "${package_makefile_rules_frag}" in
-              "") cp ${srcdir}/${Makefile_in} ./Makefile.tem ;;
-              *)
-                      if [ ! -f ${package_makefile_rules_frag} ] ; then
-                              package_makefile_rules_frag=${srcdir}/${package_makefile_rules_frag}
-                      fi
-                      if [ -f ${package_makefile_rules_frag} ] ; then
-                              sed -e "/^####/  r ${package_makefile_rules_frag}" ${srcdir}/${Makefile_in} > ${Makefile}.tem
-                      else
-                              echo '***' Expected package makefile rules fragment \"${package_makefile_rules_frag}\" 1>&2
-                              echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2
-                              cp ${srcdir}/${Makefile_in} ./Makefile.tem
-                      fi
-            esac
-            # working copy now in ${Makefile}.tem
-
-            # Conditionalize for this site.
-            rm -f ${Makefile}
-              case "${site}" in
-              "") mv ./Makefile.tem ${Makefile} ;;
-              *)
-                      site_makefile_frag=${srcdir}/config/ms-${site}
-
-                      if [ -f ${site_makefile_frag} ] ; then
-                              sed -e "/^####/  r ${site_makefile_frag}" ./Makefile.tem \
-                                      > ${Makefile}
-                      else
-                              mv ./Makefile.tem ${Makefile}
-                              site_makefile_frag=
-                      fi
-                      ;;
-            esac
-            # working copy now in ${Makefile}
-
-            # Conditionalize the makefile for this host.
-            rm -f ./Makefile.tem
-            case "${host_makefile_frag}" in
-              "") mv ${Makefile} ./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}" ${Makefile} > ./Makefile.tem
-                      else
-                              echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2
-                              echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2
-                              mv ${Makefile} ./Makefile.tem
-                      fi
-            esac
-            # working copy now in ./Makefile.tem
-
-            # Conditionalize the makefile for this target.
-            rm -f ${Makefile}
-            case "${target_makefile_frag}" in
-              "") mv ./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.tem > ${Makefile}
-                      else
-                              mv ./Makefile.tem ${Makefile}
-                              target_makefile_frag=
-                      fi
-                      ;;
-            esac
-            # working copy now in ${Makefile}
-
-            # Emit the default values of this package's macros.
-            rm -f ./Makefile.tem
-            case "${package_makefile_frag}" in
-              "") mv ${Makefile} ./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}" ${Makefile} > ./Makefile.tem
-                      else
-                              echo '***' Expected package makefile fragment \"${package_makefile_rules_frag}\" 1>&2
-                              echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2
-                              mv ${Makefile} ./Makefile.tem
-                      fi
-            esac
-            # real copy now in ./Makefile.tem
-
-            # prepend warning about editing, and a bunch of variables.
-            rm -f ${Makefile}
-            cat > ${Makefile} <<EOF
+    ;;
+  esac
+fi
+
+# Install a makefile, and make it set VPATH
+# if necessary so that the sources are found.
+# Also change its value of srcdir.
+# NOTE: Makefile generation constitutes the majority of the time in configure.  Hence, this section has
+# been somewhat optimized and is perhaps a bit twisty.
+
+# code is order so as to try to sed the smallest input files we know.
+# so do these separately because I don't trust the order of sed -e expressions.
+
+# the five makefile fragments MUST end up in the resulting Makefile in this order: 
+# package macros, target, host, site, and package rules.
+
+if [ -f ${srcdir}/${Makefile_in} ] ; then
+
+  # Conditionalize the makefile for this package from "Makefile.in" (or whatever it's called) into Makefile.tem.
+  rm -f ./${Makefile}.tem
+  case "${package_makefile_rules_frag}" in
+    "") cp ${srcdir}/${Makefile_in} ./Makefile.tem ;;
+    *)
+      if [ ! -f ${package_makefile_rules_frag} ] ; then
+        package_makefile_rules_frag=${srcdir}/${package_makefile_rules_frag}
+      fi
+      if [ -f ${package_makefile_rules_frag} ] ; then
+        sed -e "/^####/  r ${package_makefile_rules_frag}" ${srcdir}/${Makefile_in} > ${Makefile}.tem
+      else
+        echo '***' Expected package makefile rules fragment \"${package_makefile_rules_frag}\" 1>&2
+        echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2
+        cp ${srcdir}/${Makefile_in} ./Makefile.tem
+      fi
+  esac
+  # working copy now in ${Makefile}.tem
+
+  # Conditionalize for this site.
+  rm -f ${Makefile}
+  case "${site}" in
+    "") mv ./Makefile.tem ${Makefile} ;;
+    *)
+      site_makefile_frag=${srcdir}/config/ms-${site}
+
+      if [ -f ${site_makefile_frag} ] ; then
+        sed -e "/^####/  r ${site_makefile_frag}" ./Makefile.tem > ${Makefile}
+      else
+        mv ./Makefile.tem ${Makefile}
+        site_makefile_frag=
+      fi
+      ;;
+  esac
+  # working copy now in ${Makefile}
+
+  # Conditionalize the makefile for this host.
+  rm -f ./Makefile.tem
+  case "${host_makefile_frag}" in
+    "") mv ${Makefile} ./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}" ${Makefile} > ./Makefile.tem
+      else
+        echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2
+        echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2
+        mv ${Makefile} ./Makefile.tem
+      fi
+  esac
+  # working copy now in ./Makefile.tem
+
+  # Conditionalize the makefile for this target.
+  rm -f ${Makefile}
+  case "${target_makefile_frag}" in
+    "") mv ./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.tem > ${Makefile}
+      else
+        mv ./Makefile.tem ${Makefile}
+        target_makefile_frag=
+      fi
+      ;;
+  esac
+  # working copy now in ${Makefile}
+
+  # Emit the default values of this package's macros.
+  rm -f ./Makefile.tem
+  case "${package_makefile_frag}" in
+    "") mv ${Makefile} ./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}" ${Makefile} > ./Makefile.tem
+      else
+        echo '***' Expected package makefile fragment \"${package_makefile_rules_frag}\" 1>&2
+        echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2
+        mv ${Makefile} ./Makefile.tem
+      fi
+  esac
+  # real copy now in ./Makefile.tem
+
+  # prepend warning about editing, and a bunch of variables.
+  rm -f ${Makefile}
+  cat > ${Makefile} <<EOF
 # ${NO_EDIT}
 VPATH = ${srcdir}
 links = ${configlinks}
@@ -1255,188 +1253,186 @@
 target_os = ${target_os}
 target_canonical = ${target_cpu}-${target_vendor}-${target_os}
 EOF
-	    case "${build}" in
-	      "") ;;
-	      *)  cat >> ${Makefile} << EOF
+  case "${build}" in
+    "") ;;
+    *)  cat >> ${Makefile} << EOF
 build_alias = ${build_alias}
 build_cpu = ${build_cpu}
 build_vendor = ${build_vendor}
 build_os = ${build_os}
 build_canonical = ${build_cpu}-${build_vendor}-${build_os}
 EOF
-	    esac
+  esac
 
-            case "${package_makefile_frag}" in
-              "") ;;
-              /* | [A-Za-z]:[\\/]* ) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;;
-              *)  echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;;
-            esac
-
-            case "${target_makefile_frag}" in
-              "") ;;
-              /* | [A-Za-z]:[\\/]* ) echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;;
-              *)  echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;;
-            esac
-
-            case "${host_makefile_frag}" in
-              "") ;;
-              /* | [A-Za-z]:[\\/]* ) echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;;
-              *)  echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;;
-            esac
-
-            if [ "${site_makefile_frag}" != "" ] ; then
-                echo site_makefile_frag = ${site_makefile_frag} >>${Makefile}
-            fi 
-
-	    echo enable_shared = ${enable_shared} >> ${Makefile}
-	    echo enable_threads = ${enable_threads} >> ${Makefile}
-	    # record if we want to rumtime library stuff installed in libsubdir.
-	    if test -z "${enable_version_specific_runtime_libs}"; then
-	        echo enable_version_specific_runtime_libs = no >> ${Makefile}
-	    else
-	        echo enable_version_specific_runtime_libs = ${enable_version_specific_runtime_libs} >> ${Makefile}
-	    fi
-
-	    # Emit a macro which describes the file containing gcc's
-	    # version number.
-	    echo gcc_version_trigger = ${gcc_version_trigger} >> ${Makefile}
-	    # And emit a macro defining gcc's version number.
-	    echo gcc_version = ${gcc_version} >> ${Makefile}
-
-            # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS,
-            # remove any form feeds.
-                rm -f ./Makefile.tm2
-                sedtemp=sed.$$
-                cat >$sedtemp <<EOF
+  case "${package_makefile_frag}" in
+    "") ;;
+    /* | [A-Za-z]:[\\/]* ) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;;
+    *)  echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;;
+  esac
+
+  case "${target_makefile_frag}" in
+    "") ;;
+    /* | [A-Za-z]:[\\/]* ) echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;;
+    *)  echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;;
+  esac
+
+  case "${host_makefile_frag}" in
+    "") ;;
+    /* | [A-Za-z]:[\\/]* ) echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;;
+    *)  echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;;
+  esac
+
+  if [ "${site_makefile_frag}" != "" ] ; then
+    echo site_makefile_frag = ${site_makefile_frag} >>${Makefile}
+  fi 
+
+  echo enable_shared = ${enable_shared} >> ${Makefile}
+  echo enable_threads = ${enable_threads} >> ${Makefile}
+  # record if we want to rumtime library stuff installed in libsubdir.
+  if test -z "${enable_version_specific_runtime_libs}"; then
+    echo enable_version_specific_runtime_libs = no >> ${Makefile}
+  else
+    echo enable_version_specific_runtime_libs = ${enable_version_specific_runtime_libs} >> ${Makefile}
+  fi
+
+  # Emit a macro which describes the file containing gcc's
+  # version number.
+  echo gcc_version_trigger = ${gcc_version_trigger} >> ${Makefile}
+  # And emit a macro defining gcc's version number.
+  echo gcc_version = ${gcc_version} >> ${Makefile}
+
+  # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS,
+  # remove any form feeds.
+  rm -f ./Makefile.tm2
+  sedtemp=sed.$$
+  cat >$sedtemp <<EOF
 s:@configdirs@:${configdirs}:
 EOF
-                sed -f $sedtemp \
-                    ./Makefile.tem > ./Makefile.tm2
-                rm -f $sedtemp
-                rm -f ./Makefile.tem
-                mv ./Makefile.tm2 ./Makefile.tem
-	    sed     -e "s|@prefix@|${prefix}|" \
-                    -e "s|@exec_prefix@|${exec_prefix}|" \
-                    -e "s|@bindir@|${bindir}|" \
-                    -e "s|@sbindir@|${sbindir}|" \
-                    -e "s|@libexecdir@|${libexecdir}|" \
-                    -e "s|@datadir@|${datadir}|" \
-                    -e "s|@sysconfdir@|${sysconfdir}|" \
-                    -e "s|@sharedstatedir@|${sharedstatedir}|" \
-                    -e "s|@localstatedir@|${localstatedir}|" \
-                    -e "s|@libdir@|${libdir}|" \
-                    -e "s|@includedir@|${includedir}|" \
-                    -e "s|@oldincludedir@|${oldincludedir}|" \
-                    -e "s|@infodir@|${infodir}|" \
-                    -e "s|@mandir@|${mandir}|" \
-		    -e "s|@all_build_modules@|${all_build_modules}|" \
-		    -e "/^CC[ 	]*=/{
-			:loop1
-			/\\\\$/ N
-			s/\\\\\\n//g
-			t loop1
-			s%^CC[ 	]*=.*$%CC = ${CC}%
-			}" \
-		    -e "/^CXX[ 	]*=/{
-			:loop2
-			/\\\\$/ N
-			s/\\\\\\n//g
-			t loop2
-			s%^CXX[ 	]*=.*$%CXX = ${CXX}%
-			}" \
-		    -e "/^CFLAGS[ 	]*=/{
-			:loop3
-			/\\\\$/ N
-			s/\\\\\\n//g
-			t loop3
-			s%^CFLAGS[ 	]*=.*$%CFLAGS = ${CFLAGS}%
-			}" \
-		    -e "/^CXXFLAGS[ 	]*=/{
-			:loop4
-			/\\\\$/ N
-			s/\\\\\\n//g
-			t loop4
-			s%^CXXFLAGS[ 	]*=.*$%CXXFLAGS = ${CXXFLAGS}%
-			}" \
-		    -e "s|@config_shell@|${config_shell}|" \
-                    -e "s|@srcdir@|${srcdir}|" \
-                    -e "s///" \
-                    -e "s:@program_transform_name@:${program_transform_name}:" \
-                    -e "s|@tooldir@|${tooldir}|" \
-                    -e "s|@build_tooldir@|${tooldir}|" \
-		    -e "s:@DEFAULT_YACC@:${DEFAULT_YACC}:" \
-		    -e "s:@DEFAULT_LEX@:${DEFAULT_LEX}:" \
-		    -e "s:@DEFAULT_M4@:${DEFAULT_M4}:" \
-                    ./Makefile.tem >> ${Makefile}
-  
-	    sed -e "s:@GDB_TK@:${GDB_TK}:" ${Makefile} >${Makefile}.tem
-	    mv -f ${Makefile}.tem ${Makefile}
-
-	    # If this is a Canadian Cross, preset the values of many more
-	    # tools.
-	    if [ "${build}" != "${host}" ]; then
-		for var in ${tools}; do
-		    eval val=\$${var}
-		    sed -e "/^${var}[ 	]*=/{
-			   :loop1
-			   /\\\\$/ N
-			   /\\\\$/ b loop1
-			   s/\\\\\\n//g
-			   s%^${var}[ 	]*=.*$%${var} = ${val}%
-			   }" ${Makefile} > ${Makefile}.tem
-		    mv -f ${Makefile}.tem ${Makefile}
-		done
-	    fi
-
-            # final copy now in ${Makefile}
-
-        else
-           echo "No Makefile.in found in ${srcdir}/., unable to configure" 1>&2
-        fi
-
-        rm -f ./Makefile.tem
-
-        case "${host_makefile_frag}" in
-        "") using= ;;
-        *) using="and \"${host_makefile_frag}\"" ;;
-        esac
-
-        case "${target_makefile_frag}" in
-        "") ;;
-        *) using="${using} and \"${target_makefile_frag}\"" ;;
-        esac
-
-        case "${site_makefile_frag}" in
-        "") ;;
-        *) using="${using} and \"${site_makefile_frag}\"" ;;
-        esac
-
-        newusing=`echo "${using}" | sed 's/and/using/'`
-        using=${newusing}
-        echo "Created \"${Makefile}\" in" ${PWD=`${PWDCMD-pwd}`} ${using}
-
-        . ${tmpfile}.pos
-
-        # describe the chosen configuration in config.status.
-        # Make that file a shellscript which will reestablish
-        # the same configuration.  Used in Makefiles to rebuild
-        # Makefiles.
-
-        case "${norecursion}" in
-        "") arguments="${arguments} --norecursion" ;;
-        *) ;;
-        esac
+  sed -f $sedtemp ./Makefile.tem > ./Makefile.tm2
+  rm -f $sedtemp
+  rm -f ./Makefile.tem
+  mv ./Makefile.tm2 ./Makefile.tem
+  sed -e "s|@prefix@|${prefix}|" \
+      -e "s|@exec_prefix@|${exec_prefix}|" \
+      -e "s|@bindir@|${bindir}|" \
+      -e "s|@sbindir@|${sbindir}|" \
+      -e "s|@libexecdir@|${libexecdir}|" \
+      -e "s|@datadir@|${datadir}|" \
+      -e "s|@sysconfdir@|${sysconfdir}|" \
+      -e "s|@sharedstatedir@|${sharedstatedir}|" \
+      -e "s|@localstatedir@|${localstatedir}|" \
+      -e "s|@libdir@|${libdir}|" \
+      -e "s|@includedir@|${includedir}|" \
+      -e "s|@oldincludedir@|${oldincludedir}|" \
+      -e "s|@infodir@|${infodir}|" \
+      -e "s|@mandir@|${mandir}|" \
+      -e "s|@all_build_modules@|${all_build_modules}|" \
+      -e "/^CC[ 	]*=/{
+          :loop1
+          /\\\\$/ N
+          s/\\\\\\n//g
+          t loop1
+          s%^CC[ 	]*=.*$%CC = ${CC}%
+          }" \
+      -e "/^CXX[ 	]*=/{
+          :loop2
+          /\\\\$/ N
+          s/\\\\\\n//g
+          t loop2
+          s%^CXX[ 	]*=.*$%CXX = ${CXX}%
+          }" \
+      -e "/^CFLAGS[ 	]*=/{
+          :loop3
+          /\\\\$/ N
+          s/\\\\\\n//g
+          t loop3
+          s%^CFLAGS[ 	]*=.*$%CFLAGS = ${CFLAGS}%
+          }" \
+      -e "/^CXXFLAGS[ 	]*=/{
+          :loop4
+          /\\\\$/ N
+          s/\\\\\\n//g
+          t loop4
+          s%^CXXFLAGS[ 	]*=.*$%CXXFLAGS = ${CXXFLAGS}%
+          }" \
+      -e "s|@config_shell@|${config_shell}|" \
+      -e "s|@srcdir@|${srcdir}|" \
+      -e "s///" \
+      -e "s:@program_transform_name@:${program_transform_name}:" \
+      -e "s|@tooldir@|${tooldir}|" \
+      -e "s|@build_tooldir@|${tooldir}|" \
+      -e "s:@DEFAULT_YACC@:${DEFAULT_YACC}:" \
+      -e "s:@DEFAULT_LEX@:${DEFAULT_LEX}:" \
+      -e "s:@DEFAULT_M4@:${DEFAULT_M4}:" \
+          ./Makefile.tem >> ${Makefile}
+  sed -e "s:@GDB_TK@:${GDB_TK}:" ${Makefile} >${Makefile}.tem
+  mv -f ${Makefile}.tem ${Makefile}
+
+  # If this is a Canadian Cross, preset the values of many more
+  # tools.
+  if [ "${build}" != "${host}" ]; then
+    for var in ${tools}; do
+      eval val=\$${var}
+      sed -e "/^${var}[ 	]*=/{
+              :loop1
+              /\\\\$/ N
+              /\\\\$/ b loop1
+              s/\\\\\\n//g
+              s%^${var}[ 	]*=.*$%${var} = ${val}%
+              }" ${Makefile} > ${Makefile}.tem
+      mv -f ${Makefile}.tem ${Makefile}
+    done
+  fi
+
+  # final copy now in ${Makefile}
+
+else
+  echo "No Makefile.in found in ${srcdir}/., unable to configure" 1>&2
+fi
+
+rm -f ./Makefile.tem
 
-            echo "#!/bin/sh
+case "${host_makefile_frag}" in
+  "") using= ;;
+  *) using="and \"${host_makefile_frag}\"" ;;
+esac
+
+case "${target_makefile_frag}" in
+  "") ;;
+  *) using="${using} and \"${target_makefile_frag}\"" ;;
+esac
+
+case "${site_makefile_frag}" in
+  "") ;;
+  *) using="${using} and \"${site_makefile_frag}\"" ;;
+esac
+
+newusing=`echo "${using}" | sed 's/and/using/'`
+using=${newusing}
+echo "Created \"${Makefile}\" in" ${PWD=`${PWDCMD-pwd}`} ${using}
+
+. ${tmpfile}.pos
+
+# describe the chosen configuration in config.status.
+# Make that file a shellscript which will reestablish
+# the same configuration.  Used in Makefiles to rebuild
+# Makefiles.
+
+case "${norecursion}" in
+  "") arguments="${arguments} --norecursion" ;;
+  *) ;;
+esac
+
+echo "#!/bin/sh
 # ${NO_EDIT}
 # This directory was configured as follows:
 ${progname}" ${arguments}  "
 # ${using}" > ./config.new
-        chmod a+x ./config.new
-        if [ -r ./config.back ] ; then
-                mv -f ./config.back ./config.status
-        fi
-	${config_shell} ${moveifchange} ./config.new ./config.status
+chmod a+x ./config.new
+if [ -r ./config.back ] ; then
+  mv -f ./config.back ./config.status
+fi
+${config_shell} ${moveifchange} ./config.new ./config.status
 
 # If there are subdirectories, then recur.
 if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]