diff --git a/configuration/configure.ac b/configuration/configure.ac
index 64444fd..9bacfc0 100755
--- a/configuration/configure.ac
+++ b/configuration/configure.ac
@@ -44,12 +44,10 @@
 
 dnl This one is required for configuration, so handle separately.
 AC_MSG_CHECKING([variable XSLT])
-if test -z $XSLT; then
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([required environment variable XSLT not defined])
-else
-	AC_MSG_RESULT([$XSLT])
-fi
+AS_IF([test -z $XSLT],
+	[	AC_MSG_RESULT([no])
+		AC_MSG_ERROR([required environment variable XSLT not defined])],
+	[AC_MSG_RESULT([$XSLT])])
 
 
 dnl
@@ -117,11 +115,10 @@
 dnl We make heavy use of features specific to GNU make.
 AC_CACHE_CHECK([for GNU make], [ac_cv_path_MAKE],
 	[AC_PATH_PROGS_FEATURE_CHECK([MAKE], [gnumake gmake make],
-		[if ( sh -c "$ac_path_MAKE --version"  2> /dev/null | grep GNU 2>&1 > /dev/null ); then
-			 ac_cv_path_MAKE=$ac_path_MAKE
-			 ac_path_MAKE_found=:
-		 fi
-		],
+		[AS_IF([( sh -c "$ac_path_MAKE --version"  2> /dev/null | grep GNU 2>&1 > /dev/null )],
+			[	ac_cv_path_MAKE=$ac_path_MAKE
+			   	ac_path_MAKE_found=:],
+			[])],
 		[AC_MSG_ERROR([could not find GNU make])])])
 AC_SUBST([MAKE], [$ac_cv_path_MAKE])
 
@@ -159,18 +156,16 @@
 		AC_MSG_RESULT([$XSLTPROC])],
 		[AC_MSG_RESULT([no])])],
 	[AC_MSG_ERROR([unknown XSLT processor "${XSLT}" specified])])
+
 AC_PATH_JARFILE(resolver, RESOLVER, [/opt/local/share/java /sw/share/java /usr/local/share/java /usr/share/java /opt/local/lib/java /sw/lib/java /usr/local/lib/java /usr/lib/java ${HOME}/Library/Java /Library/Java /System/Library/Java])
 AC_MSG_CHECKING([for XML entity resolver])
-if $RESOLVER_AVAILABLE; then
-	# We can't use -jar for the entity resolver, because it needs to be able
-	# to use the CLASSPATH to find the CatalogManager.properties file. Using
-	# -jar suppresses the CLASSPATH completely.
-	AC_SUBST([RESOLVER], ["${JAVA} -cp ${RESOLVER_JAR}:${CLASSPATH} org.apache.xml.resolver.apps.resolver"])
-	AC_MSG_RESULT([$RESOLVER])
-else
-	AC_MSG_RESULT([no])
-fi
-
+# We can't use -jar for the entity resolver, because it needs to be able
+# to use the CLASSPATH to find the CatalogManager.properties file. Using
+# -jar suppresses the CLASSPATH completely.
+AS_IF([$RESOLVER_AVAILABLE],
+	[	AC_SUBST([RESOLVER], ["${JAVA} -cp ${RESOLVER_JAR}:${CLASSPATH} org.apache.xml.resolver.apps.resolver"])
+		AC_MSG_RESULT([$RESOLVER])],
+	[AC_MSG_RESULT([no])])
 
 
 dnl