kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2.git/commit/?id=ab52c354fe0ea33aea9f8e9bf929b3861e1c2323
commit ab52c354fe0ea33aea9f8e9bf929b3861e1c2323 Author: Kim Woelders <[email protected]> Date: Sun Sep 26 17:21:23 2021 +0200 autofoo: Drop support for libungif Obsolete for 15+ years. --- configure.ac | 32 +++++--------------------------- src/modules/loaders/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/configure.ac b/configure.ac index 8c8b0b1..cdc663d 100644 --- a/configure.ac +++ b/configure.ac @@ -236,7 +236,6 @@ AM_CONDITIONAL(BUILD_TIFF_LOADER, test "$tiff_ok" = yes) AC_MSG_CHECKING(whether to enable gif support) -gif_lib=any AC_ARG_WITH([gif], [AS_HELP_STRING([--without-gif], [Disable GIF image loader])], [ @@ -244,10 +243,6 @@ AC_ARG_WITH([gif], gif_loader=no else gif_loader=yes - case "$withval" in - giflib) gif_lib=giflib;; - libungif) gif_lib=libungif;; - esac fi ], [ gif_loader=auto ] @@ -255,28 +250,12 @@ AC_ARG_WITH([gif], AC_MSG_RESULT($gif_loader) if test "$gif_loader" != no ; then - AC_MSG_CHECKING(for preferred gif provider) - AC_MSG_RESULT($gif_lib) - - if test "$gif_lib" != libungif ; then - AC_CHECK_LIB(gif, DGifOpenFileName, gif_libs="-lgif" gif_ok=yes, gif_ok=no) + AC_CHECK_LIB(gif, DGifOpenFileName, gif_libs="-lgif" gif_ok=yes, gif_ok=no) + if test "$gif_ok" = yes; then + AC_CHECK_HEADER([gif_lib.h], , gif_ok=no) if test "$gif_ok" = yes; then - AC_CHECK_HEADER([gif_lib.h], , gif_ok=no) - if test "$gif_ok" = yes; then - GIFLIBS=$gif_libs - gif_lib=giflib - fi - fi - fi - - if test "$gif_lib" != giflib ; then - AC_CHECK_LIB(ungif, DGifOpenFileName, gif_libs="-lungif" gif_ok=yes, gif_ok=no) - if test "$gif_ok" = yes; then - AC_CHECK_HEADER([gif_lib.h], , gif_ok=no) - if test "$gif_ok" = yes; then - GIFLIBS=$gif_libs - gif_lib=libungif - fi + GIF_LIBS=$gif_libs + AC_SUBST(GIF_LIBS) fi fi @@ -291,7 +270,6 @@ else gif_ok=no fi AM_CONDITIONAL(BUILD_GIF_LOADER, test "$gif_ok" = yes) -AC_SUBST(GIFLIBS) AC_MSG_CHECKING(whether to enable zlib support) diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am index 3710477..af74739 100644 --- a/src/modules/loaders/Makefile.am +++ b/src/modules/loaders/Makefile.am @@ -74,7 +74,7 @@ ff_la_LIBTOOLFLAGS = --tag=disable-static gif_la_SOURCES = loader_gif.c gif_la_LDFLAGS = -module -avoid-version -gif_la_LIBADD = @GIFLIBS@ $(top_builddir)/src/lib/libImlib2.la +gif_la_LIBADD = $(GIF_LIBS) $(top_builddir)/src/lib/libImlib2.la gif_la_LIBTOOLFLAGS = --tag=disable-static ico_la_SOURCES = loader_ico.c --
