Author: cazfi
Date: Sat Aug 8 17:27:47 2015
New Revision: 29398
URL: http://svn.gna.org/viewcvs/freeciv?rev=29398&view=rev
Log:
Reverted patch #5891: "Added configure option --with-glgtk"
Modified:
trunk/configure.ac
trunk/m4/gtk-3.0.m4
trunk/m4/gtk3-client.m4
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=29398&r1=29397&r2=29398&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Aug 8 17:27:47 2015
@@ -180,19 +180,6 @@
feature_ipv6=missing
fi
fi
-
-AC_ARG_WITH([glgtk],
- AS_HELP_STRING([--with-glgtk], [use gtk3 with GL support (WIP)]),
-[glgtk=$withval], [glgtk="maybe"])
-
-if test "x$glgtk" = "xyes" ; then
- gtk3_minver=3.16.0
- gtk3_cflags="-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_16
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_42"
-else
- gtk3_minver=3.8.0
- gtk3_cflags="-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_8
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
-fi
-gtk3_cflags="$gtk3_cflags -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_8
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
AC_ARG_WITH([project-definition],
AS_HELP_STRING([--with-project-definition=file], [use given project
definition file]),
@@ -896,7 +883,7 @@
if test "x$req_fcmp_gtk3" = "xyes" ||
test "x$modinst" = "xall" || test "x$modinst" = "xauto" ; then
- AM_PATH_GTK_3_0([$gtk3_minver],
+ AM_PATH_GTK_3_0([3.8.0],
[
PKG_CHECK_MODULES([GTHREAD], [gthread-2.0],
[
Modified: trunk/m4/gtk-3.0.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk-3.0.m4?rev=29398&r1=29397&r2=29398&view=diff
==============================================================================
--- trunk/m4/gtk-3.0.m4 (original)
+++ trunk/m4/gtk-3.0.m4 Sat Aug 8 17:27:47 2015
@@ -58,7 +58,8 @@
if test x"$no_gtk" = x ; then
GTK3_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
- GTK3_CFLAGS="$GTK3_CFLAGS $gtk3_cflags"
+ GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_8
-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_8"
+ GTK3_CFLAGS="$GTK3_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
GTK3_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
Modified: trunk/m4/gtk3-client.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk3-client.m4?rev=29398&r1=29397&r2=29398&view=diff
==============================================================================
--- trunk/m4/gtk3-client.m4 (original)
+++ trunk/m4/gtk3-client.m4 Sat Aug 8 17:27:47 2015
@@ -7,7 +7,7 @@
[
if test "x$gui_gtk3" = "xyes" || test "x$client" = "xauto" ||
test "x$client" = "xall" ; then
- AM_PATH_GTK_3_0([$gtk3_minver],
+ AM_PATH_GTK_3_0([3.8.0],
[
gui_gtk3=yes
if test "x$client" = "xauto" ; then
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
