patch 7.4.1409

Problem:    Configure includes GUI despite --disable-gui flag.
Solution:   Add SKIP_GTK3. (Kazunobu Kuriyama)

diff --git a/src/auto/configure b/src/auto/configure
index 1b3b0c70fc9745a5134f73f422a126ed12a0d9dc..a528ccbef303776f3c165b68d92cbaff070884a0 100755 (executable)
--- 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 930278c7de9fb581153b8737285191f4b1e3d83f..acbccdea39bc71609c7771687bcb6b233a790696 100644 (file)
--- 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 927e0b2f34b98405dabf51c9c3c588f9f593841b..f1edf36477502e272e4acadea51dd13c029e6fff 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1409,
 /**/
     1408,
 /**/