summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-23 22:30:31 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-23 22:30:31 +0100
commit1858a842af5e3b07157add378ee3fd7b512cfea6 (patch)
tree64f4bb03e0918f20286e8153942df8aaf4512da7
parent3ea0f1ae318db6cd9413914bb2ff824d71cefc6e (diff)
downloadvim-git-7.4.1409.tar.gz
patch 7.4.1409v7.4.1409
Problem: Configure includes GUI despite --disable-gui flag. Solution: Add SKIP_GTK3. (Kazunobu Kuriyama)
-rwxr-xr-xsrc/auto/configure1
-rw-r--r--src/configure.in1
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure
index 1b3b0c70f..a528ccbef 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -8545,6 +8545,7 @@ enable_gui_canon=`echo "_$enable_gui" | \
sed 's/[ _+-]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
SKIP_GTK2=YES
+SKIP_GTK3=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
SKIP_ATHENA=YES
diff --git a/src/configure.in b/src/configure.in
index 930278c7d..acbccdea3 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -2207,6 +2207,7 @@ enable_gui_canon=`echo "_$enable_gui" | \
dnl Skip everything by default.
SKIP_GTK2=YES
+SKIP_GTK3=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
SKIP_ATHENA=YES
diff --git a/src/version.c b/src/version.c
index 927e0b2f3..f1edf3647 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1409,
+/**/
1408,
/**/
1407,