diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index fac79f965bda7e1b3642d2fbc27ae1bcd895ab11..3d40a0beca1e8dcd7d075ebd98c4914570ac2365 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -288,13 +288,19 @@ AC_ARG_WITH([celt],
 		[with_celt=yes])
 
 AS_IF([test "x$with_celt" != xno],
-	PKG_CHECK_MODULES(CELT, celt >= 0.9.1,
+	[PKG_CHECK_MODULES(CELT, celt >= 0.9.1,
 		[
-			with_celt_91=yes; AC_MSG_NOTICE([Using celt 0.9.1]); AC_SUBST(BUILD_CELT_91)
+			with_celt_91=yes; AC_MSG_NOTICE([Using celt 0.9.1])
     	],
     	[
-			PKG_CHECK_MODULES(CELT, celt >= 0.7.1, [with_celt_71=yes; AC_MSG_NOTICE([Using celt 0.7.1]); AC_SUBST(BUILD_CELT_71)], AC_MSG_FAILURE([libcelt link test failed.   You may use --without-celt to compile without celt codec support.]))
-    	])
+			PKG_CHECK_MODULES(CELT, celt >= 0.7.1,
+            [
+                with_celt_71=yes; AC_MSG_NOTICE([Using celt 0.7.1])
+            ],
+            [
+                AC_MSG_FAILURE([libcelt link test failed.   You may use --without-celt to compile without celt codec support.])
+            ])
+    	])]
 )
 
 # AC_SUBST(BUILD_CELT)