Author: cazfi Date: Thu Oct 13 18:06:37 2016 New Revision: 34116 URL: http://svn.gna.org/viewcvs/freeciv?rev=34116&view=rev Log: Changed gtk3.22-client enabling --enable-client value to 'gtk3.22'
See patch #7806 Modified: trunk/configure.ac trunk/m4/gtk3.22-client.m4 Modified: trunk/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=34116&r1=34115&r2=34116&view=diff ============================================================================== --- trunk/configure.ac (original) +++ trunk/configure.ac Thu Oct 13 18:06:37 2016 @@ -417,7 +417,7 @@ gui_gtk2=no gui_gtk3=no -gui_gtk3x=no +gui_gtk3_22=no gui_sdl2=no gui_qt=no gui_stub=no @@ -440,8 +440,8 @@ test "x$gui" = "xgtk30" || test "x$gui" = "xgtk-3.0" ; then gui_gtk3=yes - elif test "x$gui" = "xgtk3x" ; then - gui_gtk3x=yes + elif test "x$gui" = "xgtk3.22" ; then + gui_gtk3_22=yes elif test "x$gui" = "xgtk" ; then AC_MSG_WARN([for requested client 'gtk' enabled gtk3-client, that has changed since earlier versions and will change again in the future]) gui_gtk3=yes @@ -999,7 +999,7 @@ if test "x$client" = "xall" ; then if test "x$gui_gtk2" = "xyes" || test "x$gui_gtk3" = "xyes" || - test "x$gui_gtk3x" = "xyes" || + test "x$gui_gtk3_22" = "xyes" || test "x$gui_sdl2" = "xyes" || test "x$gui_qt" = "xyes" || test "x$gui_stub" = "xyes" ; then @@ -1030,14 +1030,14 @@ dnl freeciv-modpack checks AC_ARG_ENABLE([fcmp], - AS_HELP_STRING([--enable-fcmp=no/yes/gtk2/gtk3/gtk3x/qt/cli/all/auto], [build freeciv-modpack-program [auto]]), + AS_HELP_STRING([--enable-fcmp=no/yes/gtk2/gtk3/gtk3.22/qt/cli/all/auto], [build freeciv-modpack-program [auto]]), [fc_mp=${enableval}], [fc_mp=auto]) fcmp_cli=no fcmp_gtk2=no fcmp_gtk3=no -fcmp_gtk3x=no +fcmp_gtk3_22=no fcmp_qt=no fcmp_list= @@ -1063,8 +1063,8 @@ test "x$mp" = "xgtk30" || test "x$mp" = "xgtk-3.0" ; then req_fcmp_gtk3=yes - elif test "x$mp" = "xgtk3x" ; then - req_fcmp_gtk3x=yes + elif test "x$mp" = "xgtk3.22" ; then + req_fcmp_gtk3_22=yes elif test "x$mp" = "xqt" ; then req_fcmp_qt=yes elif test "x$mp" = "xcli" ; then @@ -1103,7 +1103,7 @@ AC_MSG_ERROR([Cannot build gtk3-version of freeciv-modpack as requested]) fi -if test "x$req_fcmp_gtk3x" = "xyes" || +if test "x$req_fcmp_gtk3_22" = "xyes" || test "x$modinst" = "xall" || test "x$modinst" = "xauto" ; then PKG_CHECK_MODULES([GTK3X_MP], [gtk+-3.0 >= 3.18.0], [ @@ -1111,8 +1111,8 @@ GTK3X_MP_CFLAGS="$GTK3X_MP_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46" PKG_CHECK_MODULES([GTHREAD_GTK3X], [gthread-2.0], [ - fcmp_gtk3x=yes - fcmp_list="$fcmp_list gtk3x" + fcmp_gtk3_22=yes + fcmp_list="$fcmp_list gtk3.22" mp_gtk3x_cflags="$GTK3X_MP_CFLAGS $GHTREAD_GTK3X_CFLAGS" mp_gtk3x_libs="$GTK3X_MP_LIBS $GTHREAD_GTK3X_LIBS" if test "x$MINGW32" = "xyes"; then @@ -1127,8 +1127,8 @@ ], [])], []) fi -if test "x$req_fcmp_gtk3x" = "xyes" && test "x$fcmp_gtk3x" != "xyes" ; then - AC_MSG_ERROR([Cannot build gtk3x-version of freeciv-modpack as requested]) +if test "x$req_fcmp_gtk3_22" = "xyes" && test "x$fcmp_gtk3_22" != "xyes" ; then + AC_MSG_ERROR([Cannot build gtk3.22-version of freeciv-modpack as requested]) fi if test "x$req_fcmp_gtk2" = "xyes" || @@ -1193,7 +1193,7 @@ test "x$modinst" != "xno" && test "x$modinst" != "xcli" && test "x$fcmp_gtk3" != "xyes" && - test "x$fcmp_gtk3x" != "xyes" && + test "x$fcmp_gtk3_22" != "xyes" && test "x$fcmp_gtk2" != "xyes" && test "x$fcmp_qt" != "xyes" ;then AC_MSG_ERROR([Cannot build modpack installer with any gui]) @@ -1212,7 +1212,7 @@ AM_CONDITIONAL([MODINST], [test "x$modinst" != "xno"]) AM_CONDITIONAL([MODINST_GTK3], [test "x$fcmp_gtk3" = "xyes"]) -AM_CONDITIONAL([MODINST_GTK3X], [test "x$fcmp_gtk3x" = "xyes"]) +AM_CONDITIONAL([MODINST_GTK3X], [test "x$fcmp_gtk3_22" = "xyes"]) AM_CONDITIONAL([MODINST_GTK2], [test "x$fcmp_gtk2" = "xyes"]) AM_CONDITIONAL([MODINST_QT], [test "x$fcmp_qt" = "xyes"]) AM_CONDITIONAL([MODINST_CLI], [test "x$fcmp_cli" = "xyes"]) @@ -1300,7 +1300,7 @@ AM_CONDITIONAL(CLIENT_GUI_SDL2, test "x$gui_sdl2" = "xyes") AM_CONDITIONAL(CLIENT_GUI_GTK_2_0, test "x$gui_gtk2" = "xyes") AM_CONDITIONAL(CLIENT_GUI_GTK_3_0, test "x$gui_gtk3" = "xyes") -AM_CONDITIONAL(CLIENT_GUI_GTK_3_22, test "x$gui_gtk3x" = "xyes") +AM_CONDITIONAL(CLIENT_GUI_GTK_3_22, test "x$gui_gtk3_22" = "xyes") AM_CONDITIONAL(CLIENT_GUI_GTK_3X, /bin/false) AM_CONDITIONAL(CLIENT_GUI_QT, test "x$gui_qt" = "xyes") AM_CONDITIONAL(CLIENT_GUI_STUB, test "x$gui_stub" = "xyes") @@ -1848,7 +1848,7 @@ In-development client frontends: (these are not yet ready for general use) - Gtk-3.x $gui_gtk3x + Gtk-3.22 $gui_gtk3_22 Not maintained client frontends: Gtk-2.0: $gui_gtk2 Modified: trunk/m4/gtk3.22-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk3.22-client.m4?rev=34116&r1=34115&r2=34116&view=diff ============================================================================== --- trunk/m4/gtk3.22-client.m4 (original) +++ trunk/m4/gtk3.22-client.m4 Thu Oct 13 18:06:37 2016 @@ -1,12 +1,12 @@ -# Try to configure the GTK+-3.x client (gui-gtk-3.x) +# Try to configure the GTK+-3.22 client (gui-gtk-3.22) # FC_GTK3X_CLIENT -# Test for GTK+-3.0 libraries needed for gui-gtk-3.x +# Test for GTK+-3.0 libraries needed for gui-gtk-3.22 AC_DEFUN([FC_GTK3_22_CLIENT], [ # Add check "x$client" = "xauto" when this becomes supported client - if test "x$gui_gtk3x" = "xyes" || + if test "x$gui_gtk3_22" = "xyes" || test "x$client" = "xall" ; then PKG_CHECK_MODULES([GTK3X], [gtk+-3.0 >= 3.18.0], [ @@ -25,7 +25,7 @@ fi ], [ - FC_NO_CLIENT([gtk3x], [GTK+-3.0 libraries not found]) + FC_NO_CLIENT([gtk3.22], [GTK+-3.0 libraries not found]) ]) fi ]) _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits