diff options
| author | vimboss <devnull@localhost> | 2009-04-22 15:53:09 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2009-04-22 15:53:09 +0000 |
| commit | 2ac57c46e2eb072ffb541a43c3f9e7d8820b5ce0 (patch) | |
| tree | e8afbef2a9797a1aa97a79e9b2e0928c9f871a5e | |
| parent | f536ef7ceb04076b2de94440f82d4f2053500cd4 (diff) | |
| download | vim-2ac57c46e2eb072ffb541a43c3f9e7d8820b5ce0.tar.gz | |
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index aea0013d..88920428 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -15519,7 +15519,7 @@ fi if test "$enable_multibyte" = "yes"; then cflags_save=$CFLAGS ldflags_save=$LDFLAGS - if test -n "$x_includes" ; then + if test "x$x_includes" != "xNONE" ; then CFLAGS="$CFLAGS -I$x_includes" LDFLAGS="$X_LIBS $LDFLAGS -lX11" { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5 diff --git a/src/configure.in b/src/configure.in index ff1bd0c9..68214172 100644 --- a/src/configure.in +++ b/src/configure.in @@ -2952,7 +2952,7 @@ dnl Check if X_LOCALE should be defined. if test "$enable_multibyte" = "yes"; then cflags_save=$CFLAGS ldflags_save=$LDFLAGS - if test -n "$x_includes" ; then + if test "x$x_includes" != "xNONE" ; then CFLAGS="$CFLAGS -I$x_includes" LDFLAGS="$X_LIBS $LDFLAGS -lX11" AC_MSG_CHECKING(whether X_LOCALE needed) diff --git a/src/version.c b/src/version.c index e5e1307f..0253013f 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 159, +/**/ 158, /**/ 157, |