diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index 3876289286..79ebaddf60 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -322,7 +322,7 @@ if test "x$want_evas_software_x11" = "xyes" -o "x$want_evas_software_x11" = "xau
       AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
       if test "x$want_evas_simple_x11" = "xyes"; then
         x_libs="${x_libs} -lX11 -lXext"
-      else      
+      else
         x_dir=${x_dir:-/usr/X11R6}
         x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
         x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
@@ -358,7 +358,7 @@ if test "x$want_evas_software_16_x11" = "xyes"; then
       AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_X11, 1, [Software 16bit X11 Rendering Backend])
       if test "x$want_evas_simple_x11" = "xyes"; then
         x_libs="${x_libs} -lX11 -lXext"
-      else      
+      else
         x_dir=${x_dir:-/usr/X11R6}
         x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
         x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
@@ -576,7 +576,7 @@ if test "x$want_evas_gl_x11" = "xyes"; then
       AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
       if test "x$want_evas_simple_x11" = "xyes"; then
         x_libs="${x_libs} -lX11 -lXext"
-      else      
+      else
         x_dir=${x_dir:-/usr/X11R6}
         x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
         x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
@@ -687,7 +687,7 @@ if test "x$want_evas_cairo_x11" = "xyes"; then
           AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
           if test "x$want_evas_simple_x11" = "xyes"; then
             x_libs="${x_libs} -lX11 -lXext"
-          else      
+          else
             x_dir=${x_dir:-/usr/X11R6}
             x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
             x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
@@ -728,7 +728,7 @@ if test "x$want_evas_xrender_x11" = "xyes" -o "x$want_evas_xrender_x11" = "xauto
       AC_DEFINE(BUILD_ENGINE_XRENDER_X11, 1, [XRender X11 Rendering Backend])
       if test "x$want_evas_simple_x11" = "xyes"; then
       	x_libs="${x_libs} -lX11 -lXext"
-      else      
+      else
         x_dir=${x_dir:-/usr/X11R6}
         x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
         x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
@@ -794,7 +794,7 @@ if test "x$want_evas_glitz_x11" = "xyes"; then
         [
           if test "x$want_evas_simple_x11" = "xyes"; then
             x_libs="${x_libs} -lX11 -lXext"
-          else      
+          else
             x_dir=${x_dir:-/usr/X11R6}
             x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
             x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
diff --git a/legacy/evas/src/lib/engines/Makefile.am b/legacy/evas/src/lib/engines/Makefile.am
index 13f48e3b6a..9d688758d4 100644
--- a/legacy/evas/src/lib/engines/Makefile.am
+++ b/legacy/evas/src/lib/engines/Makefile.am
@@ -1,5 +1,10 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = \
-common common_16
+SUBDIRS = common
+
+if BUILD_ENGINE_SOFTWARE_16
+
+SUBDIRS += common_16
+
+endif