2 files changed, 20 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 149a633..b96f219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 (Format: Year/Month/Day)
 Changes for 0.9.5:
+*03/08/22:
+   * Added search path resource for images (Henrik)
+     * session.screen<num>.imageSearchPath
+     This is a list separated by , or space
+     example: session.screen0.imageSearchPath: ~/.fluxbox/pixmaps, /usr/share/fluxbox/pixmaps
+   * Added new files for image loading (Henrik)
+     The new way to load pixmap is to call FbTk::Image::load(thefile, screen_num);
+     and to add more image file support you just have to extend FbTk::ImageBase 
+     and register it to FbTk::Image     
+     Image.hh/cc, ImageXPM.hh/cc, PixmapWithMask.hh, Theme.cc, WinButtonTheme.hh/cc,
+     WinButton.cc/hh, fluxbox.cc
+   * Fixed scaling in WinButtonTheme (Henrik)
+     WinButton.cc, Screen.cc WinButtonTheme.hh/cc
+   * Added new theme item window.title.height, Window.Title.Height (Henrik)
+     FbWinFrameTheme.hh/cc
 *03/08/19:
    * Added ResizeVertical and ResizeHorizontal  (Thanks Mathias Gumz)
      CurrentWindowCmd.hh/cc, FbCommandFactory.cc
diff --git a/configure.in b/configure.in
index 680881e..781f9ad 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Initialize autoconf and automake
 AC_INIT(src/main.cc)
 AC_PREREQ(2.52)
-AM_INIT_AUTOMAKE(fluxbox,0.9.5, no-define)
+AM_INIT_AUTOMAKE(fluxbox,0.9.5pre1, no-define)
 
 dnl Determine default prefix
 test x$prefix = "xNONE" && prefix="$ac_default_prefix"
@@ -354,6 +354,7 @@ AC_ARG_ENABLE(
         LIBS="$LIBS -lXrender")
 )
 
+XPM=false
 AC_MSG_CHECKING([whether to have Xpm (pixmap themes) support])
 AC_ARG_ENABLE(
   xpm,
@@ -362,6 +363,7 @@ AC_ARG_ENABLE(
         AC_MSG_RESULT([yes])
         AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
                 AC_DEFINE(HAVE_XPM, 1, "Xpm support")
+                XPM=true
                 LIBS="$LIBS -lXpm")
   else
     AC_MSG_RESULT([no]) 
@@ -369,9 +371,11 @@ AC_ARG_ENABLE(
   AC_MSG_RESULT([yes])
   AC_CHECK_LIB(Xpm, XpmReadFileToPixmap,
         AC_DEFINE(HAVE_XPM, 1, "Xpm support")
+        XPM=true
         LIBS="$LIBS -lXpm")
 )
 
+AM_CONDITIONAL(XPM, test x$XPM = xtrue)
 
 AC_MSG_CHECKING([whether to have Xmb (multibyte font, utf-8) support])
 AC_ARG_ENABLE(