Author: cazfi
Date: Sat Nov 12 07:19:13 2016
New Revision: 34489
URL: http://svn.gna.org/viewcvs/freeciv?rev=34489&view=rev
Log:
Made gtk3.22-client the default
See patch #7970
Modified:
trunk/configure.ac
trunk/doc/README.packaging
trunk/m4/gtk3.22-client.m4
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=34489&r1=34488&r2=34489&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Nov 12 07:19:13 2016
@@ -966,6 +966,9 @@
AS_MESSAGE([checking for which clients to compile:...])
fi
+ dnl Gtk-3.22-specific overrides
+ FC_GTK3_22_CLIENT
+
dnl Gtk-3.0-specific overrides
FC_GTK3_CLIENT
@@ -977,9 +980,6 @@
dnl SDL2-specific overrides
FC_SDL2_CLIENT
-
- dnl Gtk-3.22-specific overrides
- FC_GTK3_22_CLIENT
dnl Stub-specific overrides
if test "x$gui_stub" = "xyes" || test "x$client" = "xall" ; then
@@ -1843,14 +1843,11 @@
Build freeciv client: $client
Maintained client frontends:
+ Gtk-3.22 $gui_gtk3_22
Gtk-3.0: $gui_gtk3
SDL2: $gui_sdl2
QT: $gui_qt
Stub: $gui_stub
-
- In-development client frontends:
- (these are not yet ready for general use)
- Gtk-3.22 $gui_gtk3_22
Not maintained client frontends:
Gtk-2.0: $gui_gtk2
Modified: trunk/doc/README.packaging
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.packaging?rev=34489&r1=34488&r2=34489&view=diff
==============================================================================
--- trunk/doc/README.packaging (original)
+++ trunk/doc/README.packaging Sat Nov 12 07:19:13 2016
@@ -25,6 +25,7 @@
* Support for project definition file added for freeciv forks to define for
themselves. This has obsoleted old --with-modlist configure option.
See chapter "Project definition file" below.
+* gtk3.22-client is now the default
* Xaw-client has been dropped completely
* Sdl-client has been dropped completely
* Minimum libcurl version is now 7.15.4
Modified: trunk/m4/gtk3.22-client.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk3.22-client.m4?rev=34489&r1=34488&r2=34489&view=diff
==============================================================================
--- trunk/m4/gtk3.22-client.m4 (original)
+++ trunk/m4/gtk3.22-client.m4 Sat Nov 12 07:19:13 2016
@@ -7,7 +7,7 @@
[
# Add check "x$client" = "xauto" when this becomes supported client
if test "x$gui_gtk3_22" = "xyes" ||
- test "x$client" = "xall" ; then
+ test "x$client" = "xall" || test "x$client" = "xauto" ; then
PKG_CHECK_MODULES([GTK3X], [gtk+-3.0 >= 3.18.0],
[
GTK3X_CFLAGS="$GTK3X_CFLAGS
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_18"
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
