diff -Nura -x aclocal.m4 -x 'config.*' -x depcomp -x install-sh -x missing -x '*po/*' -x mkinstalldirs grisbi-0.5.9/configure.in grisbi-0.5.9-new/configure.in
--- grisbi-0.5.9/configure.in	2006-06-14 08:30:42.000000000 +0200
+++ grisbi-0.5.9-new/configure.in	2008-04-13 15:02:47.000000000 +0200
@@ -1,76 +1,91 @@
-AC_INIT(src/main.c)
+AC_INIT([grisbi],[0.5.9],[http://grisbi.tuxfamily.org/mantis/])
+AC_PREREQ(2.54)
+
+AC_CONFIG_MACRO_DIR([macros])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(grisbi,0.5.9)
-AM_ACLOCAL_INCLUDE(macros)
-AM_MAINTAINER_MODE
+AC_CONFIG_SRCDIR(src/main.c)
 
-PACKAGE=grisbi
-VERSION=0.5.9
-dnl MKINSTALLDIRS
-dnl AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-dnl AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
+AM_MAINTAINER_MODE
 
 AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
 AC_PROG_RANLIB
 
+dnl ******************************
 dnl Check for NLS support.
+dnl ******************************
+
+GETTEXT_PACKAGE=grisbi
 ALL_LINGUAS="cs de es fr he it pl pt_BR nl ro ru zh_CN"
-AM_GNU_GETTEXT
-AC_CHECK_LIB(intl,main)
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext domain.])
+
+AM_GLIB_GNU_GETTEXT
 
+dnl ******************************
 dnl Check for libofx
-AC_CHECK_HEADER(libofx/libofx.h,,noofx=true)
-AC_ARG_WITH(ofx,
-    [  --without-ofx           build grisbi without ofx support [default=with]],
+dnl ******************************
+
+AC_CHECK_HEADER(libofx/libofx.h,,ofx_found=false)
+AC_ARG_WITH([ofx],
+    AC_HELP_STRING([--without-ofx],[build grisbi without ofx support @<:@default=with@:>@]),
     [build_ofx=$withval],
     [build_ofx=yes]
 )
+
+OFX_CFLAGS=
+OFX_LIBS=
 if test x$build_ofx != xno
 then
-    if test x$noofx != xtrue
+    if test x$ofx_found != xfalse
     then
+	ofx_found=true
         AC_CHECK_LIB(ofx, ofx_set_status_cb, OFX_0_7="-DOFX_0_7")
-        LDFLAGS="${LDFLAGS} -lofx"
-        CFLAGS="${CFLAGS} $OFX_0_7"
+        OFX_CFLAGS="$OFX_0_7"
+        OFX_LIBS="-lofx"
+	AC_DEFINE(WITH_OFX, 1, [Support for OFX files])
     else
-        noofx=true
+        ofx_found=false
         AC_MSG_RESULT([Libofx header missing. Check your libofx installation])
-	CFLAGS="${CFLAGS} -DNOOFX"
     fi
 else
-    noofx=true
-    CFLAGS="${CFLAGS} -DNOOFX"
+    ofx_found=false
 fi
-AM_CONDITIONAL(NOOFX, test x$noofx = xtrue)
-
+AC_SUBST(OFX_CFLAGS)
+AC_SUBST(OFX_LIBS)
+AM_CONDITIONAL(HAVE_OFX, [test "x$ofx_found" = "xtrue"])
 
 AC_SUBST(prefix)
 
 PKG_CHECK_MODULES(GRISBI, gtk+-2.0 >= 2.2.0 glib-2.0 libxml-2.0 >= 2.0)
-LDFLAGS="${LDFLAGS} ${GRISBI_LIBS}"
-CFLAGS="${CFLAGS} ${GRISBI_CFLAGS}"
-
-
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
+AC_SUBST(GRISBI_CFLAGS)
+AC_SUBST(GRISBI_LIBS)
 
 dnl ******************************
 dnl Makefiles
 dnl ******************************
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 help/Makefile
 help/en/Makefile
 help/fr/Makefile
 help/de/Makefile
-intl/Makefile
 macros/Makefile
 pixmaps/Makefile
 po/Makefile.in
 src/Makefile
 ])
+
+AC_OUTPUT
+
+echo "
+
+Configuration:
+
+	Source code location:   ${srcdir}
+	With libofx:            ${ofx_found}
+
+"
diff -Nura -x aclocal.m4 -x 'config.*' -x depcomp -x install-sh -x missing -x '*po/*' -x mkinstalldirs grisbi-0.5.9/help/de/Makefile.am grisbi-0.5.9-new/help/de/Makefile.am
--- grisbi-0.5.9/help/de/Makefile.am	2008-04-13 13:18:30.000000000 +0200
+++ grisbi-0.5.9-new/help/de/Makefile.am	2008-04-13 15:33:12.000000000 +0200
@@ -1,21 +1,17 @@
 ## Process this file with automake to produce Makefile.in.
 
