From 1bd260113a0fc81bfd219013e45ccc34e1ccd897 Mon Sep 17 00:00:00 2001
From: cazfi <cazfi@a0f10bec-cc02-0410-94fc-a9cfff90b4cd>
Date: Wed, 26 Apr 2017 16:24:21 +0000
Subject: [PATCH] Fail --enable-client=gtk3.22 at configure time when gtk3 not
 present

See hrm Bug #654979


git-svn-id: svn://svn.gna.org/svn/freeciv/branches/S2_6@35299 a0f10bec-cc02-0410-94fc-a9cfff90b4cd
---
 m4/gtk3.22-client.m4 | 2 +-
 m4/no-client.m4      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/m4/gtk3.22-client.m4 b/m4/gtk3.22-client.m4
index be3cce86d8..673915072e 100644
--- a/m4/gtk3.22-client.m4
+++ b/m4/gtk3.22-client.m4
@@ -25,7 +25,7 @@ AC_DEFUN([FC_GTK3_22_CLIENT],
         fi
       ],
       [
-        FC_NO_CLIENT([gtk3_22], [GTK+-3.22 libraries not found])
+        FC_NO_CLIENT([gtk3.22], [GTK+-3.22 libraries not found])
       ])
   fi
 ])
diff --git a/m4/no-client.m4 b/m4/no-client.m4
index ee3e5da6dd..c368f98efb 100644
--- a/m4/no-client.m4
+++ b/m4/no-client.m4
@@ -8,7 +8,9 @@
 
 AC_DEFUN([FC_NO_CLIENT],
 [
-  if test "x`eval echo '$'gui_$1`" = "xyes"; then
+  UL_GUI=$(printf $1 | $SED 's/\./_/g')
+
+  if test "x`eval echo '$'gui_$UL_GUI`" = "xyes"; then
     AC_MSG_ERROR([specified client '$1' not configurable ($2)])
   fi
 ])
-- 
2.11.4.GIT