1 files changed, 13 insertions, 22 deletions

diff --git a/configure.ac b/configure.ac
index e21e0a3..d0e4f44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -683,14 +683,12 @@ LE_INTLINCL=""
 LE_LIBINTL="$LTLIBINTL"
 AC_ARG_ENABLE(framework, [  --enable-framework      enable Mac OS X framework build helpers],enable_framework_build=$enableval)
 AM_CONDITIONAL(WANT_FRAMEWORK, test x$enable_framework_build = xyes)
-if test x$enable_framework_build = xyes
-then
-  AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework])
+AS_IF([test x$enable_framework_build = xyes],
+ [AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework])
   LE_INTLINCL='-I$(top_srcdir)/src/intlemu'
   LE_LIBINTL='$(top_builddir)/src/intlemu/libintlemu.la -framework CoreFoundation'
   AC_LIB_APPENDTOVAR([AM_CPPFLAGS], [$LE_INTLINCL])
-fi
-
+ ])
 
 LE_LIB_LDFLAGS="-export-dynamic -no-undefined"
 LE_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined"
@@ -699,17 +697,14 @@ LE_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined"
 # TODO insert a proper check here
 AC_CACHE_CHECK([whether -export-symbols-regex works],
  gn_cv_export_symbols_regex_works,
- [
-  case "$host_os" in
-  mingw*) gn_cv_export_symbols_regex_works=no;;
-  *) gn_cv_export_symbols_regex_works=yes;;
-  esac
+ [AS_CASE(["$host_os"],
+   [mingw*],[gn_cv_export_symbols_regex_works=no],
+   [gn_cv_export_symbols_regex_works=yes])
  ])
-if test "x$gn_cv_export_symbols_regex_works" = "xyes"
-then
- LE_LIB_LDFLAGS="$LE_LIB_LDFLAGS -export-symbols-regex \"(EXTRACTOR|pl)_@<:@a-zA-Z0-9_@:>@*\""
+AS_IF([test "x$gn_cv_export_symbols_regex_works" = "xyes"],
+ [LE_LIB_LDFLAGS="$LE_LIB_LDFLAGS -export-symbols-regex \"(EXTRACTOR|pl)_@<:@a-zA-Z0-9_@:>@*\""
  LE_PLUGIN_LDFLAGS="$LE_PLUGIN_LDFLAGS -export-symbols-regex \"(EXTRACTOR|pl)_@<:@a-zA-Z0-9_@:>@*_.......\""
-fi
+ ])
 
 # restore LIBS
 LIBS=$LIBSOLD
@@ -758,15 +753,11 @@ AX_CREATE_PKGCONFIG_INFO([libextractor.pc],,[-lextractor],[Metadata extraction l
 
 AC_OUTPUT
 
-if test "x$HAVE_ZLIB_TRUE" = "x#"
-then
- AC_MSG_NOTICE([NOTICE: zlib not found, zlib support disabled])
-fi
+AS_IF([test "x$HAVE_ZLIB_TRUE" = "x#"],
+  [AC_MSG_NOTICE([NOTICE: zlib not found, zlib support disabled])])
 
-if test "x$HAVE_BZ2_TRUE" = "x#"
-then
- AC_MSG_NOTICE([NOTICE: libbz2 not found, bz2 support disabled])
-fi
+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