autofoo/loader cosmetics

Consistently place loaders in same order.

3 files changed, 146 insertions, 146 deletions

diff --git a/configure.ac b/configure.ac
index d50d092..62e3f28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,43 @@ if test "x$have_clock_gettime" != xno; then
 fi
 
 
+AC_MSG_CHECKING(whether to enable gif support)
+AC_ARG_WITH([gif],
+  [AS_HELP_STRING([--without-gif], [Disable GIF image loader])],
+  [
+   if test "$withval" = no ; then
+     gif_loader=no
+   else
+     gif_loader=yes
+   fi
+  ],
+  [ gif_loader=auto ]
+)
+AC_MSG_RESULT($gif_loader)
+
+if test "$gif_loader" != no ; then
+  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
+      GIF_LIBS=$gif_libs
+      AC_SUBST(GIF_LIBS)
+    fi
+  fi
+
+  if test "$gif_ok" = no ; then
+    if test "$gif_loader" = yes ; then
+      AC_MSG_ERROR(GIF support was requested but system does not support it)
+    else
+      AC_MSG_WARN(*** Native GIF support will not be built (GIF not found) ***)
+    fi
+  fi
+else
+  gif_ok=no
+fi
+EC_LOADER(BUILD_GIF_LOADER, $gif_ok, GIF)
+
+
 AC_MSG_CHECKING(whether to enable jpeg support)
 AC_ARG_WITH([jpeg],
   [AS_HELP_STRING([--without-jpeg], [Disable JPEG image loader])],
@@ -202,28 +239,6 @@ fi
 EC_LOADER(BUILD_PNG_LOADER, $png_ok, PNG)
 
 
-AC_MSG_CHECKING(whether to enable webp support)
-AC_ARG_WITH([webp],
-  [AS_HELP_STRING([--without-webp], [Disable WEBP image loader])],
-  [
-   if test "$withval" = no ; then
-     webp_loader=no
-   else
-     webp_loader=yes
-   fi
-  ],
-  [ webp_loader=auto ]
-)
-AC_MSG_RESULT($webp_loader)
-
-if test "$webp_loader" != no ; then
-  PKG_CHECK_MODULES(WEBP, libwebpdemux, [ webp_ok="yes" ], [ webp_ok="no" ])
-else
-  webp_ok="no"
-fi
-EC_LOADER(BUILD_WEBP_LOADER, $webp_ok, WEBP)
-
-
 AC_MSG_CHECKING(whether to enable tiff support)
 AC_ARG_WITH([tiff],
   [AS_HELP_STRING([--without-tiff], [Disable TIFF image loader])],
@@ -253,70 +268,26 @@ fi
 EC_LOADER(BUILD_TIFF_LOADER, $tiff_ok, TIFF)
 
 
-AC_MSG_CHECKING(whether to enable gif support)
-AC_ARG_WITH([gif],
-  [AS_HELP_STRING([--without-gif], [Disable GIF image loader])],
-  [
-   if test "$withval" = no ; then
-     gif_loader=no
-   else
-     gif_loader=yes
-   fi
-  ],
-  [ gif_loader=auto ]
-)
-AC_MSG_RESULT($gif_loader)
-
-if test "$gif_loader" != no ; then
-  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
-      GIF_LIBS=$gif_libs
-      AC_SUBST(GIF_LIBS)
-    fi
-  fi
-
-  if test "$gif_ok" = no ; then
-    if test "$gif_loader" = yes ; then
-      AC_MSG_ERROR(GIF support was requested but system does not support it)
-    else
-      AC_MSG_WARN(*** Native GIF support will not be built (GIF not found) ***)
-    fi
-  fi
-else
-  gif_ok=no
-fi
-EC_LOADER(BUILD_GIF_LOADER, $gif_ok, GIF)
-
-
-AC_MSG_CHECKING(whether to enable zlib support)
-AC_ARG_WITH([zlib],
-  [AS_HELP_STRING([--without-zlib], [Disable ZLIB loader])],
+AC_MSG_CHECKING(whether to enable webp support)
+AC_ARG_WITH([webp],
+  [AS_HELP_STRING([--without-webp], [Disable WEBP image loader])],
   [
    if test "$withval" = no ; then
-     zlib_loader=no
+     webp_loader=no
    else
-     zlib_loader=yes
+     webp_loader=yes
    fi
   ],
-  [ zlib_loader=auto ]
+  [ webp_loader=auto ]
 )
-AC_MSG_RESULT($zlib_loader)
+AC_MSG_RESULT($webp_loader)
 
-if test "$zlib_loader" != no ; then
-  PKG_CHECK_MODULES(ZLIB, zlib, [ zlib_ok="yes" ], [ zlib_ok="no" ])
-  if test "$zlib_ok" = no ; then
-    if test "$zlib_loader" = yes ; then
-      AC_MSG_ERROR(ZLIB support was requested but system does not support it)
-    else
-      AC_MSG_WARN(*** Native zlib support will not be built (zlib not found) ***)
-    fi
-  fi
+if test "$webp_loader" != no ; then
+  PKG_CHECK_MODULES(WEBP, libwebpdemux, [ webp_ok="yes" ], [ webp_ok="no" ])
 else
-  zlib_ok=no
+  webp_ok="no"
 fi
-EC_LOADER(BUILD_ZLIB_LOADER, $zlib_ok, ZLIB)
+EC_LOADER(BUILD_WEBP_LOADER, $webp_ok, WEBP)
 
 
 AC_MSG_CHECKING(whether to enable bzip2 support)
@@ -357,6 +328,35 @@ fi
 EC_LOADER(BUILD_BZ2_LOADER, $bz2_ok, BZ2)
 
 
+AC_MSG_CHECKING(whether to enable zlib support)
+AC_ARG_WITH([zlib],
+  [AS_HELP_STRING([--without-zlib], [Disable ZLIB loader])],
+  [
+   if test "$withval" = no ; then
+     zlib_loader=no
+   else
+     zlib_loader=yes
+   fi
+  ],
+  [ zlib_loader=auto ]
+)
+AC_MSG_RESULT($zlib_loader)
+
+if test "$zlib_loader" != no ; then
+  PKG_CHECK_MODULES(ZLIB, zlib, [ zlib_ok="yes" ], [ zlib_ok="no" ])
+  if test "$zlib_ok" = no ; then
+    if test "$zlib_loader" = yes ; then
+      AC_MSG_ERROR(ZLIB support was requested but system does not support it)
+    else
+      AC_MSG_WARN(*** Native zlib support will not be built (zlib not found) ***)
+    fi
+  fi
+else
+  zlib_ok=no
+fi
+EC_LOADER(BUILD_ZLIB_LOADER, $zlib_ok, ZLIB)
+
+
 AC_MSG_CHECKING(whether to enable id3 support)
 AC_ARG_WITH([id3],
   [AS_HELP_STRING([--without-id3], [Disable ID3 loader])],
@@ -440,13 +440,16 @@ echo
 echo "Configuration Options Summary:"
 echo
 echo "Image loaders:"
+echo " Regular image loaders"
+echo "  GIF.....................: $gif_ok"
 echo "  JPEG....................: $jpeg_ok"
 echo "  PNG.....................: $png_ok"
 echo "  TIFF....................: $tiff_ok"
-echo "  GIF.....................: $gif_ok"
 echo "  WEBP....................: $webp_ok"
-echo "  ZLIB....................: $zlib_ok"
+echo " Decompressors"
 echo "  BZIP2...................: $bz2_ok"
+echo "  ZLIB....................: $zlib_ok"
+echo " Containers"
 echo "  ID3.....................: $id3_ok"
 echo
 echo "Build for X11.............: $have_x"
diff --git a/src/lib/loaders.c b/src/lib/loaders.c
index a2d83de..66a976a 100644
--- a/src/lib/loaders.c
+++ b/src/lib/loaders.c
@@ -23,17 +23,11 @@ typedef struct {
 
 static const char  *const ext_argb[] = { "argb", NULL };
 static const char  *const ext_bmp[] = { "bmp", NULL };
-#ifdef BUILD_BZ2_LOADER
-static const char  *const ext_bz2[] = { "bz2", NULL };
-#endif
 static const char  *const ext_ff[] = { "ff", NULL };
 #ifdef BUILD_GIF_LOADER
 static const char  *const ext_gif[] = { "gif", NULL };
 #endif
 static const char  *const ext_ico[] = { "ico", NULL };
-#ifdef BUILD_ID3_LOADER
-static const char  *const ext_id3[] = { "mp3", NULL };
-#endif
 #ifdef BUILD_JPEG_LOADER
 static const char  *const ext_jpeg[] = { "jpg", "jpeg", "jfif", "jfi", NULL };
 #endif
@@ -52,23 +46,26 @@ static const char  *const ext_webp[] = { "webp", NULL };
 #endif
 static const char  *const ext_xbm[] = { "xbm", NULL };
 static const char  *const ext_xpm[] = { "xpm", NULL };
+
+#ifdef BUILD_BZ2_LOADER
+static const char  *const ext_bz2[] = { "bz2", NULL };
+#endif
 #ifdef BUILD_ZLIB_LOADER
 static const char  *const ext_zlib[] = { "gz", NULL };
 #endif
+
+#ifdef BUILD_ID3_LOADER
+static const char  *const ext_id3[] = { "mp3", NULL };
+#endif
+
 static const KnownLoader loaders_known[] = {
    {"argb", ext_argb},
    {"bmp", ext_bmp},
-#ifdef BUILD_BZ2_LOADER
-   {"bz2", ext_bz2},
-#endif
    {"ff", ext_ff},
 #ifdef BUILD_GIF_LOADER
    {"gif", ext_gif},
 #endif
    {"ico", ext_ico},
-#ifdef BUILD_ID3_LOADER
-   {"id3", ext_id3},
-#endif
 #ifdef BUILD_JPEG_LOADER
    {"jpeg", ext_jpeg},
 #endif
@@ -86,9 +83,15 @@ static const KnownLoader loaders_known[] = {
 #endif
    {"xbm", ext_xbm},
    {"xpm", ext_xpm},
+#ifdef BUILD_BZ2_LOADER
+   {"bz2", ext_bz2},
+#endif
 #ifdef BUILD_ZLIB_LOADER
    {"zlib", ext_zlib},
 #endif
+#ifdef BUILD_ID3_LOADER
+   {"id3", ext_id3},
+#endif
 };
 
 static int
diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am
index e285f3b..3917796 100644
--- a/src/modules/loaders/Makefile.am
+++ b/src/modules/loaders/Makefile.am
@@ -3,49 +3,43 @@ AM_CPPFLAGS          = -I$(top_builddir) -I$(top_srcdir)/src/lib
 
 pkgdir               = $(libdir)/imlib2/loaders
 
-if BUILD_BZ2_LOADER
-BZ2_L                = bz2.la
-endif
+pkg_LTLIBRARIES = \
+argb.la \
+bmp.la \
+ff.la \
+ico.la \
+lbm.la \
+pnm.la \
+tga.la \
+xbm.la \
+xpm.la
+
 if BUILD_GIF_LOADER
-GIF_L                = gif.la
-endif
-if BUILD_ID3_LOADER
-ID3_L                = id3.la
+pkg_LTLIBRARIES += gif.la
 endif
 if BUILD_JPEG_LOADER
-JPEG_L               = jpeg.la
+pkg_LTLIBRARIES += jpeg.la
 endif
 if BUILD_PNG_LOADER
-PNG_L                = png.la
+pkg_LTLIBRARIES += png.la
 endif
 if BUILD_TIFF_LOADER
-TIFF_L               = tiff.la
+pkg_LTLIBRARIES += tiff.la
 endif
 if BUILD_WEBP_LOADER
-WEBP_L		     = webp.la
+pkg_LTLIBRARIES += webp.la
+endif
+
+if BUILD_BZ2_LOADER
+pkg_LTLIBRARIES += bz2.la
 endif
 if BUILD_ZLIB_LOADER
-ZLIB_L               = zlib.la
+pkg_LTLIBRARIES += zlib.la
 endif
 
-pkg_LTLIBRARIES      = \
-argb.la \
-bmp.la \
-$(BZ2_L) \
-ff.la \
-$(GIF_L) \
-ico.la \
-$(ID3_L) \
-$(JPEG_L) \
-lbm.la \
-$(PNG_L) \
-pnm.la \
-tga.la \
-$(TIFF_L) \
-$(WEBP_L) \
-xbm.la \
-xpm.la \
-$(ZLIB_L)
+if BUILD_ID3_LOADER
+pkg_LTLIBRARIES += id3.la
+endif
 
 EXTRA_DIST = loader_common.h
 
@@ -57,13 +51,7 @@ argb_la_LIBTOOLFLAGS = --tag=disable-static
 bmp_la_SOURCES       = loader_bmp.c
 bmp_la_LDFLAGS       = -module -avoid-version
 bmp_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
-bmp_la_LIBTOOLFLAGS = --tag=disable-static
-
-bz2_la_SOURCES       = loader_bz2.c
-bz2_la_CPPFLAGS      = $(BZ2_CFLAGS) $(AM_CPPFLAGS)
-bz2_la_LDFLAGS       = -module -avoid-version
-bz2_la_LIBADD        = $(BZ2_LIBS) $(top_builddir)/src/lib/libImlib2.la
-bz2_la_LIBTOOLFLAGS = --tag=disable-static
+bmp_la_LIBTOOLFLAGS  = --tag=disable-static
 
 ff_la_SOURCES        = loader_ff.c
 ff_la_LDFLAGS        = -module -avoid-version
@@ -73,18 +61,12 @@ ff_la_LIBTOOLFLAGS   = --tag=disable-static
 gif_la_SOURCES       = loader_gif.c
 gif_la_LDFLAGS       = -module -avoid-version
 gif_la_LIBADD        = $(GIF_LIBS) $(top_builddir)/src/lib/libImlib2.la
-gif_la_LIBTOOLFLAGS = --tag=disable-static
+gif_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
-ico_la_LIBTOOLFLAGS = --tag=disable-static
-
-id3_la_SOURCES       = loader_id3.c
-id3_la_CPPFLAGS      = $(ID3_CFLAGS) $(AM_CPPFLAGS)
-id3_la_LDFLAGS       = -module -avoid-version
-id3_la_LIBADD        = $(ID3_LIBS) $(top_builddir)/src/lib/libImlib2.la
-id3_la_LIBTOOLFLAGS = --tag=disable-static
+ico_la_LIBTOOLFLAGS  = --tag=disable-static
 
 jpeg_la_SOURCES      = loader_jpeg.c exif.c exif.h
 jpeg_la_CPPFLAGS     = $(JPEG_CFLAGS) $(AM_CPPFLAGS)
@@ -95,23 +77,23 @@ jpeg_la_LIBTOOLFLAGS = --tag=disable-static
 lbm_la_SOURCES       = loader_lbm.c
 lbm_la_LDFLAGS       = -module -avoid-version
 lbm_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
-lbm_la_LIBTOOLFLAGS = --tag=disable-static
+lbm_la_LIBTOOLFLAGS  = --tag=disable-static
 
 png_la_SOURCES       = loader_png.c
 png_la_CPPFLAGS      = $(PNG_CFLAGS) $(AM_CPPFLAGS)
 png_la_LDFLAGS       = -module -avoid-version
 png_la_LIBADD        = $(PNG_LIBS) $(top_builddir)/src/lib/libImlib2.la
-png_la_LIBTOOLFLAGS = --tag=disable-static
+png_la_LIBTOOLFLAGS  = --tag=disable-static
 
 pnm_la_SOURCES       = loader_pnm.c
 pnm_la_LDFLAGS       = -module -avoid-version
 pnm_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
-pnm_la_LIBTOOLFLAGS = --tag=disable-static
+pnm_la_LIBTOOLFLAGS  = --tag=disable-static
 
 tga_la_SOURCES       = loader_tga.c
 tga_la_LDFLAGS       = -module -avoid-version
 tga_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
-tga_la_LIBTOOLFLAGS = --tag=disable-static
+tga_la_LIBTOOLFLAGS  = --tag=disable-static
 
 tiff_la_SOURCES      = loader_tiff.c
 tiff_la_CPPFLAGS     = $(TIFF_CFLAGS) $(AM_CPPFLAGS)
@@ -119,24 +101,36 @@ tiff_la_LDFLAGS      = -module -avoid-version
 tiff_la_LIBADD       = $(TIFF_LIBS) $(top_builddir)/src/lib/libImlib2.la
 tiff_la_LIBTOOLFLAGS = --tag=disable-static
 
-webp_la_SOURCES       = loader_webp.c
-webp_la_CPPFLAGS      = $(WEBP_CFLAGS) $(AM_CPPFLAGS)
-webp_la_LDFLAGS       = -module -avoid-version
-webp_la_LIBADD        = $(WEBP_LIBS) $(top_builddir)/src/lib/libImlib2.la
+webp_la_SOURCES      = loader_webp.c
+webp_la_CPPFLAGS     = $(WEBP_CFLAGS) $(AM_CPPFLAGS)
+webp_la_LDFLAGS      = -module -avoid-version
+webp_la_LIBADD       = $(WEBP_LIBS) $(top_builddir)/src/lib/libImlib2.la
 webp_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
-xbm_la_LIBTOOLFLAGS = --tag=disable-static
+xbm_la_LIBTOOLFLAGS  = --tag=disable-static
 
 xpm_la_SOURCES       = loader_xpm.c
 xpm_la_LDFLAGS       = -module -avoid-version
 xpm_la_LIBADD        = $(top_builddir)/src/lib/libImlib2.la
-xpm_la_LIBTOOLFLAGS = --tag=disable-static
+xpm_la_LIBTOOLFLAGS  = --tag=disable-static
+
+bz2_la_SOURCES       = loader_bz2.c
+bz2_la_CPPFLAGS      = $(BZ2_CFLAGS) $(AM_CPPFLAGS)
+bz2_la_LDFLAGS       = -module -avoid-version
+bz2_la_LIBADD        = $(BZ2_LIBS) $(top_builddir)/src/lib/libImlib2.la
+bz2_la_LIBTOOLFLAGS  = --tag=disable-static
 
 zlib_la_SOURCES      = loader_zlib.c
 zlib_la_CPPFLAGS     = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
 zlib_la_LDFLAGS      = -module -avoid-version
 zlib_la_LIBADD       = $(ZLIB_LIBS) $(top_builddir)/src/lib/libImlib2.la
 zlib_la_LIBTOOLFLAGS = --tag=disable-static
+
+id3_la_SOURCES       = loader_id3.c
+id3_la_CPPFLAGS      = $(ID3_CFLAGS) $(AM_CPPFLAGS)
+id3_la_LDFLAGS       = -module -avoid-version
+id3_la_LIBADD        = $(ID3_LIBS) $(top_builddir)/src/lib/libImlib2.la
+id3_la_LIBTOOLFLAGS  = --tag=disable-static