diff --git a/e17/evas/evas.conf b/e17/evas/evas.conf
index 182d0f37d..f0897e6cb 100644
--- a/e17/evas/evas.conf
+++ b/e17/evas/evas.conf
@@ -51,27 +51,27 @@ if pkginstalled directfb ; then
 fi
 
 if ! atstage toolchain; then
-# check for xorg
-if pkginstalled xorg-server ; then
-	var_append confopt " " "--x-includes=$( pkgprefix -r includedir xorg-server )"
-	var_append confopt " " "--x-libraries=$( pkgprefix -r libdir xorg-server )"
-	var_append configprefix ' ' 'LDFLAGS="-L$( pkgprefix -r libdir xorg-server )"'
-fi
+	# check for xorg
+	if pkginstalled xorg-server ; then
+		var_append confopt " " "--x-includes=$( pkgprefix -r includedir xorg-server )"
+		var_append confopt " " "--x-libraries=$( pkgprefix -r libdir xorg-server )"
+		var_append configprefix ' ' 'LDFLAGS="-L$( pkgprefix -r libdir xorg-server )"'
+	fi
 
-# check if we can enable the OpenGL X11 display engine
-pkginstalled mesa && var_append confopt ' ' "--enable-gl-x11"
+	# check if we can enable the OpenGL X11 display engine
+	pkginstalled mesa && var_append confopt ' ' "--enable-gl-x11"
 
-# check if we can enable the Cairo X11 support
-if pkginstalled cairo ; then
-	var_append confopt ' ' "--enable-cairo-x11"
-	var_append GCC_WRAPPER_APPEND ' ' "`pkg-config cairo --cflags`"
-fi
-fi
+	# check if we can enable the Cairo X11 support
+	if pkginstalled cairo ; then
+		var_append confopt ' ' "--enable-cairo-x11"
+		var_append GCC_WRAPPER_APPEND ' ' "`pkg-config cairo --cflags`"
+	fi
 
-if pkginstalled fontconfig ; then
-	pkgprefix -t fontconfig
-	var_append confopt ' ' "--enable-fontconfig"
-	var_append GCC_WRAPPER_APPEND ' ' "`pkg-config fontconfig --cflags`"
-else
-	var_append confopt ' ' "--disable-fontconfig"
+	if pkginstalled fontconfig ; then
+		pkgprefix -t fontconfig
+		var_append confopt ' ' "--enable-fontconfig"
+		var_append GCC_WRAPPER_APPEND ' ' "`pkg-config fontconfig --cflags`"
+	else
+		var_append confopt ' ' "--disable-fontconfig"
+	fi
 fi