projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 4c0a682a AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.159 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.159 | |
| 11 | Problem: When $x_includes ends up being "NONE" configure fails. | |
| 12 | Solution: Check for $x_includes not to be "NONE" (Rainer) | |
| 13 | Files: src/auto/configure, src/configure.in | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.158/src/auto/configure Mon Mar 2 02:44:54 2009 | |
| 17 | --- src/auto/configure Wed Apr 22 14:37:24 2009 | |
| 18 | *************** | |
| 19 | *** 15519,15525 **** | |
| 20 | if test "$enable_multibyte" = "yes"; then | |
| 21 | cflags_save=$CFLAGS | |
| 22 | ldflags_save=$LDFLAGS | |
| 23 | ! if test -n "$x_includes" ; then | |
| 24 | CFLAGS="$CFLAGS -I$x_includes" | |
| 25 | LDFLAGS="$X_LIBS $LDFLAGS -lX11" | |
| 26 | { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5 | |
| 27 | --- 15519,15525 ---- | |
| 28 | if test "$enable_multibyte" = "yes"; then | |
| 29 | cflags_save=$CFLAGS | |
| 30 | ldflags_save=$LDFLAGS | |
| 31 | ! if test "x$x_includes" != "xNONE" ; then | |
| 32 | CFLAGS="$CFLAGS -I$x_includes" | |
| 33 | LDFLAGS="$X_LIBS $LDFLAGS -lX11" | |
| 34 | { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5 | |
| 35 | *** ../vim-7.2.158/src/configure.in Mon Mar 2 02:44:54 2009 | |
| 36 | --- src/configure.in Wed Apr 22 14:35:57 2009 | |
| 37 | *************** | |
| 38 | *** 2952,2958 **** | |
| 39 | if test "$enable_multibyte" = "yes"; then | |
| 40 | cflags_save=$CFLAGS | |
| 41 | ldflags_save=$LDFLAGS | |
| 42 | ! if test -n "$x_includes" ; then | |
| 43 | CFLAGS="$CFLAGS -I$x_includes" | |
| 44 | LDFLAGS="$X_LIBS $LDFLAGS -lX11" | |
| 45 | AC_MSG_CHECKING(whether X_LOCALE needed) | |
| 46 | --- 2952,2958 ---- | |
| 47 | if test "$enable_multibyte" = "yes"; then | |
| 48 | cflags_save=$CFLAGS | |
| 49 | ldflags_save=$LDFLAGS | |
| 50 | ! if test "x$x_includes" != "xNONE" ; then | |
| 51 | CFLAGS="$CFLAGS -I$x_includes" | |
| 52 | LDFLAGS="$X_LIBS $LDFLAGS -lX11" | |
| 53 | AC_MSG_CHECKING(whether X_LOCALE needed) | |
| 54 | *** ../vim-7.2.158/src/version.c Wed Apr 22 17:42:53 2009 | |
| 55 | --- src/version.c Wed Apr 22 17:49:50 2009 | |
| 56 | *************** | |
| 57 | *** 678,679 **** | |
| 58 | --- 678,681 ---- | |
| 59 | { /* Add new patch number below this line */ | |
| 60 | + /**/ | |
| 61 | + 159, | |
| 62 | /**/ | |
| 63 | ||
| 64 | -- | |
| 65 | "Hegel was right when he said that we learn from history that man can | |
| 66 | never learn anything from history." (George Bernard Shaw) | |
| 67 | ||
| 68 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 69 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 70 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 71 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |