diff options
| author | Bram Moolenaar <bram@vim.org> | 2011-12-14 19:22:34 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2011-12-14 19:22:34 +0100 |
| commit | c91a891c4e2b0cf84fc24662a5448e23a3ef8627 (patch) | |
| tree | 8d513e0293e24a9e62c22a9846eea830a17a5dd5 | |
| parent | dcb913898fb62430f7834f5dccfbbd06af2ae5de (diff) | |
| download | vim-c91a891c4e2b0cf84fc24662a5448e23a3ef8627.tar.gz | |
Problem: When cross-compiling the check for uint32_t fails.
Solution: Only give a warning message. (Maksim Melnikau)
| -rwxr-xr-x | src/auto/configure | 3 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index ff2e13b2..8b727922 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -11777,7 +11777,8 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5 $as_echo_n "checking uint32_t is 32 bits... " >&6; } if test "$cross_compiling" = yes; then : - as_fn_error "could not compile program using uint32_t." "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot check uint32_t when cross-compiling." >&5 +$as_echo "$as_me: WARNING: cannot check uint32_t when cross-compiling." >&2;} else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/src/configure.in b/src/configure.in index 7a2b186a..8e3aa8db 100644 --- a/src/configure.in +++ b/src/configure.in @@ -3283,7 +3283,7 @@ main() { }], AC_MSG_RESULT(ok), AC_MSG_ERROR([WRONG! uint32_t not defined correctly.]), -AC_MSG_ERROR([could not compile program using uint32_t.])) +AC_MSG_WARN([cannot check uint32_t when cross-compiling.])) dnl Check for memmove() before bcopy(), makes memmove() be used when both are dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5. diff --git a/src/version.c b/src/version.c index 6fa74b43..16abb870 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 378, +/**/ 377, /**/ 376, |