This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Some garbage collection of the toplevel configure script
- From: Bonzini <bonzini at gnu dot org>
- To: neroden at twcny dot rr dot com, gcc-patches at gcc dot gnu dot org
- Date: Wed, 17 Mar 2004 04:45:52 -0500
- Subject: Some garbage collection of the toplevel configure script
The symbolic link stuff seems plain broken, since it refers to several
nonexisting shell vars. It definitely looks like some legacy of Cygnus
configure.
I did not include the configure script in the patch because it includes
the usual lot of changes because of changed line numbers; I did include
Makefile.in however.
Ok for mainline and src, where I do not have a CVS account?
Paolo
2004-03-17 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Remove symbolic link section.
* configure: Regenerate.
* Makefile.tpl (links): Remove.
* Makefile.in: Regenerate.
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.199
diff -u -r1.199 Makefile.in
--- Makefile.in 16 Mar 2004 00:03:28 -0000 1.199
+++ Makefile.in 17 Mar 2004 09:38:38 -0000
@@ -70,7 +70,6 @@
# Miscellaneous non-standard autoconf-set variables
# -------------------------------------------------
-links=@configlinks@
# The file containing GCC's version number.
gcc_version_trigger = @gcc_version_trigger@
gcc_version = @gcc_version@
Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.81
diff -u -r1.81 Makefile.tpl
--- Makefile.tpl 16 Mar 2004 00:03:30 -0000 1.81
+++ Makefile.tpl 17 Mar 2004 09:38:38 -0000
@@ -73,7 +73,6 @@
# Miscellaneous non-standard autoconf-set variables
# -------------------------------------------------
-links=@configlinks@
# The file containing GCC's version number.
gcc_version_trigger = @gcc_version_trigger@
gcc_version = @gcc_version@
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.277
diff -u -r1.277 configure.in
--- configure.in 16 Mar 2004 22:18:08 -0000 1.277
+++ configure.in 17 Mar 2004 09:38:39 -0000
@@ -1504,50 +1504,6 @@
AC_CHECK_PROGS([DEFAULT_M4], [gm4 gnum4 m4], [$MISSING m4])
AC_CHECK_PROGS([DEFAULT_LEX], [flex lex], [$MISSING flex])
-# 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 test -r ./config.status ; then
- mv -f ./config.status ./config.back
-fi
-while test -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 test ! -r ${srcdir}/${file} ; then
- if test ! -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 test ! -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.
@@ -2040,7 +1996,6 @@
AC_SUBST(RPATH_ENVVAR)
AC_SUBST(BUILD_PREFIX)
AC_SUBST(BUILD_PREFIX_1)
-AC_SUBST(configlinks)
AC_SUBST(gcc_version_trigger)
AC_SUBST(gcc_version)
AC_SUBST(tooldir)