IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Get goffice merge to build on FC3 again.

Browse Source 
* configure.in: fix some of the output strings
	* lib/libgsf-1.12.3/gsf/glib24_26-compat.c:
	  make g_get_filename_charsets static because it's not
	  needed outside this file.
	* lib/goffice-0.0.4/goffice/glib24_26-compat.c:
	  make _g_compute_locale_variants static because it's
	  not needed outside this file.



git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12097 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins
2005-12-04 22:11:34 +00:00
parent 94e9fe5e6f
commit eb88bd88f9
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2005-12-04 Derek Atkins <derek@ihtfp.com>
* configure.in: fix some of the output strings
* lib/libgsf-1.12.3/gsf/glib24_26-compat.c:
make g_get_filename_charsets static because it's not
needed outside this file.
* lib/goffice-0.0.4/goffice/glib24_26-compat.c:
make _g_compute_locale_variants static because it's
not needed outside this file.
2005-12-04 Joshua Sled <jsled@asynchronous.org> 2005-12-04 Joshua Sled <jsled@asynchronous.org>
* All: Fold branches/goffice-update/ back into trunk/. * All: Fold branches/goffice-update/ back into trunk/.

9
configure.in
View File

@@ -418,6 +418,7 @@ if test x$QOF_XML_DIR = x; then
QOF_CFLAGS="-I\${top_srcdir}/lib/libqof/qof" QOF_CFLAGS="-I\${top_srcdir}/lib/libqof/qof"
QOF_LIBS="\${top_srcdir}/lib/libqof/qof/libqof.la" QOF_LIBS="\${top_srcdir}/lib/libqof/qof/libqof.la"
# QOF_LIB_DIR=`eval echo ${libdir}` # QOF_LIB_DIR=`eval echo ${libdir}`
QOF_VERSION="internal"
QOF_PREFIX="internal" QOF_PREFIX="internal"
QOF_XML_DIR=`eval echo ${datadir}/xml/qsf` QOF_XML_DIR=`eval echo ${datadir}/xml/qsf`
LIBQOF_LIBRARY_VERSION=1:1:0 LIBQOF_LIBRARY_VERSION=1:1:0
@@ -483,7 +484,7 @@ else
AC_MSG_NOTICE(using internally-packaged libgsf) AC_MSG_NOTICE(using internally-packaged libgsf)
GSF_CFLAGS='-I${top_srcdir}/lib/libgsf-1.12.3' GSF_CFLAGS='-I${top_srcdir}/lib/libgsf-1.12.3'
GSF_LIBS='${top_builddir}/lib/libgsf-1.12.3/gsf/libgsf-1.la' GSF_LIBS='${top_builddir}/lib/libgsf-1.12.3/gsf/libgsf-1.la'
NEED_LIBGSF=yes HAVE_LIBGSF=no
fi fi
AM_CONDITIONAL(HAVE_LIBGSF, test "x$HAVE_LIBGSF" = "xyes") AM_CONDITIONAL(HAVE_LIBGSF, test "x$HAVE_LIBGSF" = "xyes")
AC_SUBST(GSF_CFLAGS) AC_SUBST(GSF_CFLAGS)
@@ -499,7 +500,7 @@ else
AC_MSG_NOTICE(using internally-packaged goffice) AC_MSG_NOTICE(using internally-packaged goffice)
GOFFICE_CFLAGS='-I${top_srcdir}/lib/goffice-0.0.4' GOFFICE_CFLAGS='-I${top_srcdir}/lib/goffice-0.0.4'
GOFFICE_LIBS='${top_builddir}/lib/goffice-0.0.4/goffice/libgoffice-1.la' GOFFICE_LIBS='${top_builddir}/lib/goffice-0.0.4/goffice/libgoffice-1.la'
NEED_GOFFICE=yes HAVE_GOFFICE=no
fi fi
AM_CONDITIONAL(HAVE_GOFFICE, test "x$HAVE_GOFFICE" = "xyes") AM_CONDITIONAL(HAVE_GOFFICE, test "x$HAVE_GOFFICE" = "xyes")
AC_SUBST(GOFFICE_CFLAGS) AC_SUBST(GOFFICE_CFLAGS)
@@ -2162,8 +2163,8 @@ AC_MSG_RESULT([
CPPFLAGS ............. : $CPPFLAGS CPPFLAGS ............. : $CPPFLAGS
CFLAGS ............... : $CFLAGS CFLAGS ............... : $CFLAGS
LDFLAGS .............. : $LDFLAGS LDFLAGS .............. : $LDFLAGS
Have libgsf............: $HAVE_LIBGSF Native libgsf..........: $HAVE_LIBGSF
Have goffice...........: $HAVE_GOFFICE Native goffice.........: $HAVE_GOFFICE
QOF support ...........: $QOF_VERSION QOF support ...........: $QOF_VERSION
QOF location ..........: $QOF_PREFIX QOF location ..........: $QOF_PREFIX
QOF library dir .......: $QOF_LIB_DIR QOF library dir .......: $QOF_LIB_DIR

2
lib/goffice-0.0.4/goffice/glib24_26-compat.c
View File

@@ -223,7 +223,7 @@ explode_locale (const gchar *locale,
* but it is big, ugly, and complicated, so I'm reluctant * but it is big, ugly, and complicated, so I'm reluctant
* to do so when this should handle 99% of the time... * to do so when this should handle 99% of the time...
*/ */
GSList * static GSList *
_g_compute_locale_variants (const gchar *locale) _g_compute_locale_variants (const gchar *locale)
{ {
GSList *retval = NULL; GSList *retval = NULL;

2
lib/libgsf-1.12.3/gsf/glib24_26-compat.c
View File

@@ -77,7 +77,7 @@ struct _GFilenameCharsetCache {
* *
* Since: 2.6 * Since: 2.6
*/ */
gboolean static gboolean
g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets) g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets)
{ {
static const gchar *charsets[] = { static const gchar *charsets[] = {