diff --git a/ext/enchant/config.m4 b/ext/enchant/config.m4
index b2b2c25a8fb..0201f30153a 100644
--- a/ext/enchant/config.m4
+++ b/ext/enchant/config.m4
@@ -4,16 +4,16 @@ PHP_ARG_WITH([enchant],
     [Include Enchant support])])
 
 if test "$PHP_ENCHANT" != "no"; then
-  PKG_CHECK_MODULES([ENCHANT2], [enchant-2], [found_enchant_2=yes], [found_enchant_2=no])
-
-  if test "$found_enchant_2" = "yes"; then
+  PKG_CHECK_MODULES([ENCHANT2], [enchant-2],
+    [found_enchant_2=yes],
+    [found_enchant_2=no])
 
+  AS_VAR_IF([found_enchant_2], [yes], [
     PHP_EVAL_INCLINE([$ENCHANT2_CFLAGS])
     PHP_EVAL_LIBLINE([$ENCHANT2_LIBS], [ENCHANT_SHARED_LIBADD])
-
-    AC_DEFINE(HAVE_ENCHANT_GET_VERSION, 1, [ enchant_get_version since 1.6.0 ])
-
-  else
+    AC_DEFINE([HAVE_ENCHANT_GET_VERSION], [1],
+      [enchant_get_version since 1.6.0])
+  ], [
     AC_MSG_WARN([libenchant-2 not found trying with old libenchant])
     PKG_CHECK_MODULES([ENCHANT], [enchant >= 1.4.2])
 
@@ -22,7 +22,7 @@ if test "$PHP_ENCHANT" != "no"; then
 
     PHP_CHECK_LIBRARY([enchant], [enchant_get_version],
       [AC_DEFINE([HAVE_ENCHANT_GET_VERSION], [1],
-        [enchant_get_version since 1.6.0 ])],
+        [enchant_get_version since 1.6.0])],
       [],
       [$ENCHANT_LIBS])
 
@@ -31,7 +31,7 @@ if test "$PHP_ENCHANT" != "no"; then
         [enchant_broker_set_param since 1.5.0 and removed in 2.x])],
       [],
       [$ENCHANT_LIBS])
-  fi
+  ])
 
   AC_DEFINE(HAVE_ENCHANT, 1, [ ])