|
 |
81c2858 |
To: vim-dev@vim.org
|
|
|
81c2858 |
Subject: Patch 7.2.159
|
|
|
81c2858 |
Fcc: outbox
|
|
|
81c2858 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
81c2858 |
Mime-Version: 1.0
|
|
|
81c2858 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
81c2858 |
Content-Transfer-Encoding: 8bit
|
|
|
81c2858 |
------------
|
|
|
81c2858 |
|
|
|
81c2858 |
Patch 7.2.159
|
|
|
81c2858 |
Problem: When $x_includes ends up being "NONE" configure fails.
|
|
|
81c2858 |
Solution: Check for $x_includes not to be "NONE" (Rainer)
|
|
|
81c2858 |
Files: src/auto/configure, src/configure.in
|
|
|
81c2858 |
|
|
|
81c2858 |
|
|
|
81c2858 |
*** ../vim-7.2.158/src/auto/configure Mon Mar 2 02:44:54 2009
|
|
|
81c2858 |
--- src/auto/configure Wed Apr 22 14:37:24 2009
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 15519,15525 ****
|
|
|
81c2858 |
if test "$enable_multibyte" = "yes"; then
|
|
|
81c2858 |
cflags_save=$CFLAGS
|
|
|
81c2858 |
ldflags_save=$LDFLAGS
|
|
|
81c2858 |
! if test -n "$x_includes" ; then
|
|
|
81c2858 |
CFLAGS="$CFLAGS -I$x_includes"
|
|
|
81c2858 |
LDFLAGS="$X_LIBS $LDFLAGS -lX11"
|
|
|
81c2858 |
{ $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
|
|
|
81c2858 |
--- 15519,15525 ----
|
|
|
81c2858 |
if test "$enable_multibyte" = "yes"; then
|
|
|
81c2858 |
cflags_save=$CFLAGS
|
|
|
81c2858 |
ldflags_save=$LDFLAGS
|
|
|
81c2858 |
! if test "x$x_includes" != "xNONE" ; then
|
|
|
81c2858 |
CFLAGS="$CFLAGS -I$x_includes"
|
|
|
81c2858 |
LDFLAGS="$X_LIBS $LDFLAGS -lX11"
|
|
|
81c2858 |
{ $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
|
|
|
81c2858 |
*** ../vim-7.2.158/src/configure.in Mon Mar 2 02:44:54 2009
|
|
|
81c2858 |
--- src/configure.in Wed Apr 22 14:35:57 2009
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 2952,2958 ****
|
|
|
81c2858 |
if test "$enable_multibyte" = "yes"; then
|
|
|
81c2858 |
cflags_save=$CFLAGS
|
|
|
81c2858 |
ldflags_save=$LDFLAGS
|
|
|
81c2858 |
! if test -n "$x_includes" ; then
|
|
|
81c2858 |
CFLAGS="$CFLAGS -I$x_includes"
|
|
|
81c2858 |
LDFLAGS="$X_LIBS $LDFLAGS -lX11"
|
|
|
81c2858 |
AC_MSG_CHECKING(whether X_LOCALE needed)
|
|
|
81c2858 |
--- 2952,2958 ----
|
|
|
81c2858 |
if test "$enable_multibyte" = "yes"; then
|
|
|
81c2858 |
cflags_save=$CFLAGS
|
|
|
81c2858 |
ldflags_save=$LDFLAGS
|
|
|
81c2858 |
! if test "x$x_includes" != "xNONE" ; then
|
|
|
81c2858 |
CFLAGS="$CFLAGS -I$x_includes"
|
|
|
81c2858 |
LDFLAGS="$X_LIBS $LDFLAGS -lX11"
|
|
|
81c2858 |
AC_MSG_CHECKING(whether X_LOCALE needed)
|
|
|
81c2858 |
*** ../vim-7.2.158/src/version.c Wed Apr 22 17:42:53 2009
|
|
|
81c2858 |
--- src/version.c Wed Apr 22 17:49:50 2009
|
|
|
81c2858 |
***************
|
|
|
81c2858 |
*** 678,679 ****
|
|
|
81c2858 |
--- 678,681 ----
|
|
|
81c2858 |
{ /* Add new patch number below this line */
|
|
|
81c2858 |
+ /**/
|
|
|
81c2858 |
+ 159,
|
|
|
81c2858 |
/**/
|
|
|
81c2858 |
|
|
|
81c2858 |
--
|
|
|
81c2858 |
"Hegel was right when he said that we learn from history that man can
|
|
|
81c2858 |
never learn anything from history." (George Bernard Shaw)
|
|
|
81c2858 |
|
|
|
81c2858 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
81c2858 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
81c2858 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
81c2858 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|