1 files changed, 28 insertions, 57 deletions

diff --git a/configure.ac b/configure.ac
index d0e4f44..23bd1b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -759,60 +759,38 @@ AS_IF([test "x$HAVE_ZLIB_TRUE" = "x#"],
 AS_IF([test "x$HAVE_BZ2_TRUE" = "x#"],
   [AC_MSG_NOTICE([NOTICE: libbz2 not found, bz2 support disabled])])
 
-if test "x$HAVE_EXIV2_TRUE" = "x#"
-then
- AC_MSG_NOTICE([NOTICE: libexiv2 not found, exiv2 disabled])
-fi
+AS_IF([test "x$HAVE_EXIV2_TRUE" = "x#"],
+  [AC_MSG_NOTICE([NOTICE: libexiv2 not found, exiv2 disabled])])
 
-if test "x$HAVE_TIFF_TRUE" = "x#"
-then
- AC_MSG_NOTICE([NOTICE: libtiff not found, tiff disabled])
-fi
+AS_IF([test "x$HAVE_TIFF_TRUE" = "x#"],
+  [AC_MSG_NOTICE([NOTICE: libtiff not found, tiff disabled])])
 
-if test "x$HAVE_JPEG_TRUE" = "x#"
-then
- AC_MSG_NOTICE([NOTICE: libjpeg not found, jpeg disabled])
-fi
+AS_IF([test "x$HAVE_JPEG_TRUE" = "x#"],
+  [AC_MSG_NOTICE([NOTICE: libjpeg not found, jpeg disabled])])
 
-if test "x$HAVE_GIF_TRUE" = "x#"
-then
- AC_MSG_NOTICE([NOTICE: libgif not found, gif disabled])
-fi
+AS_IF([test "x$HAVE_GIF_TRUE" = "x#"]
+  [AC_MSG_NOTICE([NOTICE: libgif not found, gif disabled])])
 
-if test "x$have_gsf" != "xtrue"
-then
- AC_MSG_NOTICE([NOTICE: libgsf not found, no OLE2 (MS Office) support])
-fi
+AS_IF([test "x$have_gsf" != "xtrue"],
+  [AC_MSG_NOTICE([NOTICE: libgsf not found, no OLE2 (MS Office) support])])
 
-if test "x$ffmpeg_enabled" = "x0"
-then
- AC_MSG_NOTICE([NOTICE: FFmpeg thumbnailer plugin disabled])
-fi
+AS_IF([test "x$ffmpeg_enabled" = "x0"],
+  [AC_MSG_NOTICE([NOTICE: FFmpeg thumbnailer plugin disabled])])
 
-if test "x$new_ffmpeg" = "x0"
-then
- AC_MSG_NOTICE([NOTICE: FFmpeg/opus audio preview plugin disabled, It needs libav >= 10, or a FFmpeg with --enable-libavresample])
-fi
+AS_IF([test "x$new_ffmpeg" = "x0"],
+  [AC_MSG_NOTICE([NOTICE: FFmpeg/opus audio preview plugin disabled, It needs libav >= 10, or a FFmpeg with --enable-libavresample])])
 
-if test "x$have_gdk_pixbuf" = "x0"
-then
- AC_MSG_NOTICE([NOTICE: libgdk-pixbuf not found, gtk thumbnail support disabled])
-fi
+AS_IF([test "x$have_gdk_pixbuf" = "x0"],
+  [AC_MSG_NOTICE([NOTICE: libgdk-pixbuf not found, gtk thumbnail support disabled])])
 
-if test "x$HAVE_VORBISFILE_TRUE" = "x#"
-then
- AC_MSG_NOTICE([NOTICE: libvorbis not found, vorbis support disabled])
-fi
+AS_IF([test "x$HAVE_VORBISFILE_TRUE" = "x#"],
+  [AC_MSG_NOTICE([NOTICE: libvorbis not found, vorbis support disabled])])
 
-if test "x$HAVE_FLAC_TRUE" = "x#"
-then
- AC_MSG_NOTICE([NOTICE: libflac not found, flac support disabled])
-fi
+AS_IF([test "x$HAVE_FLAC_TRUE" = "x#"],
+  [AC_MSG_NOTICE([NOTICE: libflac not found, flac support disabled])])
 
-if test "x$HAVE_SMF_TRUE" = "x#"
-then
- AC_MSG_NOTICE([NOTICE: libsmf not found, midi support disabled])
-fi
+AS_IF([test "x$HAVE_SMF_TRUE" = "x#"],
+  [AC_MSG_NOTICE([NOTICE: libsmf not found, midi support disabled])])
 
 if test "x$HAVE_MPEG2_TRUE" = "x#"
 then
@@ -829,17 +807,10 @@ then
  AC_MSG_NOTICE([NOTICE: no C++ compiler found (not compiling plugins that require C++)])
 fi
 
-if test x$have_gstreamer = xyes -a x$have_gstreamer_pbutils = xyes -a x$have_gstreamer_tag = xyes -a x$have_gstreamer_app = xyes -a ! x$without_glib = xtrue
-then
-if test x$enable_experimental = xyes
-then
- AC_MSG_NOTICE([NOTICE: gstreamer enabled])
-fi
-else
- AC_MSG_NOTICE([NOTICE: gstreamer not found, gstreamer support disabled])
-fi
+AS_IF([test x$have_gstreamer = xyes -a x$have_gstreamer_pbutils = xyes -a x$have_gstreamer_tag = xyes -a x$have_gstreamer_app = xyes -a ! x$without_glib = xtrue],
+  [AS_IF([test x$enable_experimental = xyes],
+    [AC_MSG_NOTICE([NOTICE: gstreamer enabled])])],
+  [AC_MSG_NOTICE([NOTICE: gstreamer not found, gstreamer support disabled])])
 
-if test "x$HAVE_APPARMOR_TRUE" = "x#"
-then
- AC_MSG_NOTICE([NOTICE: libapparmor not found, apparmor support disabled])
-fi
+AS_IF([test "x$HAVE_APPARMOR_TRUE" = "x#"],
+ [AC_MSG_NOTICE([NOTICE: libapparmor not found, apparmor support disabled])])