[Gnucash-changes] r12097 - gnucash/trunk - Get goffice merge to build on FC3 again.

[Derek Atkins]

Author: warlord
Date: 2005-12-04 17:11:34 -0500 (Sun, 04 Dec 2005)
New Revision: 12097
Trac: http://svn.gnucash.org/trac/changeset/12097

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
   gnucash/trunk/lib/goffice-0.0.4/goffice/glib24_26-compat.c
   gnucash/trunk/lib/libgsf-1.12.3/gsf/glib24_26-compat.c
Log:
Get goffice merge to build on FC3 again.

	* 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.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-12-04 21:27:17 UTC (rev 12096)
+++ gnucash/trunk/ChangeLog	2005-12-04 22:11:34 UTC (rev 12097)
@@ -1,3 +1,13 @@
+2005-12-04  Derek Atkins  <derek at 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 at asynchronous.org>
 
 	* All: Fold branches/goffice-update/ back into trunk/.

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2005-12-04 21:27:17 UTC (rev 12096)
+++ gnucash/trunk/configure.in	2005-12-04 22:11:34 UTC (rev 12097)
@@ -418,6 +418,7 @@
 	QOF_CFLAGS="-I\${top_srcdir}/lib/libqof/qof"
 	QOF_LIBS="\${top_srcdir}/lib/libqof/qof/libqof.la"
 #	QOF_LIB_DIR=`eval echo ${libdir}`
+	QOF_VERSION="internal"
 	QOF_PREFIX="internal"
 	QOF_XML_DIR=`eval echo ${datadir}/xml/qsf`
 	LIBQOF_LIBRARY_VERSION=1:1:0
@@ -483,7 +484,7 @@
   AC_MSG_NOTICE(using internally-packaged libgsf)
   GSF_CFLAGS='-I${top_srcdir}/lib/libgsf-1.12.3'
   GSF_LIBS='${top_builddir}/lib/libgsf-1.12.3/gsf/libgsf-1.la'
-  NEED_LIBGSF=yes
+  HAVE_LIBGSF=no
 fi
 AM_CONDITIONAL(HAVE_LIBGSF, test "x$HAVE_LIBGSF" = "xyes")
 AC_SUBST(GSF_CFLAGS)
@@ -499,7 +500,7 @@
   AC_MSG_NOTICE(using internally-packaged goffice)
   GOFFICE_CFLAGS='-I${top_srcdir}/lib/goffice-0.0.4'
   GOFFICE_LIBS='${top_builddir}/lib/goffice-0.0.4/goffice/libgoffice-1.la'
-  NEED_GOFFICE=yes
+  HAVE_GOFFICE=no
 fi
 AM_CONDITIONAL(HAVE_GOFFICE, test "x$HAVE_GOFFICE" = "xyes")
 AC_SUBST(GOFFICE_CFLAGS)
@@ -2162,8 +2163,8 @@
   CPPFLAGS ............. : $CPPFLAGS
   CFLAGS ............... : $CFLAGS
   LDFLAGS .............. : $LDFLAGS
-  Have libgsf............: $HAVE_LIBGSF
-  Have goffice...........: $HAVE_GOFFICE
+  Native libgsf..........: $HAVE_LIBGSF
+  Native goffice.........: $HAVE_GOFFICE
   QOF support ...........: $QOF_VERSION
   QOF location ..........: $QOF_PREFIX
   QOF library dir .......: $QOF_LIB_DIR

Modified: gnucash/trunk/lib/goffice-0.0.4/goffice/glib24_26-compat.c
===================================================================
--- gnucash/trunk/lib/goffice-0.0.4/goffice/glib24_26-compat.c	2005-12-04 21:27:17 UTC (rev 12096)
+++ gnucash/trunk/lib/goffice-0.0.4/goffice/glib24_26-compat.c	2005-12-04 22:11:34 UTC (rev 12097)
@@ -223,7 +223,7 @@
  *       but it is big, ugly, and complicated, so I'm reluctant
  *       to do so when this should handle 99% of the time...
  */
-GSList *
+static GSList *
 _g_compute_locale_variants (const gchar *locale)
 {
   GSList *retval = NULL;

Modified: gnucash/trunk/lib/libgsf-1.12.3/gsf/glib24_26-compat.c
===================================================================
--- gnucash/trunk/lib/libgsf-1.12.3/gsf/glib24_26-compat.c	2005-12-04 21:27:17 UTC (rev 12096)
+++ gnucash/trunk/lib/libgsf-1.12.3/gsf/glib24_26-compat.c	2005-12-04 22:11:34 UTC (rev 12097)
@@ -77,7 +77,7 @@
  * 
  * Since: 2.6
  */
-gboolean
+static gboolean
 g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets) 
 {
   static const gchar *charsets[] = {