2 files changed, 25 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c5b440..6122c43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0.0:
 *07/07/02:
+   * Enabled Xinerama and Imlib2 support by default (Mark)
+     configure.in
    * Fixed handle rendering when switching from a style without them (Mark)
      FbWinFrame.cc
    * Changed :Tab <int> key command so that the last tab is focused if <int> is
diff --git a/configure.in b/configure.in
index 16e9e23..d3f0f07 100644
--- a/configure.in
+++ b/configure.in
@@ -181,7 +181,7 @@ dnl Check for XShape extension support and proper library files.
 SHAPE=""
 AC_MSG_CHECKING([whether to build support for the XShape extension])
 AC_ARG_ENABLE(
-  shape, [  --enable-shape          enable support of the XShape extension [default=yes]])
+  shape, [  --enable-shape          enable support of the XShape extension ([default=yes])])
 
 : ${enableval="yes"}
 if test x$enableval = "xyes"; then
@@ -208,7 +208,7 @@ LIBS="$LIBS $Xext_lib"
 dnl Check for the Slit
 AC_MSG_CHECKING([whether to include the Slit])
 AC_ARG_ENABLE(
-  slit, [  --enable-slit           include code for the Slit [default=yes]],
+  slit, [  --enable-slit           include code for the Slit ([default=yes])],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
     AC_DEFINE(SLIT, 1, " compile with slit")
@@ -222,7 +222,7 @@ AC_ARG_ENABLE(
 dnl Check for Remember options
 AC_MSG_CHECKING([whether to include remember functionality])
 AC_ARG_ENABLE(
-  remember, [  --enable-remember       include code for Remembering attributes [default=yes]],
+  remember, [  --enable-remember       include code for Remembering attributes ([default=yes])],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
     AC_DEFINE(REMEMBER, 1, " compile with remember")
@@ -240,7 +240,7 @@ AM_CONDITIONAL(REMEMBER_SRC, test x$REMEMBER_SRC = xtrue)
 dnl Check for Toolbar options
 AC_MSG_CHECKING([whether to include Toolbar])
 AC_ARG_ENABLE(
-  toolbar, [  --enable-toolbar        include code for Toolbar [default=yes]],
+  toolbar, [  --enable-toolbar        include code for Toolbar ([default=yes])],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
     AC_DEFINE(USE_TOOLBAR, 1, " compile with toolbar")
@@ -258,7 +258,7 @@ AM_CONDITIONAL(TOOLBAR_SRC, test x$TOOLBAR_SRC = xtrue)
 AC_MSG_CHECKING([whether to have (POSIX) regular expression support])
 AC_ARG_ENABLE(
   regexp,
-[  --enable-regexp         regular expression support [default=yes]],
+[  --enable-regexp         regular expression support ([default=yes])],
   if test x$enableval = "xyes"; then
         AC_EGREP_HEADER([regex_t],regex.h,
                 AC_DEFINE(USE_REGEXP, 1, "Regular Expression support")
@@ -284,7 +284,7 @@ AM_CONDITIONAL(REGEXP_SRC, test x$REGEXP_SRC = xtrue)
 AC_MSG_CHECKING([whether to include the new WM Spec])
 AC_ARG_ENABLE(
   newwmspec,
-[  --enable-newwmspec      include code for the new WM Spec [default=yes]],
+[  --enable-newwmspec      include code for the new WM Spec ([default=yes])],
   if test x$enableval = "xyes"; then
         AC_MSG_RESULT([yes])
         NEWWMSPEC=true
@@ -303,7 +303,7 @@ dnl Check for ordered 8bpp dithering
 AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code])
 AC_ARG_ENABLE(ordered-pseudo,
 [  --enable-ordered-pseudo include code for ordered pseudocolor (8bpp)
-                          dithering [default=no]],
+                          dithering ([default=no])],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
         AC_DEFINE(ORDEREDPSEUDO, 1, "ordered dithering code")
@@ -317,7 +317,7 @@ dnl Check whether to include debugging code
 DEBUG=""
 AC_MSG_CHECKING([whether to include verbose debugging code])
 AC_ARG_ENABLE(debug,
-  [  --enable-debug          include verbose debugging code [default=no]],
+  [  --enable-debug          include verbose debugging code ([default=no])],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
     DEBUG="-DDEBUG -Wall"
@@ -332,7 +332,7 @@ CXXFLAGS="$CXXFLAGS $DEBUG"
 dnl Check whether to include native language support (i18n)
 AC_MSG_CHECKING([whether to include NLS support])
 AC_ARG_ENABLE(nls,
-  [  --enable-nls            include native language support [default=no]],
+  [  --enable-nls            include native language support ([default=no])],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
     AC_DEFINE(NLS, 1, "Native language support")
@@ -353,7 +353,7 @@ dnl Check for new timed pixmap cache
 AC_MSG_CHECKING([whether to use the new timed pixmap cache])
 AC_ARG_ENABLE(
   timed-cache,
-[  --enable-timed-cache    use new timed pixmap cache [default=yes]],
+[  --enable-timed-cache    use new timed pixmap cache ([default=yes])],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
     AC_DEFINE(TIMEDCACHE, 1, "timed cache")
@@ -368,7 +368,7 @@ dnl Check KDE
 AC_MSG_CHECKING([whether to have KDE slit support])
 AC_ARG_ENABLE(
   kde,
-[  --enable-kde            KDE slit support [default=yes]],
+[  --enable-kde            KDE slit support ([default=yes])],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
     AC_DEFINE(KDE, 1, "KDE slit support")
@@ -385,7 +385,7 @@ dnl Check GNOME
 AC_MSG_CHECKING([whether to have GNOME support])
 AC_ARG_ENABLE(
   gnome,
-[  --enable-gnome          GNOME support [default=yes]],
+[  --enable-gnome          GNOME support ([default=yes])],
   if test x$enableval = "xyes"; then
     AC_MSG_RESULT([yes])
         AC_DEFINE(USE_GNOME, 1, "Gnome 1 support")
@@ -432,7 +432,7 @@ AM_CONDITIONAL(XFT, test x$XFT = xtrue)
 AC_MSG_CHECKING([whether to have Xrender (transparent) support])
 AC_ARG_ENABLE(
   xrender,
-[  --enable-xrender        Xrender (transparent) support [default=yes]],
+[  --enable-xrender        Xrender (transparent) support ([default=yes])],
   if test x$enableval = "xyes"; then
         AC_MSG_RESULT([yes])
         AC_CHECK_LIB(Xrender, XRenderCreatePicture, 
@@ -451,7 +451,7 @@ XPM=false
 AC_MSG_CHECKING([whether to have Xpm (pixmap themes) support])
 AC_ARG_ENABLE(
   xpm,
-[  --enable-xpm            Xpm (pixmap themes) support [default=yes]],
+[  --enable-xpm            Xpm (pixmap themes) support ([default=yes])],
   if test x$enableval = "xyes"; then
         AC_MSG_RESULT([yes])
         AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
@@ -475,8 +475,8 @@ IMLIB2=false
 AC_MSG_CHECKING([whether to have Imlib2 (pixmap themes) support])
 AC_ARG_ENABLE(imlib2,
     AC_HELP_STRING([--enable-imlib2],
-                   [Imlib2 (pixmap themes) support [default=no]]), ,
-                   [enable_imlib2=no])
+                   [Imlib2 (pixmap themes) support ([default=yes])]), ,
+                   [enable_imlib2=yes])
 if test x$enable_imlib2 = "xyes"; then
     AC_MSG_RESULT([yes])
     AC_PATH_GENERIC(imlib2, 1.0.0,
@@ -500,7 +500,7 @@ AM_CONDITIONAL(IMLIB2, test x$IMLIB2 = xtrue)
 AC_MSG_CHECKING([whether to have Xmb (multibyte font, utf-8) support])
 AC_ARG_ENABLE(
   xmb,
-[  --enable-xmb            Xmb (multibyte font, utf-8) support [default=yes]],
+[  --enable-xmb            Xmb (multibyte font, utf-8) support ([default=yes])],
   if test x$enableval = "xyes"; then
         AC_MSG_RESULT([yes])
         AC_DEFINE(USE_XMB, 1, "multibyte support")
@@ -518,7 +518,7 @@ AM_CONDITIONAL(MULTIBYTE, test x$MULTIBYTE = xtrue)
 AC_MSG_CHECKING([whether to have RANDR (The X Resize and Rotate Extension) support])
 AC_ARG_ENABLE(
   randr,
-[  --enable-randr          RANDR (The X Resize and Rotate Extension) support [default=yes]],
+[  --enable-randr          RANDR (The X Resize and Rotate Extension) support ([default=yes])],
   if test x$enableval = "xyes"; then
         AC_MSG_RESULT([yes])
         AC_CHECK_LIB(Xrandr, XRRQueryExtension,
@@ -538,7 +538,7 @@ dnl Check for Xinerama support
 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=yes])],
    if test x$enableval = "xyes"; then
         AC_MSG_RESULT([yes])
         AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
@@ -548,7 +548,10 @@ AC_ARG_ENABLE(
         AC_MSG_RESULT([no])
    fi,
 
-   AC_MSG_RESULT([no])
+   AC_MSG_RESULT([yes])
+   AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
+                AC_DEFINE(XINERAMA, 1, "Xinerama support")
+                LIBS="$LIBS -lXinerama")
 )
 
 AC_ARG_WITH(