M configure.in → configure.in

@@ -426,30 +426,31 @@ )
 
 AM_CONDITIONAL(XPM, test x$XPM = xtrue)
 
+dnl Check whether to use imlib2
 IMLIB2=false
 AC_MSG_CHECKING([whether to have Imlib2 (pixmap themes) support])
 AC_ARG_ENABLE(imlib2,
-[  --enable-imlib2         Imlib2 (pixmap themes) support [default=no]])
-
-if test "x$enableval" = "xyes"; then
-	AC_MSG_RESULT([yes])
-	AC_PATH_GENERIC(imlib2, 1.0.0,
-     [
+    AC_HELP_STRING([--enable-imlib2],
+                   [Imlib2 (pixmap themes) support [default=no]]), ,
+                   [enable_imlib2=no])
+if test x$enable_imlib2 = "xyes"; then
+    AC_MSG_RESULT([yes])
+    AC_PATH_GENERIC(imlib2, 1.0.0,
+      [
          IMLIB2=true
          AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support])
          IMLIB2_LIBS=`imlib2-config --libs`
          IMLIB2_CFLAGS=`imlib2-config --cflags`
          LIBS="$LIBS $IMLIB2_LIBS"
          CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS"
-	 ],
-	 [
-	   AC_MSG_RESULT(no)
-	 ])
+       ], [ AC_MSG_RESULT(no)]
+    )
 else
-	AC_MSG_RESULT([no])
+    AC_MSG_RESULT([no])
 fi
 
 AM_CONDITIONAL(IMLIB2, test x$IMLIB2 = xtrue)
+
 
 
 AC_MSG_CHECKING([whether to have Xmb (multibyte font, utf-8) support])
@@ -493,7 +494,7 @@ 
 AC_MSG_CHECKING([whether to build support for the Xinerama extension])
 AC_ARG_ENABLE(
   xinerama,
-[  --enable-xinerama       enable xinerama extension [default=no]], 
+[  --enable-xinerama       enable xinerama extension [default=no]],
    if test x$enableval = "xyes"; then
 	AC_MSG_RESULT([yes])
 	AC_CHECK_LIB(Xinerama, XineramaQueryScreens,