-HTML_FILES =			\
+HTML_FILES = \
 	grisbi-manuel.html \
-	quickstart.html \
+	quickstart.html    \
 	translation.html
 
 grisbi_helpdir = $(datadir)/doc/grisbi/help/de
 
 grisbi_help_DATA = \
-	topic.dat     \
+	topic.dat          \
 	contents_motif.gif \
-	next_motif.gif \
+	next_motif.gif     \
 	previous_motif.gif \
 	$(HTML_FILES)
 
-EXTRA_DIST = 		\
-	contents_motif.gif		\
-	previous_motif.gif	\
-	next_motif.gif	\
-	topic.dat
+EXTRA_DIST = $(grisbi_help_DATA)
diff -Nura -x aclocal.m4 -x 'config.*' -x depcomp -x install-sh -x missing -x '*po/*' -x mkinstalldirs grisbi-0.5.9/help/en/Makefile.am grisbi-0.5.9-new/help/en/Makefile.am
--- grisbi-0.5.9/help/en/Makefile.am	2008-04-13 13:18:30.000000000 +0200
+++ grisbi-0.5.9-new/help/en/Makefile.am	2008-04-13 15:32:45.000000000 +0200
@@ -1,21 +1,17 @@
 ## Process this file with automake to produce Makefile.in.
 
-HTML_FILES =			\
+HTML_FILES = \
 	grisbi-manuel.html \
-	quickstart.html \
+	quickstart.html    \
 	translation.html
 
 grisbi_helpdir = $(datadir)/doc/grisbi/help/C
 
 grisbi_help_DATA = \
-	topic.dat     \
+	topic.dat          \
 	contents_motif.gif \
-	next_motif.gif \
+	next_motif.gif     \
 	previous_motif.gif \
 	$(HTML_FILES)
 
-EXTRA_DIST = 		\
-	contents_motif.gif		\
-	previous_motif.gif	\
-	next_motif.gif	\
-	topic.dat
+EXTRA_DIST = $(grisbi_help_DATA)
diff -Nura -x aclocal.m4 -x 'config.*' -x depcomp -x install-sh -x missing -x '*po/*' -x mkinstalldirs grisbi-0.5.9/help/fr/Makefile.am grisbi-0.5.9-new/help/fr/Makefile.am
--- grisbi-0.5.9/help/fr/Makefile.am	2008-04-13 13:18:30.000000000 +0200
+++ grisbi-0.5.9-new/help/fr/Makefile.am	2008-04-13 15:33:40.000000000 +0200
@@ -1,21 +1,17 @@
 ## Process this file with automake to produce Makefile.in.
 
-HTML_FILES =			\
+HTML_FILES = \
 	grisbi-manuel.html \
-	quickstart.html \
+	quickstart.html    \
 	translation.html
 
 grisbi_helpdir = $(datadir)/doc/grisbi/help/fr
 
 grisbi_help_DATA = \
-	topic.dat     \
+	topic.dat          \
 	contents_motif.gif \
-	next_motif.gif \
+	next_motif.gif     \
 	previous_motif.gif \
 	$(HTML_FILES)
 
-EXTRA_DIST = 		\
-	contents_motif.gif		\
-	previous_motif.gif	\
-	next_motif.gif	\
-	topic.dat
+EXTRA_DIST = $(grisbi_help_DATA)
diff -Nura -x aclocal.m4 -x 'config.*' -x depcomp -x install-sh -x missing -x '*po/*' -x mkinstalldirs grisbi-0.5.9/Makefile.am grisbi-0.5.9-new/Makefile.am
--- grisbi-0.5.9/Makefile.am	2008-04-13 13:18:30.000000000 +0200
+++ grisbi-0.5.9-new/Makefile.am	2008-04-13 14:37:10.000000000 +0200
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = macros src po intl pixmaps help
+SUBDIRS = macros src po pixmaps help
 man_MANS = grisbi.1
 
 EXTRA_DIST = $(man_MANS)
diff -Nura -x aclocal.m4 -x 'config.*' -x depcomp -x install-sh -x missing -x '*po/*' -x mkinstalldirs grisbi-0.5.9/pixmaps/Makefile.am grisbi-0.5.9-new/pixmaps/Makefile.am
--- grisbi-0.5.9/pixmaps/Makefile.am	2008-04-13 13:18:30.000000000 +0200
+++ grisbi-0.5.9-new/pixmaps/Makefile.am	2008-04-13 15:29:24.000000000 +0200
@@ -18,3 +18,5 @@
 	warnings.png \
 	grisbi-logo.png \
 	grisbi.png
