From: Randy Taylor <dev@rjt.dev>
To: 54633@debbugs.gnu.org
Subject: bug#54633: [PATCH] * configure.ac: Fix --without-gif for W32, NS, Haiku, and PGTK.
Date: Wed, 30 Mar 2022 01:45:16 +0000 [thread overview]
Message-ID: <rMR6oZvAS4zNQPtNLTZq-GND5dloHbcdMtcJaZSBRWqTBGn0ckmkoQK9qk1xuaB8ucwQVpIqyZVYjCCdou1-8H0u_Xo3x6V8Tlny1AlcwrU=@rjt.dev> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 102 bytes --]
--without-gif was only checked against X11; with this patch it is now checked against all the options.
[-- Attachment #1.2: Type: text/html, Size: 526 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-configure.ac-Fix-without-gif-for-W32-NS-Haiku-and-PG.patch --]
[-- Type: text/x-patch; name=0001-configure.ac-Fix-without-gif-for-W32-NS-Haiku-and-PG.patch, Size: 2575 bytes --]
From 3fa7d851d2e2925132114e4d33edd37f28143812 Mon Sep 17 00:00:00 2001
From: Randy Taylor <dev@rjt.dev>
Date: Tue, 29 Mar 2022 20:59:18 -0400
Subject: [PATCH] * configure.ac: Fix --without-gif for W32, NS, Haiku, and
PGTK.
Copyright-paperwork-exempt: yes
---
configure.ac | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/configure.ac b/configure.ac
index 10358c2b64..2f998ca4ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4288,25 +4288,27 @@ AC_DEFUN
if test "${HAVE_GIF}" = "yes"; then
AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif (or ungif) library.])
fi
-elif test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \
- || test "${HAVE_W32}" = "yes" || test "${HAVE_NS}" = "yes" \
- || test "${HAVE_BE_APP}" = "yes" || test "$window_system" = "pgtk"; then
- AC_CHECK_HEADER(gif_lib.h,
-# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
-# Earlier versions can crash Emacs, but version 5.0 removes EGifPutExtensionLast.
- [AC_CHECK_LIB(gif, GifMakeMapObject, HAVE_GIF=yes,
- [AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=maybe)])])
-
- if test "$HAVE_GIF" = yes; then
- LIBGIF=-lgif
- elif test "$HAVE_GIF" = maybe; then
-# If gif_lib.h but no libgif, try libungif.
- AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=no)
- test "$HAVE_GIF" = yes && LIBGIF=-lungif
- fi
+elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes" \
+ || test "${HAVE_NS}" = "yes" || test "${HAVE_BE_APP}" = "yes" \
+ || test "$window_system" = "pgtk"; then
+ if test "${with_gif}" != "no"; then
+ AC_CHECK_HEADER(gif_lib.h,
+ # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
+ # Earlier versions can crash Emacs, but version 5.0 removes EGifPutExtensionLast.
+ [AC_CHECK_LIB(gif, GifMakeMapObject, HAVE_GIF=yes,
+ [AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=maybe)])])
+
+ if test "$HAVE_GIF" = yes; then
+ LIBGIF=-lgif
+ elif test "$HAVE_GIF" = maybe; then
+ # If gif_lib.h but no libgif, try libungif.
+ AC_CHECK_LIB(ungif, EGifPutExtensionLast, HAVE_GIF=yes, HAVE_GIF=no)
+ test "$HAVE_GIF" = yes && LIBGIF=-lungif
+ fi
- if test "${HAVE_GIF}" = "yes"; then
- AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif (or ungif) library.])
+ if test "${HAVE_GIF}" = "yes"; then
+ AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif (or ungif) library.])
+ fi
fi
fi
AC_SUBST(LIBGIF)
--
2.35.1
next reply other threads:[~2022-03-30 1:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 1:45 Randy Taylor [this message]
2022-03-30 5:31 ` bug#54633: [PATCH] * configure.ac: Fix --without-gif for W32, NS, Haiku, and PGTK Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-03-30 12:13 ` Eli Zaretskii
2022-03-30 12:42 ` Randy Taylor
2022-03-30 13:27 ` Eli Zaretskii
2022-03-30 13:34 ` Randy Taylor
2022-03-30 13:39 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-03-30 13:46 ` Eli Zaretskii
2022-03-30 13:34 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-03-30 14:55 ` Randy Taylor
2022-04-04 14:09 ` Randy Taylor
2022-04-05 1:08 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='rMR6oZvAS4zNQPtNLTZq-GND5dloHbcdMtcJaZSBRWqTBGn0ckmkoQK9qk1xuaB8ucwQVpIqyZVYjCCdou1-8H0u_Xo3x6V8Tlny1AlcwrU=@rjt.dev' \
--to=dev@rjt.dev \
--cc=54633@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).