Author: cazfi
Date: Tue Oct 11 21:25:36 2016
New Revision: 34099
URL: http://svn.gna.org/viewcvs/freeciv?rev=34099&view=rev
Log:
Added gtk3x-client.m4
See patch #7799
Added:
trunk/m4/gtk3x-client.m4
Modified:
trunk/Makefile.am
Modified: trunk/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/Makefile.am?rev=34099&r1=34098&r2=34099&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Tue Oct 11 21:25:36 2016
@@ -51,6 +51,7 @@
m4/gtk2-client.m4 \
m4/gtk3-client.m4 \
m4/gtk3.22-client.m4 \
+ m4/gtk3x-client.m4 \
m4/iconv.m4 \
m4/intlmacosx.m4 \
m4/lib-ld.m4 \
Added: trunk/m4/gtk3x-client.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk3x-client.m4?rev=34099&view=auto
==============================================================================
--- trunk/m4/gtk3x-client.m4 (added)
+++ trunk/m4/gtk3x-client.m4 Tue Oct 11 21:25:36 2016
@@ -0,0 +1,31 @@
+# Try to configure the GTK+-3.x client (gui-gtk-3.9x)
+
+# FC_GTK3X_CLIENT
+# Test for GTK+-3.90 libraries needed for gui-gtk-3.9x
+
+AC_DEFUN([FC_GTK3X_CLIENT],
+[
+ # Add check "x$client" = "xauto" when this becomes supported client
+ if test "x$gui_gtk3x" = "xyes" ||
+ test "x$client" = "xall" ; then
+ PKG_CHECK_MODULES([GTK3X], [gtk+-4.0 >= 3.89.0],
+ [
+ GTK3X_CFLAGS="$GTK3X_CFLAGS
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_90"
+ GTK3X_CFLAGS="$GTK3X_CFLAGS
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50"
+ gui_gtk3x=yes
+ if test "x$client" = "xauto" ; then
+ client=yes
+ fi
+ gui_gtk3x_cflags="$GTK3X_CFLAGS"
+ gui_gtk3x_libs="$GTK3X_LIBS"
+ if test "x$MINGW" = "xyes"; then
+ dnl Required to compile gtk3 on Windows platform
+ gui_gtk3x_cflags="$gui_gtk3x_cflags -mms-bitfields"
+ gui_gtk3x_ldflags="$gui_gtk3x_ldflags -mwindows"
+ fi
+ ],
+ [
+ FC_NO_CLIENT([gtk3x], [GTK+-3.9x libraries not found])
+ ])
+ fi
+])
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