+
+EXTRA_DIST = $(grisbi_pixmaps_DATA)
diff -Nura -x aclocal.m4 -x 'config.*' -x depcomp -x install-sh -x missing -x '*po/*' -x mkinstalldirs grisbi-0.5.9/src/Makefile.am grisbi-0.5.9-new/src/Makefile.am
--- grisbi-0.5.9/src/Makefile.am	2008-04-13 13:18:30.000000000 +0200
+++ grisbi-0.5.9-new/src/Makefile.am	2008-04-13 15:26:35.000000000 +0200
@@ -1,7 +1,18 @@
 # Process this file with automake to produce Makefile.in
 
 localedir = $(datadir)/locale
-INCLUDES = -I$(top_srcdir) -I$(includedir) -I../intl -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/grisbi\"" -DLOGO_PATH="\"$(datadir)/pixmaps/grisbi/grisbi-logo.png\"" -DANIM_PATH="\"$(datadir)/pixmaps/grisbi/euro.gif\"" -DHELP_PATH="\"$(datadir)/doc/grisbi/help\"" -Wall 
+
+INCLUDES = \
+	-I$(top_srcdir) \
+	-I$(includedir) \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DPIXMAPS_DIR="\"$(datadir)/pixmaps/grisbi\"" \
+	-DLOGO_PATH="\"$(datadir)/pixmaps/grisbi/grisbi-logo.png\"" \
+	-DANIM_PATH="\"$(datadir)/pixmaps/grisbi/euro.gif\"" \
+	-DHELP_PATH="\"$(datadir)/doc/grisbi/help\"" \
+	$(GRISBI_CFLAGS) \
+	-Wall
+
 bin_PROGRAMS = grisbi
 
 sources = 			\
@@ -132,10 +143,53 @@
 	ventilation.h		\
 	utils.h			\
 	utils_xml.h		\
-	search_glist.h
-
+	search_glist.h		\
+	csv.h			\
+	etats_affiche.h         \
+	etats_csv.h             \
+	etats_html.h            \
+	export.h                \
+	ofx.h                   \
+	mouse.h                 \
+	utils_file_selection.h	\
+	utils_files.h		\
+	variables.c             \
+	variables-extern.c
+
+grisbi_LDADD = $(GRISBI_LIBS)
+
+if HAVE_OFX
+INCLUDES += $(OFX_CFLAGS)
+grisbi_LDADD += $(OFX_LIBS)
+endif
+
+xpms = \
+	xpm/import.xpm             \
+	xpm/portrait.xpm           \
+	xpm/image_fleche_haut.xpm  \
+	xpm/book-closed.xpm        \
+	xpm/ope_completes.xpm      \
+	xpm/ope_simples.xpm        \
+	xpm/fleche_bas.xpm         \
+	xpm/ope_2.xpm              \
+	xpm/liste_0.xpm            \
+	xpm/liste_2.xpm            \
+	xpm/ope_sans_r.xpm         \
+	xpm/ope_4.xpm              \
+	xpm/liste_1.xpm            \
+	xpm/liste_3.xpm            \
+	xpm/ope_1.xpm              \
+	xpm/export.xpm             \
+	xpm/comments.xpm           \
+	xpm/book-open.xpm          \
+	xpm/image_fleche_bas.xpm   \
+	xpm/ope_semi_completes.xpm \
+	xpm/landscape.xpm          \
+	xpm/ope_3.xpm              \
+	xpm/fleche_haut.xpm        \
+	xpm/ope_avec_r.xpm
 
-EXTRA_DIST = grisbi.desktop grisbi.keys grisbi.mime $(grisbi_INCLUDES)
+EXTRA_DIST = grisbi.desktop grisbi.keys grisbi.mime $(grisbi_INCLUDES) $(xpms)
 
 mimedir = $(datadir)/mime-info
 mime_DATA = grisbi.keys grisbi.mime
diff -Nura -x aclocal.m4 -x 'config.*' -x depcomp -x install-sh -x missing -x '*po/*' -x mkinstalldirs grisbi-0.5.9/src/ofx.c grisbi-0.5.9-new/src/ofx.c
--- grisbi-0.5.9/src/ofx.c	2006-05-03 21:58:44.000000000 +0200
+++ grisbi-0.5.9-new/src/ofx.c	2008-04-13 14:54:04.000000000 +0200
@@ -28,7 +28,7 @@
 #include "dialog.h"
 #include "utils.h"
 
-#ifdef NOOFX
+#ifndef WITH_OFX
 /* dummy recuperation_donnees_ofx function implementation for system with no LIBOFX */
 gboolean recuperation_donnees_ofx ( gchar *nom_fichier )
 {