mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 7.4.1390
Problem: When building with GTK and glib-compile-resources cannot be found building Vim fails. (Michael Gehring) Solution: Make GLIB_COMPILE_RESOURCES empty instead of leaving it at "no". (nuko8, closes #655)
This commit is contained in:
1
src/auto/configure
vendored
1
src/auto/configure
vendored
@@ -9099,6 +9099,7 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking glib-compile-resources" >&5
|
||||
$as_echo_n "checking glib-compile-resources... " >&6; }
|
||||
if test "x$GLIB_COMPILE_RESOURCES" = xno ; then
|
||||
GLIB_COMPILE_RESOURCES=""
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5
|
||||
$as_echo "cannot be found in PATH." >&6; }
|
||||
else
|
||||
|
@@ -2615,6 +2615,7 @@ if test "x$GUITYPE" = "xGTK"; then
|
||||
AC_PATH_PROG(GLIB_COMPILE_RESOURCES,[glib-compile-resources],no)
|
||||
AC_MSG_CHECKING([glib-compile-resources])
|
||||
if test "x$GLIB_COMPILE_RESOURCES" = xno ; then
|
||||
GLIB_COMPILE_RESOURCES=""
|
||||
AC_MSG_RESULT([cannot be found in PATH.])
|
||||
else
|
||||
AC_MSG_RESULT([usable.])
|
||||
|
@@ -748,6 +748,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1390,
|
||||
/**/
|
||||
1389,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user