From a044aa40fa3fbeca07cca82708ee827d6f4d82e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <l.illanes@gmx.de>
Date: Fri, 16 Sep 2016 16:38:50 +0200
Subject: Fix Vim build when GTK {headers,libraries} are installed on the build
 host.

---
 vim-7.4.1952.local.patch | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'vim-7.4.1952.local.patch')

diff --git a/vim-7.4.1952.local.patch b/vim-7.4.1952.local.patch
index 07097519..d6ea7b22 100644
--- a/vim-7.4.1952.local.patch
+++ b/vim-7.4.1952.local.patch
@@ -18,3 +18,30 @@
  
  auto/pathdef.c: Makefile auto/config.mk
  	-@echo creating $@
+--- vim-7.4.1952/src/auto/configure.orig	2016-06-21 23:42:20.000000000 +0200
++++ vim-7.4.1952/src/auto/configure	2016-09-16 16:37:28.147266000 +0200
+@@ -2603,7 +2603,7 @@
+ ## -------------------- ##
+ 
+ ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
++ac_cpp='$CPP $CFLAGS $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -7607,6 +7607,7 @@
+ 
+ # Standard set of common directories for X headers.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
++if test -z "$ac_x_header_dirs"; then
+ ac_x_header_dirs='
+ /usr/X11/include
+ /usr/X11R7/include
+@@ -7645,6 +7646,7 @@
+ 
+ /usr/openwin/include
+ /usr/openwin/share/include'
++fi
+ 
+ if test "$ac_x_includes" = no; then
+   # Guess where to find include files, by looking for Xlib.h.
-- 
cgit v1.2.3