[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_5-223-g9a8b754

Pierre Biava nobody at users.sourceforge.net
Sun Dec 16 19:17:25 CET 2012 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, master has been updated
       via  9a8b7543fc3d26c42551de16c536d75c35bed23f (commit)
      from  4a4000d7c0084b18ac5ceac6d05625f70da7b877 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9a8b7543fc3d26c42551de16c536d75c35bed23f
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Dec 16 19:15:51 2012 +0100

    new version for git master

-----------------------------------------------------------------------

Changes:
diff --git a/configure.in b/configure.in
index 08c99d2..92b6f8d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
-m4_define(grisbi_major_version, 0)
-m4_define(grisbi_minor_version, 9)
-m4_define(grisbi_micro_version, 5)
+m4_define(grisbi_major_version, 1)
+m4_define(grisbi_minor_version, 1)
+m4_define(grisbi_micro_version, 0)
 m4_define(grisbi_version, grisbi_major_version.grisbi_minor_version.grisbi_micro_version)
 
 AC_INIT([grisbi],[grisbi_version],[http://grisbi.tuxfamily.org/mantis/login_select_proj_page.php?ref=bug_report_page.php],[grisbi],[http://www.grisbi.org/index.fr.html])
@@ -56,14 +56,22 @@ dnl ================================================================
 
 LT_LIB_M
 
-#PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.2.0 glib-2.0 >= 2.2 gmodule-2.0 >= 2.2 zlib])
+PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.2.24 glib-2.0 >= 2.28 gmodule-2.0 >= 2.28 zlib libgoffice-0.8 >= 0.8.14])
 # Temporary hack until Mandriva ships zlib.pc
-PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.18.0 gmodule-2.0 >= 2.18.0])
-GRISBI_LIBS="$LIBM $GRISBI_LIBS -lz"
-AC_SUBST(GRISBI_LIBS)
+#PKG_CHECK_MODULES(GRISBI, [gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.18.0 gmodule-2.0 >= 2.18.0])
+#GRISBI_LIBS="$LIBM $GRISBI_LIBS -lz"
+#AC_SUBST(GRISBI_LIBS)
 # </hack>
 
 dnl ================================================================
+dnl Defined if Grisbi is a development version
+dnl ================================================================
+
+if expr ${GRISBI_MINOR_VERSION} % 2 > /dev/null; then
+	AC_DEFINE(IS_DEVELOPMENT_VERSION,1,[Defined if Grisbi is a developmeent version])
+fi
+
+dnl ================================================================
 dnl Plugin support using glib's GModule
 dnl ================================================================
 
@@ -191,30 +199,6 @@ fi
 AM_CONDITIONAL(HAVE_OFX, [test "$build_ofx" = yes])
 
 dnl ================================================================
-dnl Check for libgoffice library
-dnl ================================================================
-
-AC_ARG_WITH(goffice,
-	AS_HELP_STRING([--with-goffice],[GOffice support of graphics (default=auto)]),
-	[build_goffice=$withval],
-	[build_goffice=auto])
-
-PKG_CHECK_MODULES(GOFFICE, [libgoffice-0.8 >= 0.8.0], have_goffice=yes, have_goffice=no)
-if test "$build_goffice" = yes -a "$have_goffice" = no; then
-	AC_MSG_ERROR([GOffice support was requested but goffice could not be found.])
-fi
-if test "$build_goffice" != no; then
-	build_goffice=$have_goffice
-else
-	build_goffice=no
-fi
-if test "$build_goffice" = yes; then
-	AC_DEFINE(HAVE_GOFFICE, 1, [Define if goffice support is enabled])
-fi
-
-AM_CONDITIONAL(HAVE_GOFFICE, [test "$build_goffice" = yes])
-
-dnl ================================================================
 dnl WError support
 dnl ================================================================
 
@@ -224,7 +208,7 @@ AC_ARG_ENABLE(werror,
  	enable_werror=no)
 if test "x$enable_werror" = xyes ; then
 	if test "x$GCC" = "xyes" ; then
