gthr.h: Use include <> instead of include ""
Andreas Jaeger
aj@suse.de
Thu Jul 12 23:23:00 GMT 2001
Loren James Rittle <rittle@latour.rsch.comm.mot.com> writes:
>> The patch looks fine to me but I'm confused with those errors messages
>> that I didn't get without my patch. Is my autoconf/automake version
>> broken (autoconf 2.13, automake 1.4)?
>
> I don't think so. Have you installed a compiler into
> /opt/gcc-3.1-devel since your last bootstrap without those warnings?
>
> I think you will find that if you explicitly
> `rm -rf /opt/gcc-3.1-devel/i686-pc-linux-gnu/include' before running
> the testsuite, those errors will all disappear.
I'll test this now.
> I don't know if anyone is working on fixing this issue properly yet.
> Since I am not suppose to be working on gcc today, I can't look at it.
>
> BTW, as I am the closest thing to the owner of that configuration
> code, your patch is approved by me but please let Alexandre Oliva give
> his say before you apply it.
Alexandre, what do you think?
> Whether it gets applied or not, I will ensure that it goes in the
> jumbo configuration patch being worked on.
Thanks.
Here's an improved version of the patch. Carlo Wood pointed out that
the regex would break lines like:
#include "..." // "something"
Andreas
2001-07-11 Andreas Jaeger <aj@suse.de>
* acinclude.m4 (GLIBCPP_ENABLE_THREADS): Install gthr.h with
include <> instead of include "".
============================================================
Index: libstdc++-v3/aclocal.m4
--- libstdc++-v3/aclocal.m4 2001/07/10 12:55:05 1.167
+++ libstdc++-v3/aclocal.m4 2001/07/13 06:19:06
@@ -1174,7 +1174,8 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
AC_OUTPUT_COMMANDS([d=include/bits; a='[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]'
rm -f $d/gthr.h $d/gthr-single.h $d/gthr-default.h
sed '/^#/s/\('"$a$a"'*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
- | sed 's,"gthr-,"bits/gthr-,' >$d/gthr.h
+ | sed 's,"gthr-,"bits/gthr-,' \
+ | sed 's/include "\([^"]*\)"/include <\1>/' >$d/gthr.h
sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-single.h-in \
| sed 's/\(GCC'"$a"'*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
http://www.suse.de/~aj
More information about the Gcc-patches
mailing list