diff options
| author | Richard Sandiford <rdsandiford@googlemail.com> | 2007-05-16 07:24:08 +0000 |
|---|---|---|
| committer | Richard Sandiford <rdsandiford@googlemail.com> | 2007-05-16 07:24:08 +0000 |
| commit | 07abfebf80b9f27762cf84c1da6e01e246dd1d2c (patch) | |
| tree | 9d6b75ab109d88d11733ca61fad02871f6e261eb /gdb/configure | |
| parent | fa1e8d8e04abc3c79eb2597a34ca7e57a27ecd42 (diff) | |
| download | gdb-07abfebf80b9f27762cf84c1da6e01e246dd1d2c.zip gdb-07abfebf80b9f27762cf84c1da6e01e246dd1d2c.tar.gz gdb-07abfebf80b9f27762cf84c1da6e01e246dd1d2c.tar.bz2 | |
gdb/
* configure.ac: Allow sysroots to be relocated under $prefix as
well as $exec_prefix.
* configure: Regenerate.
Diffstat (limited to 'gdb/configure')
| -rwxr-xr-x | gdb/configure | 54 |
1 files changed, 48 insertions, 6 deletions
diff --git a/gdb/configure b/gdb/configure index 68a4388..fa0d2c3 100755 --- a/gdb/configure +++ b/gdb/configure @@ -21594,17 +21594,20 @@ if test "${with_sysroot+set}" = set; then TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' + if test "x$prefix" = xNONE; then + test_prefix=/usr/local + else + test_prefix=$prefix + fi if test "x$exec_prefix" = xNONE || test "x$exec_prefix" = 'x${prefix}'; then - if test "x$prefix" = xNONE; then - test_prefix=/usr/local - else - test_prefix=$prefix - fi + test_exec_prefix=$test_prefix else - test_prefix=$exec_prefix + test_exec_prefix=$exec_prefix fi case ${TARGET_SYSTEM_ROOT} in "${test_prefix}"|"${test_prefix}/"*|\ + "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ + '${prefix}'|'${prefix}/'*|\ '${exec_prefix}'|'${exec_prefix}/'*) t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE" TARGET_SYSTEM_ROOT_DEFINE="$t" @@ -25154,33 +25157,51 @@ if test "$acx_cv_header_stdint" = stddef.h; then #ifndef _UINT8_T #define _UINT8_T + #ifndef __uint8_t_defined + #define __uint8_t_defined typedef unsigned $acx_cv_type_int8_t uint8_t; #endif + #endif #ifndef _UINT16_T #define _UINT16_T + #ifndef __uint16_t_defined + #define __uint16_t_defined typedef unsigned $acx_cv_type_int16_t uint16_t; #endif + #endif #ifndef _UINT32_T #define _UINT32_T + #ifndef __uint32_t_defined + #define __uint32_t_defined typedef unsigned $acx_cv_type_int32_t uint32_t; #endif + #endif #ifndef _INT8_T #define _INT8_T + #ifndef __int8_t_defined + #define __int8_t_defined typedef $acx_cv_type_int8_t int8_t; #endif + #endif #ifndef _INT16_T #define _INT16_T + #ifndef __int16_t_defined + #define __int16_t_defined typedef $acx_cv_type_int16_t int16_t; #endif + #endif #ifndef _INT32_T #define _INT32_T + #ifndef __int32_t_defined + #define __int32_t_defined typedef $acx_cv_type_int32_t int32_t; #endif + #endif EOF elif test "$ac_cv_type_u_int32_t" = yes; then sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -25198,18 +25219,27 @@ elif test "$ac_cv_type_u_int32_t" = yes; then #ifndef _UINT8_T #define _UINT8_T + #ifndef __uint8_t_defined + #define __uint8_t_defined typedef u_int8_t uint8_t; #endif + #endif #ifndef _UINT16_T #define _UINT16_T + #ifndef __uint16_t_defined + #define __uint16_t_defined typedef u_int16_t uint16_t; #endif + #endif #ifndef _UINT32_T #define _UINT32_T + #ifndef __uint32_t_defined + #define __uint32_t_defined typedef u_int32_t uint32_t; #endif + #endif EOF else sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -25257,8 +25287,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then #endif #ifndef _UINT64_T #define _UINT64_T + #ifndef __uint64_t_defined + #define __uint64_t_defined typedef u_int64_t uint64_t; #endif + #endif EOF elif test -n "$acx_cv_type_int64_t"; then sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -25270,8 +25303,11 @@ elif test -n "$acx_cv_type_int64_t"; then #endif #ifndef _UINT64_T #define _UINT64_T + #ifndef __uint64_t_defined + #define __uint64_t_defined typedef unsigned $acx_cv_type_int64_t uint64_t; #endif + #endif EOF else sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -25280,8 +25316,10 @@ else #if defined __STDC_VERSION__ && (__STDC_VERSION__-0) >= 199901L #ifndef _INT64_T #define _INT64_T + #ifndef __int64_t_defined typedef long long int64_t; #endif + #endif #ifndef _UINT64_T #define _UINT64_T typedef unsigned long long uint64_t; @@ -25326,8 +25364,12 @@ if test "$ac_cv_type_uintptr_t" != yes; then sed 's/^ *//' >> tmp-stdint.h <<EOF /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */ + #ifndef __uintptr_t_defined typedef u$acx_cv_type_intptr_t uintptr_t; + #endif + #ifndef __intptr_t_defined typedef $acx_cv_type_intptr_t intptr_t; + #endif EOF fi |