diff options
author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-26 05:31:48 +0000 |
---|---|---|
committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-26 05:31:48 +0000 |
commit | cfd109322b5d6f25b4b3387720ad82cc91428bfd (patch) | |
tree | 1cbe2ac91d5cb58cd4410b9b1cefddc46001e910 /boehm-gc/configure | |
parent | b066032ae1e6bdcc561fe23a190f31e0a5cd5d9f (diff) | |
download | gcc-cfd109322b5d6f25b4b3387720ad82cc91428bfd.tar.gz |
2004-11-26 Bryce McKinlay <mckinlay@redhat.com>
Fix "PACKAGE_NAME redefined" errors.
* configure.ac (AC_CONFIG_HEADERS): Build both include/config.h
and include/gc_config.h.
* configure: Regenerated.
* include/gc_config.h.in: No longer auto-generated. Define only the
macros needed by libjava.
* include/config.h.in: Generated by autoheader.
* include/gc.h: Include config.h, not gc_config.h.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91330 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc/configure')
-rwxr-xr-x | boehm-gc/configure | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/boehm-gc/configure b/boehm-gc/configure index b950a0706c4..4167e8105dd 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -6587,7 +6587,7 @@ else multilib_arg= fi - ac_config_headers="$ac_config_headers include/gc_config.h" + ac_config_headers="$ac_config_headers include/config.h include/gc_config.h" ac_config_files="$ac_config_files Makefile include/Makefile" @@ -7184,6 +7184,7 @@ do "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/gc_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/gc_config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} |