-		CFLAGS="$CFLAGS -ansi -Wall -Wno-unused-but-set-variable -Wno-unused-parameter -Wno-unused-function"
+		CFLAGS="$CFLAGS -ansi -Wall -Wunused -Wno-unused-parameter -Wno-unused-function"
 		AC_MSG_WARN([Wall and Wunused flags are enabled])
 	else
 		AC_MSG_WARN([Wall and Wunused can be enabled only with gcc])
@@ -232,24 +216,6 @@ if test "x$enable_werror" = xyes ; then
 fi
 
 dnl ================================================================
-dnl GMemProfile support
-dnl ================================================================
-
-AC_ARG_ENABLE(gmemprofile,
- 	[AC_HELP_STRING([--enable-gmemprofile],
- 	[Outputs a summary of memory usage when grisbi terminates (default=no)])],,
- 	enable_gmemprofile=no)
-if test "x$enable_gmemprofile" = xyes ; then
-	GSB_GMEMPROFILE=1
-	AC_MSG_WARN([g_mem_profile is enabled])
-else
-	GSB_GMEMPROFILE=0
-fi
-AC_DEFINE_UNQUOTED([GSB_GMEMPROFILE], [${GSB_GMEMPROFILE}],
-	[define to 1 if g_mem_profile support is enabled])
-AC_SUBST(GSB_GMEMPROFILE)
-
-dnl ================================================================
 dnl NoOptim support
 dnl ================================================================
 
@@ -362,7 +328,6 @@ echo "
                 Build with libxml2:        $build_libxml2
                 Build with OpenSSL:        $build_openssl
                 Build with OFX plugin:     $build_ofx
-                Build with goffice:        $build_goffice
                 Build plugins statically:  $enable_static
                 Build gtk_mac_integration: $os_osx
                 CUnit/unit tests support:  $build_cunit
diff --git a/src/Makefile.am b/src/Makefile.am
index b58bdfb..4a594af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,6 @@
 # Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir) $(GRISBI_CFLAGS) $(GTK_MAC_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(plugindir)\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(docdir)\"" -DUI_DIR="\"$(datadir)/@PACKAGE@/ui\""
-
-if HAVE_GOFFICE
-AM_CPPFLAGS += $(GOFFICE_CFLAGS)
-endif
+AM_CPPFLAGS = -I$(top_srcdir) $(GRISBI_CFLAGS) $(GTK_MAC_CFLAGS) $(GOFFICE_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(plugindir)\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(docdir)\"" -DUI_DIR="\"$(datadir)/@PACKAGE@/ui\""
 
 bin_PROGRAMS = grisbi
 noinst_LTLIBRARIES = libgrisbi.la
@@ -20,11 +16,7 @@ libgrisbi_la_LIBADD += \
 else
 libgrisbi_la_LDFLAGS = -export_dynamic
 endif
-libgrisbi_la_LIBADD += $(GRISBI_LIBS) $(GTK_MAC_LIBS)
-
-if HAVE_GOFFICE
-libgrisbi_la_LIBADD += $(GOFFICE_LIBS)
-endif
+libgrisbi_la_LIBADD += $(GRISBI_LIBS) $(GTK_MAC_LIBS) $(GOFFICE_LIBS)
 
 libgrisbi_la_SOURCES = \
 	accueil.c		\
@@ -49,8 +41,6 @@ libgrisbi_la_SOURCES = \
 	fenetre_principale.c	\
 	file_obfuscate.c	\
 	file_obfuscate_qif.c	\
-	go-charmap-sel.c	\
-	go-optionmenu.c		\
 	grisbi_osx.c \
 	gsb_account.c		\
 	gsb_account_property.c	\
@@ -192,8 +182,6 @@ libgrisbi_la_SOURCES = \
 	etats_html.h            \
 	export.h                \
 	export_csv.h            \
-	go-charmap-sel.h        \
-	go-optionmenu.h         \
 	grisbi_osx.h \
 	gsb_account.h		\
 	gsb_account_property.h	\


hooks/post-receive
-- 
grisbi

More information about the cvs mailing list