Author: cazfi
Date: Tue Mar 28 17:35:31 2017
New Revision: 35164

URL: http://svn.gna.org/viewcvs/freeciv?rev=35164&view=rev
Log:
Clean up gtk3.22-client bootstrap variables

See hrm Feature #647949

Modified:
    trunk/client/Makefile.am
    trunk/client/gui-gtk-3.22/Makefile.am
    trunk/configure.ac
    trunk/m4/gtk3.22-client.m4

Modified: trunk/client/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/Makefile.am?rev=35164&r1=35163&r2=35164&view=diff
==============================================================================
--- trunk/client/Makefile.am    (original)
+++ trunk/client/Makefile.am    Tue Mar 28 17:35:31 2017
@@ -206,23 +206,23 @@
 bin_PROGRAMS += freeciv-gtk3.22
 noinst_LTLIBRARIES += libfcgui-gtk3_22.la
 libfcgui_gtk3_22_la_SOURCES = $(freeciv_client_src)
-libfcgui_gtk3_22_la_LIBADD = gui-gtk-3.22/libgui-gtk3x.la $(clientlibs)
+libfcgui_gtk3_22_la_LIBADD = gui-gtk-3.22/libgui-gtk3_22.la $(clientlibs)
 freeciv_gtk3_22_SOURCES = dummy.c
-freeciv_gtk3_22_LDFLAGS = $(gui_gtk3x_ldflags)
+freeciv_gtk3_22_LDFLAGS = $(gui_gtk3_22_ldflags)
 freeciv_gtk3_22_LDADD = \
  $(SOUND_LIBS) \
  libfcgui-gtk3_22.la \
  $(top_builddir)/common/libfreeciv.la \
  $(INTLLIBS) $(CLIENT_LIBS) $(SOUND_LIBS) $(CLIENTICON) \
  $(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
- $(gui_gtk3x_libs)
+ $(gui_gtk3_22_libs)
 endif
 
 if CLIENT_GUI_GTK_3X
 bin_PROGRAMS += freeciv-gtk3x
 noinst_LTLIBRARIES += libfcgui-gtk3x.la
 libfcgui_gtk3x_la_SOURCES = $(freeciv_client_src)
-libfcgui_gtk3x_la_LIBADD = gui-gtk-3.22/libgui-gtk3x.la $(clientlibs)
+libfcgui_gtk3x_la_LIBADD = gui-gtk-4.0/libgui-gtk3x.la $(clientlibs)
 freeciv_gtk3x_SOURCES = dummy.c
 freeciv_gtk3x_LDFLAGS = $(gui_gtk3x_ldflags)
 freeciv_gtk3x_LDADD = \

Modified: trunk/client/gui-gtk-3.22/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/Makefile.am?rev=35164&r1=35163&r2=35164&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.22/Makefile.am       (original)
+++ trunk/client/gui-gtk-3.22/Makefile.am       Tue Mar 28 17:35:31 2017
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LTLIBRARIES = libgui-gtk3x.la
+noinst_LTLIBRARIES = libgui-gtk3_22.la
 AM_CPPFLAGS = \
        -I$(srcdir)/.. \
        -I$(srcdir)/../include \
@@ -12,9 +12,9 @@
        -I$(srcdir)/../agents \
        -I$(srcdir)/../luascript \
        -I$(top_srcdir)/dependencies/tinycthread \
-       $(gui_gtk3x_cflags) $(SOUND_CFLAGS)
+       $(gui_gtk3_22_cflags) $(SOUND_CFLAGS)
 
-libgui_gtk3x_la_SOURCES = \
+libgui_gtk3_22_la_SOURCES = \
        action_dialog.c \
        canvas.c        \
        canvas.h        \
@@ -102,4 +102,4 @@
        wldlg.c         \
        wldlg.h
 
-libgui_gtk3x_la_LIBADD = -lm
+libgui_gtk3_22_la_LIBADD = -lm

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=35164&r1=35163&r2=35164&view=diff
==============================================================================
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Tue Mar 28 17:35:31 2017
@@ -412,7 +412,7 @@
 dnl all:  Autodetect as many as possible.
 dnl comma-separated-list: Detect these or abort.
 AC_ARG_ENABLE([client],
-  AS_HELP_STRING([--enable-client=auto/all/gtk3/sdl2/qt/stub],
+  AS_HELP_STRING([--enable-client=auto/all/gtk3/gtk3.22/sdl2/qt/stub],
                  [clients to compile [auto](list for multiple)]),
 [clients=${enableval}],
 [client=auto])
@@ -1211,6 +1211,9 @@
 AC_SUBST([gui_gtk3_cflags])
 AC_SUBST([gui_gtk3_libs])
 AC_SUBST([gui_gtk3_ldflags])
+AC_SUBST([gui_gtk3_22_cflags])
+AC_SUBST([gui_gtk3_22_libs])
+AC_SUBST([gui_gtk3_22_ldflags])
 AC_SUBST([gui_gtk3x_cflags])
 AC_SUBST([gui_gtk3x_libs])
 AC_SUBST([gui_gtk3x_ldflags])

Modified: trunk/m4/gtk3.22-client.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk3.22-client.m4?rev=35164&r1=35163&r2=35164&view=diff
==============================================================================
--- trunk/m4/gtk3.22-client.m4  (original)
+++ trunk/m4/gtk3.22-client.m4  Tue Mar 28 17:35:31 2017
@@ -7,20 +7,20 @@
 [
   if test "x$gui_gtk3_22" = "xyes" ||
      test "x$client" = "xall" || test "x$client" = "xauto" ; then
-    PKG_CHECK_MODULES([GTK3X], [gtk+-3.0 >= 3.22.0],
+    PKG_CHECK_MODULES([GTK3_22], [gtk+-3.0 >= 3.22.0],
       [
-        GTK3X_CFLAGS="$GTK3X_CFLAGS 
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_20"
-        GTK3X_CFLAGS="$GTK3X_CFLAGS 
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50"
+        GTK3_22_CFLAGS="$GTK3_22_CFLAGS 
-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_20"
+        GTK3_22_CFLAGS="$GTK3_22_CFLAGS 
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50"
         gui_gtk3_22=yes
         if test "x$client" = "xauto" ; then
           client=yes
         fi
-        gui_gtk3x_cflags="$GTK3X_CFLAGS"
-        gui_gtk3x_libs="$GTK3X_LIBS"
+        gui_gtk3_22_cflags="$GTK3_22_CFLAGS"
+        gui_gtk3_22_libs="$GTK3_22_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"
+          gui_gtk3_22_cflags="$gui_gtk3_22_cflags -mms-bitfields"
+          gui_gtk3_22_ldflags="$gui_gtk3_22_ldflags -mwindows"
         fi
       ],
       [


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to