From f9aca8ff43aec5c91aeb755728d715dc8f82bd8c Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Wed, 26 Jan 2022 22:52:52 +0100
Subject: [PATCH] autofoo: Sort loaders

---
 configure.ac                    |  4 ++--
 src/modules/loaders/Makefile.am | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2636189..79f07da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,12 +194,12 @@ loader_check_gif() {
 }
 
 EC_LOADER_CHECK(GIF,  auto, , loader_check_gif)
+EC_LOADER_CHECK(HEIF, auto, libheif)
 EC_LOADER_CHECK(JPEG, auto, libjpeg)
 EC_LOADER_CHECK(PNG,  auto, libpng)
 EC_LOADER_CHECK(SVG,  auto, librsvg-2.0)
 EC_LOADER_CHECK(TIFF, auto, libtiff-4)
 EC_LOADER_CHECK(WEBP, auto, libwebpdemux)
-EC_LOADER_CHECK(HEIF, auto, libheif)
 
 loader_check_bz2() {
   AC_CHECK_LIB(bz2, BZ2_bzRead, bz2_ok=yes, bz2_ok=no)
@@ -274,12 +274,12 @@ echo
 echo "Image loaders:"
 echo " Regular image loaders"
 echo "  GIF.....................: $gif_ok"
+echo "  HEIF....................: $heif_ok"
 echo "  JPEG....................: $jpeg_ok"
 echo "  PNG.....................: $png_ok"
 echo "  SVG.....................: $svg_ok"
 echo "  TIFF....................: $tiff_ok"
 echo "  WEBP....................: $webp_ok"
-echo "  HEIF....................: $heif_ok"
 echo " Decompressors"
 echo "  BZIP2...................: $bz2_ok"
 echo "  LZMA(XZ)................: $lzma_ok"
diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am
index 6f314ec..8c10efb 100644
--- a/src/modules/loaders/Makefile.am
+++ b/src/modules/loaders/Makefile.am
@@ -17,6 +17,9 @@ xpm.la
 if BUILD_GIF_LOADER
 pkg_LTLIBRARIES += gif.la
 endif
+if BUILD_HEIF_LOADER
+pkg_LTLIBRARIES += heif.la
+endif
 if BUILD_JPEG_LOADER
 pkg_LTLIBRARIES += jpeg.la
 endif
@@ -32,9 +35,6 @@ endif
 if BUILD_WEBP_LOADER
 pkg_LTLIBRARIES += webp.la
 endif
-if BUILD_HEIF_LOADER
-pkg_LTLIBRARIES += heif.la
-endif
 
 if BUILD_BZ2_LOADER
 pkg_LTLIBRARIES += bz2.la
@@ -72,6 +72,12 @@ gif_la_LDFLAGS       = -module -avoid-version
 gif_la_LIBADD        = $(GIF_LIBS) $(top_builddir)/src/lib/libImlib2.la
 gif_la_LIBTOOLFLAGS  = --tag=disable-static
 
+heif_la_SOURCES      = loader_heif.c
+heif_la_CPPFLAGS     = $(HEIF_CFLAGS) $(AM_CPPFLAGS)
+heif_la_LDFLAGS      = -module -avoid-version
+heif_la_LIBADD       = $(HEIF_LIBS) $(top_builddir)/src/lib/libImlib2.la
+heif_la_LIBTOOLFLAGS = --tag=disable-static
+
 ico_la_SOURCES       = loader_ico.c
 ico_la_LDFLAGS       = -module -avoid-version
 ico_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
@@ -122,12 +128,6 @@ webp_la_LDFLAGS      = -module -avoid-version
 webp_la_LIBADD       = $(WEBP_LIBS) $(top_builddir)/src/lib/libImlib2.la
 webp_la_LIBTOOLFLAGS = --tag=disable-static
 
-heif_la_SOURCES      = loader_heif.c
-heif_la_CPPFLAGS     = $(HEIF_CFLAGS) $(AM_CPPFLAGS)
-heif_la_LDFLAGS      = -module -avoid-version
-heif_la_LIBADD       = $(HEIF_LIBS) $(top_builddir)/src/lib/libImlib2.la
-heif_la_LIBTOOLFLAGS = --tag=disable-static
-
 xbm_la_SOURCES       = loader_xbm.c
 xbm_la_LDFLAGS       = -module -avoid-version
 xbm_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la