Mercurial > vim
comparison src/configure.in @ 7380:055a0b587a3e v7.4.995
commit https://github.com/vim/vim/commit/36e294c00c784b9ddd05a4fdbea2e331ab2b1ca8
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Dec 29 18:55:46 2015 +0100
patch 7.4.995
Problem: gdk_pixbuf_new_from_inline() is deprecated.
Solution: Generate auto/gui_gtk_gresources.c. (Kazunobu Kazunobu,
closes https://github.com/vim/vim/issues/507)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 29 Dec 2015 19:00:05 +0100 |
| parents | b871e4bdb319 |
| children | c79a52efcf2f |
comparison
equal
deleted
inserted
replaced
| 7379:0463a4e8a4f0 | 7380:055a0b587a3e |
|---|---|
| 2498 } | 2498 } |
| 2499 fi | 2499 fi |
| 2500 fi | 2500 fi |
| 2501 fi | 2501 fi |
| 2502 | 2502 |
| 2503 dnl Check the version of Gdk-Pixbuf. If the version is 2.32 or later and | |
| 2504 dnl glib-compile-resources is found in PATH, use GResource. | |
| 2505 if test "x$GUITYPE" = "xGTK"; then | |
| 2506 AC_MSG_CHECKING([version of Gdk-Pixbuf]) | |
| 2507 gdk_pixbuf_version=`$PKG_CONFIG --modversion gdk-pixbuf-2.0` | |
| 2508 if test "x$gdk_pixbuf_version" != x ; then | |
| 2509 gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \ | |
| 2510 sed -e 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*/\1/'` | |
| 2511 if test "x$gdk_pixbuf_version_minor" != x -a \ | |
| 2512 $gdk_pixbuf_version_minor -ge 32 ; then | |
| 2513 AC_MSG_RESULT([OK.]) | |
| 2514 AC_PATH_PROG(GLIB_COMPILE_RESOURCES,[glib-compile-resources],no) | |
| 2515 AC_MSG_CHECKING([glib-compile-resources]) | |
| 2516 if test "x$GLIB_COMPILE_RESOURCES" = xno ; then | |
| 2517 AC_MSG_RESULT([cannot be found in PATH.]) | |
| 2518 else | |
| 2519 AC_MSG_RESULT([usable.]) | |
| 2520 AC_DEFINE(USE_GRESOURCE) | |
| 2521 GRESOURCE_HDR="auto/gui_gtk_gresources.h" | |
| 2522 GRESOURCE_SRC="auto/gui_gtk_gresources.c" | |
| 2523 GRESOURCE_OBJ="objects/gui_gtk_gresources.o" | |
| 2524 fi | |
| 2525 else | |
| 2526 AC_MSG_RESULT([not usable.]) | |
| 2527 fi | |
| 2528 else | |
| 2529 AC_MSG_RESULT([cannot obtain from pkg_config.]) | |
| 2530 fi | |
| 2531 fi | |
| 2532 AC_SUBST(GLIB_COMPILE_RESOURCES) | |
| 2533 AC_SUBST(GRESOURCE_HDR) | |
| 2534 AC_SUBST(GRESOURCE_SRC) | |
| 2535 AC_SUBST(GRESOURCE_OBJ) | |
| 2536 | |
| 2503 dnl Check for Motif include files location. | 2537 dnl Check for Motif include files location. |
| 2504 dnl The LAST one found is used, this makes the highest version to be used, | 2538 dnl The LAST one found is used, this makes the highest version to be used, |
| 2505 dnl e.g. when Motif1.2 and Motif2.0 are both present. | 2539 dnl e.g. when Motif1.2 and Motif2.0 are both present. |
| 2506 | 2540 |
| 2507 if test -z "$SKIP_MOTIF"; then | 2541 if test -z "$SKIP_MOTIF"; then |