]> git.eshelyaron.com Git - emacs.git/commitdiff
Enable webp support in PGTK builds, too
authorKévin Le Gouguec <kevin.legouguec@gmail.com>
Sun, 19 Dec 2021 13:58:41 +0000 (14:58 +0100)
committerLars Ingebrigtsen <larsi@gnus.org>
Sun, 19 Dec 2021 13:58:41 +0000 (14:58 +0100)
* configure.ac (HAVE_WEBP): Enable webp in PGTK builds, too.

configure.ac

index 2e7ea2bd6fda52529164ed89d8850cb1cd9dc258..d1a433a5022b94bc020ca9b4ef20870161fceff4 100644 (file)
@@ -2315,6 +2315,8 @@ dnl use the toolkit if we have gtk, or X11R5 or newer.
     term_header=pgtkterm.h
     with_gtk3=yes
     USE_X_TOOLKIT=none
+    HAVE_PGTK=yes
+    AC_DEFINE([HAVE_PGTK], 1, [Define to 1 if you have pure Gtk+-3.])
   ;;
   haiku )
     term_header=haikuterm.h
@@ -2677,7 +2679,7 @@ HAVE_WEBP=no
 if test "${with_webp}" != "no"; then
    if test "${HAVE_X11}" = "yes" || test "${opsys}" = "mingw32" \
    || test "${HAVE_W32}" = "yes" || test "${HAVE_NS}" = "yes" \
-   || test "${HAVE_BE_APP}" = "yes"; then
+   || test "${HAVE_BE_APP}" = "yes" || test "${HAVE_PGTK}" = "yes"; then
       WEBP_REQUIRED=0.6.0
       WEBP_MODULE="libwebp >= $WEBP_REQUIRED"
 
@@ -2950,8 +2952,6 @@ PGTK_LIBS=
 if test "$window_system" = "pgtk"; then
   PGTK_OBJ="pgtkfns.o pgtkterm.o pgtkselect.o pgtkmenu.o pgtkim.o xsettings.o"
   PGTK_LIBS="$GTK_LIBS"
-  HAVE_PGTK=yes
-  AC_DEFINE([HAVE_PGTK], 1, [Define to 1 if you have pure Gtk+-3.])
 fi
 AC_SUBST(PGTK_OBJ)
 AC_SUBST(PGTK_LIBS)