Author: cazfi Date: Sat Aug 15 20:41:58 2015 New Revision: 29530 URL: http://svn.gna.org/viewcvs/freeciv?rev=29530&view=rev Log: Updated gtk2.m4 to match gtk-2-24 branch as of 09-Aug-15 (commit 29da0d99aae55b3fec1128ba7f7dc73539069155)
Most notably this fixes cross-compilation with prefixed pkg-config (At least in what comes to gtk2 related package detection) See patch #6209 Modified: branches/S2_6/m4/gtk-2.0.m4 Modified: branches/S2_6/m4/gtk-2.0.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/gtk-2.0.m4?rev=29530&r1=29529&r2=29530&view=diff ============================================================================== --- branches/S2_6/m4/gtk-2.0.m4 (original) +++ branches/S2_6/m4/gtk-2.0.m4 Sat Aug 15 20:41:58 2015 @@ -25,19 +25,8 @@ no_gtk="" - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - - if test x$PKG_CONFIG != xno ; then - if pkg-config --atleast-pkgconfig-version 0.7 ; then - : - else - echo *** pkg-config too old; version 0.7 or better required. - no_gtk=yes - PKG_CONFIG=no - fi - else - no_gtk=yes - fi + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + PKG_PROG_PKG_CONFIG([0.7]) min_gtk_version=ifelse([$1], ,2.0.0,$1) AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) @@ -88,7 +77,7 @@ int major, minor, micro; char *tmp_version; - system ("touch conf.gtktest"); + fclose (fopen ("conf.gtktest", "w")); /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = g_strdup("$min_gtk_version"); _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits