[Gnucash-changes] r13275 - gnucash/trunk - get --disable-gui configure switch to actually do what we want.

Derek Atkins warlord at cvs.gnucash.org
Wed Feb 15 23:07:32 EST 2006


Author: warlord
Date: 2006-02-15 23:07:31 -0500 (Wed, 15 Feb 2006)
New Revision: 13275
Trac: http://svn.gnucash.org/trac/changeset/13275

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
Log:
get --disable-gui configure switch to actually do what we want.

	  - Move a bunch of configure code around in the file.
	  - Don't look for goffice/gsf if we ask for --disable-gui
	  - add a few more comments
	  - no need to check for libxml2 twice  (more work to do here).



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-02-16 03:56:03 UTC (rev 13274)
+++ gnucash/trunk/ChangeLog	2006-02-16 04:07:31 UTC (rev 13275)
@@ -1,3 +1,11 @@
+2006-02-15  Derek Atkins <derek at ihtfp.com>
+
+	* configure.in:  get --disable-gui to actually do what we want.
+	  - Move a bunch of configure code around in the file.
+	  - Don't look for goffice/gsf if we ask for --disable-gui
+	  - add a few more comments
+	  - no need to check for libxml2 twice  (more work to do here).
+
 2006-02-15  Joshua Sled  <jsled at asynchronous.org>
 
 	* src/backend/file/test/test-load-xml2.c (main): Initialize

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-02-16 03:56:03 UTC (rev 13274)
+++ gnucash/trunk/configure.in	2006-02-16 04:07:31 UTC (rev 13275)
@@ -382,6 +382,8 @@
   AC_MSG_RESULT(yes)
 fi
 
+AM_CONDITIONAL(GNC_HAVE_GUILE_WWW, test "${gnc_have_guile_www}" = yes)
+
 ### --------------------------------------------------------------------------
 ### look for gconf
 
@@ -389,23 +391,23 @@
 AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(GCONF_LIBS)
 
-AM_CONDITIONAL(GNC_HAVE_GUILE_WWW, test "${gnc_have_guile_www}" = yes)
-
 ### --------------------------------------------------------------------------
-### Gnome XML -- GNOME_XML_LIB is defined by GNOME_XML_CHECK
+### LIBXML -- GNOME_XML_LIB is defined by GNOME_XML_CHECK
 
-PKG_CHECK_MODULES(XML, libxml-2.0)
-AS_SCRUB_INCLUDE(XML_CFLAGS)
-AC_SUBST(XML_CFLAGS)
-AC_SUBST(XML_LIBS)
-
 LIBXML2_REQUIRED=2.5.10
 PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED)
 LIBXML_VERSION=`$PKG_CONFIG --version xml`
+AS_SCRUB_INCLUDE(LIBXML2_CFLAGS)
 AC_SUBST(LIBXML2_CFLAGS)
 AC_SUBST(LIBXML2_LIBS)
 AC_SUBST(LIBXML_VERSION)
 
+# Silly us -- we have two Makefile macros for the same set of libraries!
+XML_CFLAGS=${LIBXML2_CFLAGS}
+XML_LIBS=${LIBXML2_LIBS}
+AC_SUBST(XML_CFLAGS)
+AC_SUBST(XML_LIBS)
+
 oLIBS="$LIBS"
 LIBS="$LIBS $XML_LIBS"
 
@@ -415,9 +417,8 @@
   ])
 LIBS="$oLIBS"
 
-dnl *************************************
-dnl QOF
-dnl *************************************
+### --------------------------------------------------------------------------
+### QOF, the Query Object Framework.  Check if there is a native version.
 
 dnl XXX: FIXME: RELEASE HACK
 dnl This makes sure that we default to using internal QOF for SVN.
@@ -488,808 +489,6 @@
 AC_SUBST(QOF_XML_DIR)
 
 ### --------------------------------------------------------------------------
-### for GOG/goffice...
-
-AC_MSG_CHECKING(for GTK - version >= 2.6.0)
-if $PKG_CONFIG 'gtk+-2.0 >= 2.6.0'
-then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_GTK26,1,[System has gtk 2.6.0 or better])
-  HAVE_GTK26=yes
-else
-  AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(HAVE_GTK26, test "x$HAVE_GTK26" = "xyes" )
-
-
-AC_MSG_CHECKING(for pango version >= 1.8.0)
-if $PKG_CONFIG 'pango >= 1.8.0'
-then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_PANGO18,1,[System has pango 1.8.0 or better])
-  HAVE_PANGO18=yes
-else
-  AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(HAVE_PANGO18, test "x$HAVE_PANGO18" = "xyes" )
-
-
-dnl @@fixme 
-dnl use both PKG_CHECK_MODULES and `$PKG_CONFIG`; the first importantly sets
-dnl MUMBLE_{LIBS,CFLAGS}...
-dnl Q: What does PKG_CHECK_MODULES create?
-dnl A: Just _CFLAGS and _LIBS, apparently [pkg.m4]
-
-AC_MSG_CHECKING([for libgsf >= 1.12.2])
-if $PKG_CONFIG --silence-errors 'libgsf-1 >= 1.12.2'
-then
-  AC_MSG_RESULT(found)
-  PKG_CHECK_MODULES(GSF, libgsf-1 >= 1.12.2 libgsf-gnome-1 >= 1.12.2,,)
-  AC_DEFINE(HAVE_LIBGSF,1,[System has libgsf-1.12.2 or better])
-  HAVE_LIBGSF=yes
-else
-  AC_MSG_RESULT(not found.  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'
-  HAVE_LIBGSF=no
-fi
-AM_CONDITIONAL(HAVE_LIBGSF, test "x$HAVE_LIBGSF" = "xyes")
-AC_SUBST(GSF_CFLAGS)
-AC_SUBST(GSF_LIBS)
-
-dnl $4=true => don't die if failure.
-PKG_CHECK_MODULES(GOFFICE, libgoffice-1 >= 0.0.4,,true)
-if $PKG_CONFIG --silence-errors 'libgoffice-1 >= 0.0.4'
-then
-  AC_DEFINE(HAVE_GOFFICE,1,[System has goffice-0.0.4 or better])
-  HAVE_GOFFICE=yes
-else
-  AC_MSG_RESULT(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'
-  HAVE_GOFFICE=no
-fi
-AM_CONDITIONAL(HAVE_GOFFICE, test "x$HAVE_GOFFICE" = "xyes")
-AC_SUBST(GOFFICE_CFLAGS)
-AC_SUBST(GOFFICE_LIBS)
-
-### ----------
-
-### +libgsf-1.12.3
-if test "x$HAVE_LIBGSF" != xyes; then
-AC_MSG_NOTICE('internal libgsf configuration...')
-
-m4_define([libgsf_version_major], [1])
-m4_define([libgsf_version_minor], [12])
-m4_define([libgsf_version_micro], [3])
-m4_define([libgsf_version_extra], [])
-m4_define([libgsf_full_version],
-    [libgsf_version_major.libgsf_version_minor.libgsf_version_micro[]libgsf_version_extra])
-
-dnl AC_CONFIG_SRCDIR(lib/libgsf-1.12.3/gsf/gsf.h)
-
-AC_SUBST(LIBGSF_MAJOR_VERSION, libgsf_version_major)
-AC_SUBST(LIBGSF_MINOR_VERSION, libgsf_version_minor)
-AC_SUBST(LIBGSF_MICRO_VERSION, libgsf_version_micro)
-
-dnl Version info for libraries = CURRENT:REVISION:AGE
-AC_SUBST(VERSION_INFO,
-m4_eval(libgsf_version_major + libgsf_version_minor)[]dnl
-:libgsf_version_micro:libgsf_version_minor)
-
-dnl 2005-11-19,jsled, this doesn't seem to work... :(
-dnl ifelse(x$HAVE_LIBGSF, xyes,,
-  AC_CONFIG_HEADERS(gsf-config.h)
-dnl)
-
-AC_FUNC_FSEEKO
-AC_SYS_LARGEFILE
-
-dnl Checks for libraries.
-ifelse([
-  If we defined the module lists on the M4 level, we could have problems
-  with PKG_CHECK_MODULES from pkgconfig 0.16.0, which double quotes its
-  second argument (the module list).
-  As a handy workaround, we use shell variables.
-])
-dnl Modules common to libgsf and libgsf-gnome
-libgsf_reqs="
-    gobject-2.0 >= 2.4.0
-    glib-2.0 >= 2.4.0
-    libxml-2.0 >= 2.4.16
-"
-dnl Modules required for libgsf-gnome
-libgsf_gnome_reqs="
-    $libgsf_reqs
-    libbonobo-2.0 >= 2.0.0
-    gnome-vfs-2.0 >= 2.2.0
-    gnome-vfs-module-2.0 >= 2.2.0
-"
-PKG_CHECK_MODULES(LIBGSF, $libgsf_reqs)
-
-# this should come after `AC_PROG_CC'
-#ifdef([GNOME_COMPILE_WARNINGS],[GNOME_COMPILE_WARNINGS],)
-#CFLAGS="$CFLAGS $WARN_CFLAGS -DG_DISABLE_DEPRECATED"
-
-#if test "$GCC" = "yes"; then
-#	for option in -Wno-system-headers -Wfloat-equal -Wpointer-arith -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wformat -Wnested-externs -Winline -Wdeclaration-after-statement -Wundef -W -Wmissing-noreturn -Wmissing-format-attribute; do
-#		SAVE_CFLAGS="$CFLAGS"
-#		CFLAGS="$CFLAGS $option"
-#		AC_MSG_CHECKING([whether gcc understands $option])
-#		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])],
-#			has_option=yes,
-#			has_option=no)
-#		if test $has_option = no; then
-#		  CFLAGS="$SAVE_CFLAGS"
-#		fi
-#		AC_MSG_RESULT($has_option)
-#		unset has_option
-#		unset SAVE_CFLAGS
-#	done
-#	unset option
-#fi
-
-AC_CHECK_DECL(fdopen, fdopen_works=yes, fdopen_works=no)
-if test $fdopen_works = no ; then
-	unset ac_cv_have_decl_fdopen
-	CFLAGS="$CFLAGS -D_POSIX_SOURCE"
-	AC_MSG_NOTICE([adding -D_POSIX_SOURCE to CFLAGS])
-	AC_CHECK_DECL(fdopen, fdopen_works=yes, fdopen_works=no)
-	if test $fdopen_works = no ; then
-		AC_MSG_ERROR([fdopen is not available])
-	fi
-fi
-
-# Unfortunately, -D_POSIX_SOURCE turns off struct timeval on Solaris
-AC_MSG_CHECKING([whether struct timeval is available])
-for try in 1 2; do
-	AC_COMPILE_IFELSE(
-		[AC_LANG_PROGRAM(
-			[[#include <sys/time.h>]],
-			[[struct timeval tv;]])],
-		struct_timeval_works=yes,
-		struct_timeval_works=no)
-	test $struct_timeval_works = yes && break
-	# Try this for the second attempt:
-	test $try = 1 && CFLAGS="$CFLAGS -D__EXTENSIONS__"
-done
-AC_MSG_RESULT($struct_timeval_works)
-if test $struct_timeval_works = no ; then
-	AC_MSG_ERROR([struct timeval is not available])
-fi
-
-AC_MSG_CHECKING([whether -D_BSD_SOURCE is needed for caddr_t])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM([[#include <sys/types.h>]], [[caddr_t ca]])],
-	need_bsd1=no,
-	need_bsd1=yes)
-AC_MSG_RESULT($need_bsd1)
-
-AC_MSG_CHECKING([whether -D_BSD_SOURCE is needed for lstat])
-AC_LINK_IFELSE([AC_LANG_PROGRAM(
-[[#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>]],
-[[void *ptr = &lstat]])],
-need_bsd2=no, need_bsd2=yes)
-AC_MSG_RESULT($need_bsd2)
-if test $need_bsd1 = yes -o $need_bsd2 = yes; then
-	CFLAGS="$CFLAGS -D_BSD_SOURCE"
-fi
-
-AC_TYPE_MODE_T
-AC_CHECK_HEADERS(fcntl.h malloc.h unistd.h io.h)
-AC_FUNC_MMAP
-
-AC_CHECK_FUNCS(chown)
-
-SAVE_CFLAGS=$CFLAGS
-SAVE_LIBS=$LIBS
-CFLAGS="$CFLAGS $LIBGSF_CFLAGS"
-LIBS="$LIBGSF_LIBS $LIBS"
-AC_MSG_CHECKING([for g_chmod])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gstdio.h>]], [[(void)g_chmod("/xxx",0777);]])],
-               [AC_DEFINE(HAVE_G_CHMOD, 1, [Define if g_chmod is available as macro or function])
-		AC_MSG_RESULT(yes)],
-	       [AC_MSG_RESULT(no)])
-AC_MSG_CHECKING([for g_access])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gstdio.h>]], [[(void)g_access("/xxx",0777);]])],
-               [AC_DEFINE(HAVE_G_ACCESS, 1, [Define if g_access is available as macro or function])
-		AC_MSG_RESULT(yes)],
-	       [AC_MSG_RESULT(no)])
-CFLAGS=$SAVE_CFLAGS
-LIBS=$SAVE_LIBS
-
-AC_MSG_CHECKING([whether macro S_ISREG is available])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[#include <sys/types.h>
-#include <sys/stat.h>]],
-[[S_ISREG(S_IFMT);]])],
-	[macro_s_isreg=yes],
-	[AH_TEMPLATE([S_ISREG], [Define S_ISREG if stat.h doesn't])
-	 AC_DEFINE([S_ISREG(m)], [(((m) & S_IFMT) == S_IFREG)])
-	 macro_s_isreg=no])
-AC_MSG_RESULT($macro_s_isreg)
-
-AC_MSG_CHECKING([for native Win32])
-case $host in
-  *-*-mingw*)
-    native_win32=yes
-    ;;
-  *)
-    native_win32=no
-    ;;
-esac
-AC_MSG_RESULT([$native_win32])
-AM_CONDITIONAL(OS_WIN32, test "$native_win32" = yes)
-
-AC_MSG_CHECKING([for Win32 platform in general])
-case $host in
-  *-*-mingw*|*-*-cygwin*)
-    platform_win32=yes
-    ;;
-  *)
-    platform_win32=no
-    ;;
-esac
-AC_MSG_RESULT($platform_win32)
-AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = yes)
-
-##################################################
-# Checks for gtk-doc and docbook-tools
-##################################################
-# gtk_doc_installed=true
-#ifdef([GTK_DOC_CHECK],[GTK_DOC_CHECK([1.0])],[gtk_doc_installed=false])
-# I would have liked to conditionalize this, but 
-# that appears to break other things http://bugzilla.gnome.org/show_bug.cgi?id=156399
-# dnl GTK_DOC_CHECK([1.0])
-# dnl AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed)
-
-dnl ***********************************************************************************
-# Check for zlib.
-_cppflags=$CPPFLAGS
-_ldflags=$LDFLAGS
-
-Z_DIR= Z_LIBS= Z_CPPFLAGS=
-
-AC_ARG_WITH(zlib,
-        [[  --with-zlib=DIR       use libz in DIR]],
-        [case $withval in
-         yes|no) ;;
-         *)     Z_DIR=$withval
-                CPPFLAGS="${CPPFLAGS} -I$withval/include"
-                LDFLAGS="${LDFLAGS} -L$withval/lib"
-                ;;
-         esac])
-
-if test "x$with_zlib" != xno; then
-        with_zlib=no
-        AC_CHECK_HEADER(zlib.h, [AC_CHECK_LIB(z, gzread, [with_zlib=yes])])
-fi
-if test "$with_zlib" = no; then
-        AC_MSG_ERROR([*** zlib is required])
-fi
-if test "x$Z_DIR" != "x"; then
-        Z_CPPFLAGS="-I$Z_DIR/include"
-        case $host in
-        *-*-solaris*)   Z_LIBS="-L$Z_DIR/lib -R$Z_DIR/lib -lz" ;;
-        *)              Z_LIBS="-L$Z_DIR/lib -lz" ;;
-        esac
-else
-        Z_LIBS="-lz"
-fi
-AC_SUBST(Z_CPPFLAGS)
-AC_SUBST(Z_LIBS)
-
-CPPFLAGS=${_cppflags}
-LDFLAGS=${_ldflags}
-
-dnl bz2
-dnl
-BZ2_LIBS=
-test_bz2=true
-AC_ARG_WITH(bz2,
-	[--{with,without}-bz2   Build additional wrappers for BZ2],
-	if test "x$withval" = xno; then
-		test_bz2=false
-	fi
-)
-
-with_bz2=false
-if test "x$test_bz2" = xtrue ; then
-   AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, 
-		bz2_ok=yes,
-		bz2_ok=no
-		AC_MSG_WARN(*** BZ2 support disabled (BZ2 library not found) ***))
-
-   if test "$bz2_ok" = yes; then
-      AC_MSG_CHECKING([for bzlib.h])
-      AC_PREPROC_IFELSE(
-	[AC_LANG_SOURCE(
-	[[#include <stdio.h>
-	#undef PACKAGE
-	#undef VERSION
-	#undef HAVE_STDLIB_H
-	#include <bzlib.h>]])],
-        bz2_ok=yes,
-        bz2_ok=no)
-      AC_MSG_RESULT($bz2_ok)
-   fi
-
-   if test "$bz2_ok" = yes; then
-	AC_DEFINE(HAVE_BZ2, 1, [Is bzip2 available and enabled])
-	BZ2_LIBS="-lbz2"
-   else
-	AC_MSG_WARN(*** BZ2 support disabled (BZ2 header not found) ***)
-   fi
-else
-   AC_MSG_WARN([BZ2 support disabled, as requested (Use --with-bz2 to enable)])
-fi
-
-AC_SUBST(BZ2_LIBS)
-
-dnl ***********************************************************************************
-
-dnl gnome
-dnl
-want_gnome=auto
-AC_ARG_WITH(gnome,
-	[--{with,without}-gnome   Build additional wrappers for GNOME-VFS and BONOBO],
-	[case $withval in
-	yes) want_gnome=yes;;
-	no) want_gnome=no;;
-	esac[]dnl
-])
-have_gnome=no
-if  test $want_gnome = no ; then 
-    AC_MSG_WARN([GNOME support disabled, as requested (Use --with-gnome to enable)])
-else
-    PKG_CHECK_MODULES(LIBGSF_GNOME, $libgsf_gnome_reqs,
-	[have_gnome=yes],
-	[if test $want_gnome = yes; then
-	    AC_MSG_ERROR([GNOME support requested, but not available.])
-	 else
-	    AC_MSG_WARN([GNOME support disabled, unable to find required version of VFS and/or Bonobo])
-	 fi])
-fi
-AM_CONDITIONAL(WITH_LIBGSF_GNOME, test $have_gnome = yes)
-
-##  # GConf configuration
-##  dnl Don't publish the GCONFTOOL variable, AM_GCONF_SOURCE_2 has ``gconftool-2'' hardwired.
-##  GCONFTOOL=
-##  AC_CHECK_PROG([GCONFTOOL], [gconftool-2], [gconftool-2], [no])
-##  if test "x$GCONFTOOL" = "xno"; then
-##      AC_MSG_WARN([thumbnailer will not be built, unable to find gconftool-2])
-##  else
-##      AM_GCONF_SOURCE_2
-##  fi
-##  AM_CONDITIONAL(WITH_GCONF, test "x$GCONFTOOL" != "xno")
-
-dnl # LDFLAGS="-no-undefined $LDFLAGS"
-
-# turn off unneeded python support
-AM_CONDITIONAL(WITH_PYTHON, false)
-
-else
-
-AM_CONDITIONAL(OS_WIN32, false)
-AM_CONDITIONAL(PLATFORM_WIN32, false)
-# dnl AM_CONDITIONAL(GTK_DOC_INSTALLED, false)
-# dnl  AM_CONDITIONAL(ENABLE_GTK_DOC, false)
-# dnl  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, false)
-AM_CONDITIONAL(WITH_LIBGSF_GNOME, false)
-# dnl AM_CONDITIONAL(WITH_GCONF, false)
-AM_CONDITIONAL(WITH_PYTHON, false)
-
-fi
-# -libgsf-1.12.3
-
-# +goffice-0.0.4
-if test "x$HAVE_GOFFICE" != xyes; then
-
-AC_MSG_NOTICE('internal goffice configuration...')
-
-m4_define([goffice_version_epoch], [0])
-m4_define([goffice_version_major], [0])
-m4_define([goffice_version_minor], [4])
-m4_define([goffice_version_extra], [])
-m4_define([goffice_full_version],
-    [goffice_version_epoch.goffice_version_major.goffice_version_minor[]goffice_version_extra])
-
-AC_CONFIG_SRCDIR(lib/goffice-0.0.4/goffice/goffice.h)
-
-AC_SUBST(GOFFICE_LIB_VERSION,
-m4_eval(goffice_version_epoch + goffice_version_major)[]dnl
-:goffice_version_minor:goffice_version_major)
-
-dnl This one is created by autoheader, ...
-AC_CONFIG_HEADERS(goffice-config.h)
-
-dnl ... and this one is a small subset, maintained manually,
-dnl which will be installed.
-AC_CONFIG_HEADERS(goffice-features.h)
-dnl
-dnl Make sure these two won't clash.  Put the following to goffice-config.h:
-AH_BOTTOM([/* Don't include goffice-features.h, it's a subset of goffice-config.h. */
-#define GOFFICE_FEATURES_H])
-
-dnl We use $host_os:
-dnl AC_CANONICAL_HOST
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_PROG_YACC
-AM_PROG_LEX
-AC_PROG_LN_S
-AM_PROG_LIBTOOL
-AC_STDC_HEADERS
-AC_SYS_LARGEFILE
-
-dnl Propagate Gnome-specific variable ACLOCAL_FLAGS to Makefile.
-AC_SUBST(ACLOCAL_AMFLAGS, $ACLOCAL_FLAGS)
-
-dnl The first call to PKG_CHECK_MODULES is inside an `if.'
-dnl We have to call PKG_PROG_PKG_CONFIG explicitly; otherwise it would
-dnl get expanded just before the first occurence of PKG_CHECK_MODULES
-dnl and might escape execution.
-dnl PKG_PROG_PKG_CONFIG
-
-dnl *****************************
-#	libgsf-1		>= 1.12.2
-goffice_reqs="
-	glib-2.0		>= 2.4.7
-	gobject-2.0		>= 2.4.7
-	gmodule-2.0		>= 2.4.7
-	libxml-2.0		>= 2.4.12
-	pango			>= 1.6.0
-	pangoft2		>= 1.6.0
-"
-goffice_gtk_reqs="
-	gtk+-2.0		>= 2.4.13
-	libglade-2.0		>= 2.3.6
-	libgnomeprint-2.2	>= 2.8.0
-	libart-2.0		>= 2.3.11
-"
-goffice_gnome_reqs="
-	gconf-2.0
-	libgnomeui-2.0		>= 2.0.0
-	libgsf-gnome-1		>= 1.12.2
-"
-dnl Should we use cairo ? no
-goffice_with_cairo=false
-cairo_msg="Disabled"
-
-dnl *******************
-dnl Should we use gtk ?
-dnl *******************
-goffice_with_gtk=true
-AC_ARG_WITH(gtk, [  --without-gtk           Build without UI])
-if test "x$with_gtk" = xno; then
-	ui_msg="None (Gtk disabled by request)"
-	goffice_with_gtk=false
-else
-	dnl We shouldn't silently default to --without-gtk.
-	dnl If the requirements are not met, fail.
-	ui_msg="Gtk"
-	PKG_CHECK_MODULES(GTK, [$goffice_gtk_reqs])
-fi 
-
-goffice_with_gnome=$goffice_with_gtk
-if test "x$goffice_with_gtk" = "xtrue" ; then
-	AC_DEFINE(WITH_GTK, 1, [Define if UI is built])
-	goffice_reqs="$goffice_reqs $goffice_gtk_reqs"
-
-	dnl ************************************
-	dnl Are the GNOME extensions available ?
-	dnl ************************************
-
-	goffice_with_gnome=true
-	AC_ARG_WITH(gnome,
-		[  --{with,without}-gnome  Use GNOME extensions],
-		[if test "x$withval" = xno; then
-			goffice_with_gnome=false
-			ui_msg="Gtk+ (Gnome disabled by request)"
-		fi]
-	)
-	if test "x$goffice_with_gnome" = "xtrue"; then
-		PKG_CHECK_MODULES(GNOME, [$goffice_gnome_reqs],
-			[ui_msg="Gnome"],
-			[ui_msg="Gtk (missing gnome dependencies)" ; goffice_with_gnome=false])
-	fi
-
-	if test "x$goffice_with_gnome" = "xtrue"; then
-		AC_DEFINE(WITH_GNOME, 1, [Define if GNOME extensions are available])
-		goffice_reqs="$goffice_reqs $goffice_gnome_reqs"
-	fi
-fi
-AM_CONDITIONAL(WITH_CAIRO, $goffice_with_cairo)
-AM_CONDITIONAL(WITH_GTK,   $goffice_with_gtk)
-AM_CONDITIONAL(WITH_GNOME, $goffice_with_gnome)
-
-dnl ****************************
-dnl now that we have selected out libraries the whole collection in one
-dnl shot so that we can have a nice neat compile/link line
-dnl ****************************
-
-PKG_CHECK_MODULES(GOFFICE_DEPS, $goffice_reqs)
-
-dnl  Checks for Xft/XRender
-AC_CHECK_LIB(Xrender, XRenderFindFormat, 
-	[AC_SUBST(RENDER_LIBS, "-lXrender -lXext")
-	 AC_DEFINE(HAVE_RENDER, 1, [Define if libXrender is available.])],
-	[AC_SUBST(RENDER_LIBS, "")],
-	[-lXext])
-
-dnl *****************************
-AC_MSG_CHECKING([for Win32 platform])
-with_win32=no
-case $host_os in
-  mingw* | pw32* | cygwin*)
-    with_win32=yes
-    GOFFICE_PLUGIN_LDFLAGS="-Wl,--enable-runtime-pseudo-relo,--export-all-symbols $GOFFICE_PLUGIN_LDFLAGS"
-    AC_ARG_VAR(WINDRES, [The windres executable (used by win32 builds only).])
-    AC_CHECK_TOOL(WINDRES, windres, :)
-    ;;
-esac
-AC_MSG_RESULT($with_win32)
-AM_CONDITIONAL(WITH_WIN32, test $with_win32 = yes)
-
-dnl *****************************
-dnl FIXME: perhaps declare with AC_ARG_VAR?
-dnl	   If we use the initial value of a variable, we have to make it precious.
-dnl
-GOFFICE_PLUGIN_LDFLAGS="-avoid-version -no-undefined $GOFFICE_PLUGIN_LDFLAGS"
-GOFFICE_PLUGIN_LIBADD="\$(top_builddir)/lib/goffice-0.0.4/goffice/libgoffice-1.la $GOFFICE_DEPS_LIBS $GOFFICE_PLUGIN_LIBADD"
-AC_SUBST(GOFFICE_PLUGIN_LDFLAGS)
-AC_SUBST(GOFFICE_PLUGIN_LIBADD)
-
-dnl disable for in stable release, re-enable for development series
-# FIXME - we should enable these, but maybe not right now...  -jsled
-# CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
-# CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED"
-# if test "x$goffice_with_gtk" = "xtrue"; then
-# 	CFLAGS="$CFLAGS -DGDK_PIXBUF_DISABLE_DEPRECATED"
-# 	CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED"
-# 	CFLAGS="$CFLAGS -DGDK_MULTIHEAD_SAFE"
-# 	CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
-# 	CFLAGS="$CFLAGS -DLIBGLADE_DISABLE_DEPRECATED"
-# fi
-# if test "x$goffice_with_gnome" = "xtrue"; then
-# 	CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED"
-# 	CFLAGS="$CFLAGS -DBONOBO_DISABLE_DEPRECATED"
-# 	CFLAGS="$CFLAGS -DBONOBO_UI_DISABLE_DEPRECATED"
-# fi
-
-dnl ****************************
-dnl prep the pixmap generator
-dnl ****************************
-
-AC_ARG_VAR(GLIB_GENMARSHAL, [The glib-genmarshal executable.])
-AC_CHECK_PROG(GLIB_GENMARSHAL, glib-genmarshal, glib-genmarshal)
-
-AC_ARG_VAR(GDK_PIXBUF_CSOURCE, [The gdk-pixbuf-csource executable.])
-AC_CHECK_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, gdk-pixbuf-csource)
-
-## this should come after `AC_PROG_CC'
-#ifdef([GNOME_COMPILE_WARNINGS],
-#	[GNOME_COMPILE_WARNINGS] CFLAGS="$CFLAGS $WARN_CFLAGS",
-#	[]
-#)
-#set_more_warnings=yes
-#if test "$GCC" = "yes" -a "x$set_more_warnings" != "xno"; then
-#	for option in -Wsign-compare -Wpointer-arith -Wnested-externs -Wchar-subscripts -Wwrite-strings -Wdeclaration-after-statement -Wmissing-noreturn -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-format-attribute; do
-#		SAVE_CFLAGS="$CFLAGS"
-#		CFLAGS="$CFLAGS $option"
-#		AC_MSG_CHECKING([whether gcc understands $option])
-#		AC_TRY_COMPILE([], [],
-#			has_option=yes,
-#			has_option=no,)
-#		if test $has_option = no; then
-#		  CFLAGS="$SAVE_CFLAGS"
-#		fi
-#		AC_MSG_RESULT($has_option)
-#		unset has_option
-#		unset SAVE_CFLAGS
-#	done
-#	unset option
-#fi
-#AC_SUBST(WARN_CFLAGS)
-
-AC_CHECK_FUNC(gettimeofday,
-	[AC_DEFINE(HAVE_GETTIMEOFDAY, 1,
-		[Define if the gettimeofday function is available]
-	)])
-
-dnl M_PI
-AC_MSG_CHECKING([whether M_PI is available])
-AC_TRY_COMPILE([#include <math.h>], [double f = M_PI], works_without_bsd_source=yes, works_without_bsd_source=no)
-AC_MSG_RESULT($works_without_bsd_source)
-
-if test $works_without_bsd_source = no ; then
-	CFLAGS="$CFLAGS -D_BSD_SOURCE"
-	AC_MSG_CHECKING([whether M_PI is available with -D_BSD_SOURCE])
-	AC_TRY_COMPILE([#include <math.h>], [double f = M_PI], m_pi_works=yes, m_pi_works=no)
-	AC_MSG_RESULT($m_pi_works)
-	if test $m_pi_works = no ; then
-		AC_MSG_ERROR([M_PI is not available])
-	fi
-fi
-
-dnl
-dnl On Solaris finite() needs ieeefp.h
-dnl Either of these seem to signal IEEE754 math, see mathfunc.c
-dnl
-AC_CHECK_HEADERS(ieeefp.h ieee754.h)
-
-dnl Check for some functions
-AC_CHECK_FUNCS(random drand48 finite memmove mkdtemp uname times sysconf)
-
-dnl FIXME: Does this really belong here?
-AC_CHECK_FUNC(bind_textdomain_codeset,,[AC_CHECK_LIB(intl,bind_textdomain_codeset)])
-
-dnl isfinite is a macro on HPUX
-AC_TRY_COMPILE([#include <math.h>], [int a = isfinite(0.0)],
-	[AC_DEFINE(HAVE_ISFINITE, 1,
-		[Define if the isfinite() macro is available]
-	 )
-	], [])
-
-dnl
-dnl On BSD, we seem to need -lm for finite
-dnl
-if test $ac_cv_func_finite = no; then
-  AC_CHECK_LIB(m, finite,
-        [AC_DEFINE(HAVE_FINITE, 1,
-		[Define if the finite function is available]
-	 )
-         LIBS="$LIBS -lm"])
-fi
-
-dnl check for complete locale implementation
-AC_CHECK_HEADERS(langinfo.h)
-
-dnl Handle systems that have stuff in -lm.
-AC_CHECK_FUNCS(log)
-if test $ac_cv_func_log = no; then
-  AC_CHECK_LIB(m, log,
-        [AC_DEFINE(HAVE_LOG, 1,
-		[Define if the log function is available]
-	 )
-         LIBS="$LIBS -lm"])
-fi
-
-AC_DEFUN([GOFFICE_CHECK_FUNC],
-[AC_CHECK_FUNC([$1],
-	[],
-	[AC_DEFINE([GOFFICE_SUPPLIED_]AS_TR_CPP([$1]),
-		1,
-		[Define if G Office supplies $1.])])dnl
-])
-GOFFICE_CHECK_FUNC(log1p)
-GOFFICE_CHECK_FUNC(expm1)
-GOFFICE_CHECK_FUNC(asinh)
-GOFFICE_CHECK_FUNC(acosh)
-GOFFICE_CHECK_FUNC(atanh)
-
-float_msg=no
-EXTRA_LIBS= EXTRA_INCLUDES=
-AC_C_LONG_DOUBLE
-if test $ac_cv_c_long_double = yes; then
-    have_mandatory_funcs=yes
-    need_sunmath=0
-    sunmathlinkstuff='-L/opt/SUNWspro/lib -R/opt/SUNWspro/lib -lsunmath'
-    for ldfunc in fabsl logl log10l ceill floorl powl isnanl finitel; do
-	    AC_CHECK_FUNC($ldfunc,
-		  ,
-		  [AC_CHECK_LIB(m,
-		      $ldfunc,
-		      ,
-		      [AC_CHECK_LIB(sunmath,
-			  $ldfunc,
-			  [ if test $need_sunmath = 0; then
-				# FIXME: better idea?
-				LDFLAGS="$LDFLAGS $sunmathlinkstuff"
-				sunmathinclude=`ls -d /opt/SUNWspro/*/include/cc | sed '$!d'`
-				CPPFLAGS="$CPPFLAGS -I$sunmathinclude"
-			    fi
-			    need_sunmath=1 ],
-			  [have_mandatory_funcs=no],
-			  [-L/opt/SUNWspro/lib $GOFFICE_DEPS_LIBS])])])
-    done
-    if test $need_sunmath = 1; then
-	EXTRA_LIBS="$EXTRA_LIBS $sunmathlinkstuff"
-	EXTRA_INCLUDES="$EXTRA_INCLUDES -I$sunmathinclude"
-	AC_CHECK_HEADERS([sunmath.h floatingpoint.h],
-			 ,
-			 [AC_MSG_WARN([Long doubles require the $ac_header header.])
-			  have_mandatory_funcs=no])
-    fi
-    unset need_sunmath
-    unset sunmathlinkstuff
-    unset sunmathinclude
-
-    GOFFICE_CHECK_FUNC(modfl)
-    GOFFICE_CHECK_FUNC(ldexpl)
-    GOFFICE_CHECK_FUNC(frexpl)
-
-    AC_CHECK_FUNCS(strtold)
-    if test "$ac_cv_func_strtold" = yes; then
-	AC_MSG_CHECKING([if we must prototype strtold ourselves])
-	AC_TRY_RUN([#include <stdlib.h>
-		int main ()
-		{
-			const char *s = "+3.1415e+0";
-			char *theend;
-			long double res = strtold (s, &theend);
-			return !(*theend == 0 && finitel (res) &&
-				 res >= 3.14 && res <= 3.15);
-		}],
-		[AC_MSG_RESULT(no)],
-		[AC_MSG_RESULT(yes)
-		 AC_DEFINE([GOFFICE_SUPPLIED_STRTOLD], 1,
-			   [Define if G Office supplies strtold.])
-		],
-		[AC_MSG_RESULT(assuming not)])
-    else 
-	AC_DEFINE([GOFFICE_SUPPLIED_STRTOLD], 1,
-		  [Define if G Office supplies strtold.])
-	AC_CHECK_FUNCS(string_to_decimal decimal_to_quadruple)
-	if test "x$ac_cv_func_string_to_decimal" != "xyes" || \
-	   test "x$ac_cv_func_decimal_to_quadruple" != "xyes" || \
-	   test "x$ac_cv_header_floatingpoint_h" != "xyes"; then
-		AC_MSG_WARN([You lack the strtold function -- precision will be impaired])
-	fi
-    fi
-    if test "$have_mandatory_funcs" = yes; then
-	float_msg=yes
-	AC_DEFINE([GOFFICE_WITH_LONG_DOUBLE], 1,
-		  [Define if G Office supports long double.])
-    else
-	AC_MSG_WARN([Long double support disabled because of library problems])
-    fi
-    unset have_mandatory_funcs
-fi
-AC_SUBST(EXTRA_LIBS)
-AC_SUBST(EXTRA_INCLUDES)
-
-dnl ******************
-dnl * Config defaults
-dnl ******************
-dnl
-dnl These are changed in goffice.c for WIN32 packages
-AC_SUBST(goffice_datadir, '${datadir}/gnucash/goffice/${GOFFICE_VERSION}')
-AC_SUBST(goffice_libdir, '${libdir}/gnucash/goffice/${GOFFICE_VERSION}')
-AC_SUBST(goffice_icondir, '${datadir}/gnucash/pixmaps/goffice')
-AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale')
-dnl
-AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins')
-AC_SUBST(goffice_gladedir, '${goffice_datadir}/glade')
-
-dnl Export to goffice-config.h and goffice-features.h
-AC_DEFINE(GOFFICE_VERSION, "goffice_full_version",
-	[The version number of this release, possibly with additional suffix])
-AC_DEFINE(GO_VERSION_EPOCH, goffice_version_epoch,
-	[The Epoch of this release])
-AC_DEFINE(GO_VERSION_MAJOR, goffice_version_major,
-	[The Major version number of this release])
-AC_DEFINE(GO_VERSION_MINOR, goffice_version_minor,
-	[The Minor version number of this release])
-AC_DEFINE(GO_VERSION_EXTRA, "goffice_version_extra",
-	[Extra, possibly empty tag for this release])
-
-else
-
-AM_CONDITIONAL(WITH_CAIRO, false)
-AM_CONDITIONAL(WITH_GTK,   false)
-AM_CONDITIONAL(WITH_GNOME, false)
-AM_CONDITIONAL(WITH_WIN32, false)
-
-fi
-# -goffice-0.0.4
-
-# -gog2
-
-### --------------------------------------------------------------------------
 ### Variables
 ### Set up all the initial variable values...
 GNC_CONFIGDIR='${sysconfdir}/gnucash'
@@ -1733,8 +932,8 @@
 
 
 ### --------------------------------------------------------------------------
-### GNOME gui components -- built by default, but not if --enable-gui=no
-### or --disable-gui is passed to autogen 
+### Whether or not to build the GTK GUI components.
+### When disabled, we don't even need to check for them!
 ### --------------------------------------------------------------------------
 
 AC_ARG_ENABLE(gui, 
@@ -1748,6 +947,11 @@
 
 AM_CONDITIONAL(GNUCASH_ENABLE_GUI, test x${gnc_build_gui} = xtrue)
 
+### --------------------------------------------------------------------------
+### GNOME gui components -- built by default, but not if --enable-gui=no
+### or --disable-gui is passed to autogen 
+### --------------------------------------------------------------------------
+
 if test x${gnc_build_gui} = xtrue ;
 then
     if test x${enable_compile_warnings} = x ;
@@ -1856,6 +1060,757 @@
   fi
 fi
 
+### ------------------------------------------------------------------------
+### GOG/goffice, gsf, etc...
+### Only test this if we're building the GUI
+if test x${gnc_build_gui} = xtrue ;
+then
+  AC_MSG_CHECKING(for GTK - version >= 2.6.0)
+  if $PKG_CONFIG 'gtk+-2.0 >= 2.6.0'
+  then
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(HAVE_GTK26,1,[System has gtk 2.6.0 or better])
+    HAVE_GTK26=yes
+  else
+    AC_MSG_RESULT(no)
+  fi
+  AM_CONDITIONAL(HAVE_GTK26, test "x$HAVE_GTK26" = "xyes" )
+  
+  
+  AC_MSG_CHECKING(for pango version >= 1.8.0)
+  if $PKG_CONFIG 'pango >= 1.8.0'
+  then
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(HAVE_PANGO18,1,[System has pango 1.8.0 or better])
+    HAVE_PANGO18=yes
+  else
+    AC_MSG_RESULT(no)
+  fi
+  AM_CONDITIONAL(HAVE_PANGO18, test "x$HAVE_PANGO18" = "xyes" )
+  
+  
+  dnl @@fixme 
+  dnl use both PKG_CHECK_MODULES and `$PKG_CONFIG`; the first importantly sets
+  dnl MUMBLE_{LIBS,CFLAGS}...
+  dnl Q: What does PKG_CHECK_MODULES create?
+  dnl A: Just _CFLAGS and _LIBS, apparently [pkg.m4]
+  
+  AC_MSG_CHECKING([for libgsf >= 1.12.2])
+  if $PKG_CONFIG --silence-errors 'libgsf-1 >= 1.12.2'
+  then
+    AC_MSG_RESULT(found)
+    PKG_CHECK_MODULES(GSF, libgsf-1 >= 1.12.2 libgsf-gnome-1 >= 1.12.2,,)
+    AC_DEFINE(HAVE_LIBGSF,1,[System has libgsf-1.12.2 or better])
+    HAVE_LIBGSF=yes
+  else
+    AC_MSG_RESULT(not found.  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'
+    HAVE_LIBGSF=no
+  fi
+  AM_CONDITIONAL(HAVE_LIBGSF, test "x$HAVE_LIBGSF" = "xyes")
+  AC_SUBST(GSF_CFLAGS)
+  AC_SUBST(GSF_LIBS)
+  
+  dnl $4=true => don't die if failure.
+  PKG_CHECK_MODULES(GOFFICE, libgoffice-1 >= 0.0.4,,true)
+  if $PKG_CONFIG --silence-errors 'libgoffice-1 >= 0.0.4'
+  then
+    AC_DEFINE(HAVE_GOFFICE,1,[System has goffice-0.0.4 or better])
+    HAVE_GOFFICE=yes
+  else
+    AC_MSG_RESULT(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'
+    HAVE_GOFFICE=no
+  fi
+  AM_CONDITIONAL(HAVE_GOFFICE, test "x$HAVE_GOFFICE" = "xyes")
+  AC_SUBST(GOFFICE_CFLAGS)
+  AC_SUBST(GOFFICE_LIBS)
+  
+  ### ------------------------------------------------------------------------
+  ### Checks when building internal LIBGSF
+  ### +libgsf-1.12.3
+  if test "x$HAVE_LIBGSF" != xyes; then
+  AC_MSG_NOTICE('internal libgsf configuration...')
+  
+  m4_define([libgsf_version_major], [1])
+  m4_define([libgsf_version_minor], [12])
+  m4_define([libgsf_version_micro], [3])
+  m4_define([libgsf_version_extra], [])
+  m4_define([libgsf_full_version],
+      [libgsf_version_major.libgsf_version_minor.libgsf_version_micro[]libgsf_version_extra])
+  
+  dnl AC_CONFIG_SRCDIR(lib/libgsf-1.12.3/gsf/gsf.h)
+  
+  AC_SUBST(LIBGSF_MAJOR_VERSION, libgsf_version_major)
+  AC_SUBST(LIBGSF_MINOR_VERSION, libgsf_version_minor)
+  AC_SUBST(LIBGSF_MICRO_VERSION, libgsf_version_micro)
+  
+  dnl Version info for libraries = CURRENT:REVISION:AGE
+  AC_SUBST(VERSION_INFO,
+  m4_eval(libgsf_version_major + libgsf_version_minor)[]dnl
+:libgsf_version_micro:libgsf_version_minor)
+  dnl NOTE: Above line needs no leading whitespace!  --warlord
+  
+  dnl 2005-11-19,jsled, this doesn't seem to work... :(
+  dnl ifelse(x$HAVE_LIBGSF, xyes,,
+    AC_CONFIG_HEADERS(gsf-config.h)
+  dnl)
+  
+  AC_FUNC_FSEEKO
+  AC_SYS_LARGEFILE
+  
+  dnl Checks for libraries.
+  ifelse([
+    If we defined the module lists on the M4 level, we could have problems
+    with PKG_CHECK_MODULES from pkgconfig 0.16.0, which double quotes its
+    second argument (the module list).
+    As a handy workaround, we use shell variables.
+  ])
+  dnl Modules common to libgsf and libgsf-gnome
+  libgsf_reqs="
+      gobject-2.0 >= 2.4.0
+      glib-2.0 >= 2.4.0
+      libxml-2.0 >= 2.4.16
+  "
+  dnl Modules required for libgsf-gnome
+  libgsf_gnome_reqs="
+      $libgsf_reqs
+      libbonobo-2.0 >= 2.0.0
+      gnome-vfs-2.0 >= 2.2.0
+      gnome-vfs-module-2.0 >= 2.2.0
+  "
+  PKG_CHECK_MODULES(LIBGSF, $libgsf_reqs)
+  
+  AC_CHECK_DECL(fdopen, fdopen_works=yes, fdopen_works=no)
+  if test $fdopen_works = no ; then
+  	unset ac_cv_have_decl_fdopen
+  	CFLAGS="$CFLAGS -D_POSIX_SOURCE"
+  	AC_MSG_NOTICE([adding -D_POSIX_SOURCE to CFLAGS])
+  	AC_CHECK_DECL(fdopen, fdopen_works=yes, fdopen_works=no)
+  	if test $fdopen_works = no ; then
+  		AC_MSG_ERROR([fdopen is not available])
+  	fi
+  fi
+  
+  # Unfortunately, -D_POSIX_SOURCE turns off struct timeval on Solaris
+  AC_MSG_CHECKING([whether struct timeval is available])
+  for try in 1 2; do
+  	AC_COMPILE_IFELSE(
+  		[AC_LANG_PROGRAM(
+  			[[#include <sys/time.h>]],
+  			[[struct timeval tv;]])],
+  		struct_timeval_works=yes,
+  		struct_timeval_works=no)
+  	test $struct_timeval_works = yes && break
+  	# Try this for the second attempt:
+  	test $try = 1 && CFLAGS="$CFLAGS -D__EXTENSIONS__"
+  done
+  AC_MSG_RESULT($struct_timeval_works)
+  if test $struct_timeval_works = no ; then
+  	AC_MSG_ERROR([struct timeval is not available])
+  fi
+  
+  AC_MSG_CHECKING([whether -D_BSD_SOURCE is needed for caddr_t])
+  AC_COMPILE_IFELSE(
+  	[AC_LANG_PROGRAM([[#include <sys/types.h>]], [[caddr_t ca]])],
+  	need_bsd1=no,
+  	need_bsd1=yes)
+  AC_MSG_RESULT($need_bsd1)
+  
+  AC_MSG_CHECKING([whether -D_BSD_SOURCE is needed for lstat])
+  AC_LINK_IFELSE([AC_LANG_PROGRAM(
+  [[#include <sys/types.h>
+  #include <sys/stat.h>
+  #include <unistd.h>]],
+  [[void *ptr = &lstat]])],
+  need_bsd2=no, need_bsd2=yes)
+  AC_MSG_RESULT($need_bsd2)
+  if test $need_bsd1 = yes -o $need_bsd2 = yes; then
+  	CFLAGS="$CFLAGS -D_BSD_SOURCE"
+  fi
+  
+  AC_TYPE_MODE_T
+  AC_CHECK_HEADERS(fcntl.h malloc.h unistd.h io.h)
+  AC_FUNC_MMAP
+  
+  AC_CHECK_FUNCS(chown)
+  
+  SAVE_CFLAGS=$CFLAGS
+  SAVE_LIBS=$LIBS
+  CFLAGS="$CFLAGS $LIBGSF_CFLAGS"
+  LIBS="$LIBGSF_LIBS $LIBS"
+  AC_MSG_CHECKING([for g_chmod])
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gstdio.h>]], [[(void)g_chmod("/xxx",0777);]])],
+                 [AC_DEFINE(HAVE_G_CHMOD, 1, [Define if g_chmod is available as macro or function])
+  		AC_MSG_RESULT(yes)],
+  	       [AC_MSG_RESULT(no)])
+  AC_MSG_CHECKING([for g_access])
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gstdio.h>]], [[(void)g_access("/xxx",0777);]])],
+                 [AC_DEFINE(HAVE_G_ACCESS, 1, [Define if g_access is available as macro or function])
+  		AC_MSG_RESULT(yes)],
+  	       [AC_MSG_RESULT(no)])
+  CFLAGS=$SAVE_CFLAGS
+  LIBS=$SAVE_LIBS
+  
+  AC_MSG_CHECKING([whether macro S_ISREG is available])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+  [[#include <sys/types.h>
+  #include <sys/stat.h>]],
+  [[S_ISREG(S_IFMT);]])],
+  	[macro_s_isreg=yes],
+  	[AH_TEMPLATE([S_ISREG], [Define S_ISREG if stat.h doesn't])
+  	 AC_DEFINE([S_ISREG(m)], [(((m) & S_IFMT) == S_IFREG)])
+  	 macro_s_isreg=no])
+  AC_MSG_RESULT($macro_s_isreg)
+  
+  AC_MSG_CHECKING([for native Win32])
+  case $host in
+    *-*-mingw*)
+      native_win32=yes
+      ;;
+    *)
+      native_win32=no
+      ;;
+  esac
+  AC_MSG_RESULT([$native_win32])
+  AM_CONDITIONAL(OS_WIN32, test "$native_win32" = yes)
+  
+  AC_MSG_CHECKING([for Win32 platform in general])
+  case $host in
+    *-*-mingw*|*-*-cygwin*)
+      platform_win32=yes
+      ;;
+    *)
+      platform_win32=no
+      ;;
+  esac
+  AC_MSG_RESULT($platform_win32)
+  AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = yes)
+  
+  ##################################################
+  # Checks for gtk-doc and docbook-tools
+  ##################################################
+  # gtk_doc_installed=true
+  #ifdef([GTK_DOC_CHECK],[GTK_DOC_CHECK([1.0])],[gtk_doc_installed=false])
+  # I would have liked to conditionalize this, but 
+  # that appears to break other things http://bugzilla.gnome.org/show_bug.cgi?id=156399
+  # dnl GTK_DOC_CHECK([1.0])
+  # dnl AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed)
+  
+  dnl ************************************************************************
+  # Check for zlib.
+  _cppflags=$CPPFLAGS
+  _ldflags=$LDFLAGS
+  
+  Z_DIR= Z_LIBS= Z_CPPFLAGS=
+  
+  AC_ARG_WITH(zlib,
+          [[  --with-zlib=DIR       use libz in DIR]],
+          [case $withval in
+           yes|no) ;;
+           *)     Z_DIR=$withval
+                  CPPFLAGS="${CPPFLAGS} -I$withval/include"
+                  LDFLAGS="${LDFLAGS} -L$withval/lib"
+                  ;;
+           esac])
+  
+  if test "x$with_zlib" != xno; then
+          with_zlib=no
+          AC_CHECK_HEADER(zlib.h, [AC_CHECK_LIB(z, gzread, [with_zlib=yes])])
+  fi
+  if test "$with_zlib" = no; then
+          AC_MSG_ERROR([*** zlib is required])
+  fi
+  if test "x$Z_DIR" != "x"; then
+          Z_CPPFLAGS="-I$Z_DIR/include"
+          case $host in
+          *-*-solaris*)   Z_LIBS="-L$Z_DIR/lib -R$Z_DIR/lib -lz" ;;
+          *)              Z_LIBS="-L$Z_DIR/lib -lz" ;;
+          esac
+  else
+          Z_LIBS="-lz"
+  fi
+  AC_SUBST(Z_CPPFLAGS)
+  AC_SUBST(Z_LIBS)
+  
+  CPPFLAGS=${_cppflags}
+  LDFLAGS=${_ldflags}
+  
+  dnl bz2
+  dnl
+  BZ2_LIBS=
+  test_bz2=true
+  AC_ARG_WITH(bz2,
+  	[--{with,without}-bz2   Build additional wrappers for BZ2],
+  	if test "x$withval" = xno; then
+  		test_bz2=false
+  	fi
+  )
+  
+  with_bz2=false
+  if test "x$test_bz2" = xtrue ; then
+     AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, 
+  		bz2_ok=yes,
+  		bz2_ok=no
+  		AC_MSG_WARN(*** BZ2 support disabled (BZ2 library not found) ***))
+  
+     if test "$bz2_ok" = yes; then
+        AC_MSG_CHECKING([for bzlib.h])
+        AC_PREPROC_IFELSE(
+  	[AC_LANG_SOURCE(
+  	[[#include <stdio.h>
+  	#undef PACKAGE
+  	#undef VERSION
+  	#undef HAVE_STDLIB_H
+  	#include <bzlib.h>]])],
+          bz2_ok=yes,
+          bz2_ok=no)
+        AC_MSG_RESULT($bz2_ok)
+     fi
+  
+     if test "$bz2_ok" = yes; then
+  	AC_DEFINE(HAVE_BZ2, 1, [Is bzip2 available and enabled])
+  	BZ2_LIBS="-lbz2"
+     else
+  	AC_MSG_WARN(*** BZ2 support disabled (BZ2 header not found) ***)
+     fi
+  else
+     AC_MSG_WARN([BZ2 support disabled, as requested (Use --with-bz2 to enable)])
+  fi
+  
+  AC_SUBST(BZ2_LIBS)
+  
+  dnl *************************************************************************
+  
+  dnl gnome
+  dnl
+  want_gnome=auto
+  AC_ARG_WITH(gnome,
+  	[--{with,without}-gnome   Build additional wrappers for GNOME-VFS and BONOBO],
+  	[case $withval in
+  	yes) want_gnome=yes;;
+  	no) want_gnome=no;;
+  	esac[]dnl
+  ])
+  have_gnome=no
+  if  test $want_gnome = no ; then 
+      AC_MSG_WARN([GNOME support disabled, as requested (Use --with-gnome to enable)])
+  else
+      PKG_CHECK_MODULES(LIBGSF_GNOME, $libgsf_gnome_reqs,
+  	[have_gnome=yes],
+  	[if test $want_gnome = yes; then
+  	    AC_MSG_ERROR([GNOME support requested, but not available.])
+  	 else
+  	    AC_MSG_WARN([GNOME support disabled, unable to find required version of VFS and/or Bonobo])
+  	 fi])
+  fi
+  AM_CONDITIONAL(WITH_LIBGSF_GNOME, test $have_gnome = yes)
+  
+  dnl # LDFLAGS="-no-undefined $LDFLAGS"
+  
+  # turn off unneeded python support
+  AM_CONDITIONAL(WITH_PYTHON, false)
+  
+  else
+  
+  AM_CONDITIONAL(OS_WIN32, false)
+  AM_CONDITIONAL(PLATFORM_WIN32, false)
+  # dnl AM_CONDITIONAL(GTK_DOC_INSTALLED, false)
+  # dnl  AM_CONDITIONAL(ENABLE_GTK_DOC, false)
+  # dnl  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, false)
+  AM_CONDITIONAL(WITH_LIBGSF_GNOME, false)
+  # dnl AM_CONDITIONAL(WITH_GCONF, false)
+  AM_CONDITIONAL(WITH_PYTHON, false)
+  
+  fi
+  
+  ### -libgsf-1.12.3
+  ### 
+  ### ------------------------------------------------------------------------
+  ### Checks when building internal goffice
+  ### +goffice-0.0.4
+  
+  if test "x$HAVE_GOFFICE" != xyes; then
+  
+  AC_MSG_NOTICE('internal goffice configuration...')
+  
+  m4_define([goffice_version_epoch], [0])
+  m4_define([goffice_version_major], [0])
+  m4_define([goffice_version_minor], [4])
+  m4_define([goffice_version_extra], [])
+  m4_define([goffice_full_version],
+      [goffice_version_epoch.goffice_version_major.goffice_version_minor[]goffice_version_extra])
+  
+  AC_CONFIG_SRCDIR(lib/goffice-0.0.4/goffice/goffice.h)
+  
+  AC_SUBST(GOFFICE_LIB_VERSION,
+  m4_eval(goffice_version_epoch + goffice_version_major)[]dnl
+:goffice_version_minor:goffice_version_major)
+  dnl NOTE: Above line needs no leading whitespace!  --warlord
+  
+  dnl This one is created by autoheader, ...
+  AC_CONFIG_HEADERS(goffice-config.h)
+  
+  dnl ... and this one is a small subset, maintained manually,
+  dnl which will be installed.
+  AC_CONFIG_HEADERS(goffice-features.h)
+  dnl
+  dnl Make sure these two won't clash.  Put the following to goffice-config.h:
+  AH_BOTTOM([/* Don't include goffice-features.h, it's a subset of goffice-config.h. */
+  #define GOFFICE_FEATURES_H])
+  
+  dnl We use $host_os:
+  dnl AC_CANONICAL_HOST
+  
+  AC_ISC_POSIX
+  AC_PROG_YACC
+  AM_PROG_LEX
+  AC_PROG_LN_S
+  AM_PROG_LIBTOOL
+  AC_STDC_HEADERS
+  AC_SYS_LARGEFILE
+  
+  dnl Propagate Gnome-specific variable ACLOCAL_FLAGS to Makefile.
+  AC_SUBST(ACLOCAL_AMFLAGS, $ACLOCAL_FLAGS)
+  
+  dnl The first call to PKG_CHECK_MODULES is inside an `if.'
+  dnl We have to call PKG_PROG_PKG_CONFIG explicitly; otherwise it would
+  dnl get expanded just before the first occurence of PKG_CHECK_MODULES
+  dnl and might escape execution.
+  dnl PKG_PROG_PKG_CONFIG
+  
+  dnl *****************************
+  #	libgsf-1		>= 1.12.2
+  goffice_reqs="
+  	glib-2.0		>= 2.4.7
+  	gobject-2.0		>= 2.4.7
+  	gmodule-2.0		>= 2.4.7
+  	libxml-2.0		>= 2.4.12
+  	pango			>= 1.6.0
+  	pangoft2		>= 1.6.0
+  "
+  goffice_gtk_reqs="
+  	gtk+-2.0		>= 2.4.13
+  	libglade-2.0		>= 2.3.6
+  	libgnomeprint-2.2	>= 2.8.0
+  	libart-2.0		>= 2.3.11
+  "
+  goffice_gnome_reqs="
+  	gconf-2.0
+  	libgnomeui-2.0		>= 2.0.0
+  	libgsf-gnome-1		>= 1.12.2
+  "
+  dnl Should we use cairo ? no
+  goffice_with_cairo=false
+  cairo_msg="Disabled"
+  
+  dnl *******************
+  dnl Should we use gtk ?
+  dnl *******************
+  goffice_with_gtk=true
+  AC_ARG_WITH(gtk, [  --without-gtk           Build without UI])
+  if test "x$with_gtk" = xno; then
+  	ui_msg="None (Gtk disabled by request)"
+  	goffice_with_gtk=false
+  else
+  	dnl We shouldn't silently default to --without-gtk.
+  	dnl If the requirements are not met, fail.
+  	ui_msg="Gtk"
+  	PKG_CHECK_MODULES(GTK, [$goffice_gtk_reqs])
+  fi 
+  
+  goffice_with_gnome=$goffice_with_gtk
+  if test "x$goffice_with_gtk" = "xtrue" ; then
+  	AC_DEFINE(WITH_GTK, 1, [Define if UI is built])
+  	goffice_reqs="$goffice_reqs $goffice_gtk_reqs"
+  
+  	dnl ************************************
+  	dnl Are the GNOME extensions available ?
+  	dnl ************************************
+  
+  	goffice_with_gnome=true
+  	AC_ARG_WITH(gnome,
+  		[  --{with,without}-gnome  Use GNOME extensions],
+  		[if test "x$withval" = xno; then
+  			goffice_with_gnome=false
+  			ui_msg="Gtk+ (Gnome disabled by request)"
+  		fi]
+  	)
+  	if test "x$goffice_with_gnome" = "xtrue"; then
+  		PKG_CHECK_MODULES(GOFFICE_GNOME, [$goffice_gnome_reqs],
+  			[ui_msg="Gnome"],
+  			[ui_msg="Gtk (missing gnome dependencies)" ; goffice_with_gnome=false])
+  	fi
+  
+  	if test "x$goffice_with_gnome" = "xtrue"; then
+  		AC_DEFINE(WITH_GNOME, 1, [Define if GNOME extensions are available])
+  		goffice_reqs="$goffice_reqs $goffice_gnome_reqs"
+  	fi
+  fi
+  AM_CONDITIONAL(WITH_CAIRO, $goffice_with_cairo)
+  AM_CONDITIONAL(WITH_GTK,   $goffice_with_gtk)
+  AM_CONDITIONAL(WITH_GNOME, $goffice_with_gnome)
+  
+  dnl ****************************
+  dnl now that we have selected out libraries the whole collection in one
+  dnl shot so that we can have a nice neat compile/link line
+  dnl ****************************
+  
+  PKG_CHECK_MODULES(GOFFICE_DEPS, $goffice_reqs)
+  
+  dnl  Checks for Xft/XRender
+  AC_CHECK_LIB(Xrender, XRenderFindFormat, 
+  	[AC_SUBST(RENDER_LIBS, "-lXrender -lXext")
+  	 AC_DEFINE(HAVE_RENDER, 1, [Define if libXrender is available.])],
+  	[AC_SUBST(RENDER_LIBS, "")],
+  	[-lXext])
+  
+  dnl *****************************
+  AC_MSG_CHECKING([for Win32 platform])
+  with_win32=no
+  case $host_os in
+    mingw* | pw32* | cygwin*)
+      with_win32=yes
+      GOFFICE_PLUGIN_LDFLAGS="-Wl,--enable-runtime-pseudo-relo,--export-all-symbols $GOFFICE_PLUGIN_LDFLAGS"
+      AC_ARG_VAR(WINDRES, [The windres executable (used by win32 builds only).])
+      AC_CHECK_TOOL(WINDRES, windres, :)
+      ;;
+  esac
+  AC_MSG_RESULT($with_win32)
+  AM_CONDITIONAL(WITH_WIN32, test $with_win32 = yes)
+  
+  dnl *****************************
+  dnl FIXME: perhaps declare with AC_ARG_VAR?
+  dnl	   If we use the initial value of a variable, we have to make it precious.
+  dnl
+  GOFFICE_PLUGIN_LDFLAGS="-avoid-version -no-undefined $GOFFICE_PLUGIN_LDFLAGS"
+  GOFFICE_PLUGIN_LIBADD="\$(top_builddir)/lib/goffice-0.0.4/goffice/libgoffice-1.la $GOFFICE_DEPS_LIBS $GOFFICE_PLUGIN_LIBADD"
+  AC_SUBST(GOFFICE_PLUGIN_LDFLAGS)
+  AC_SUBST(GOFFICE_PLUGIN_LIBADD)
+  
+  dnl ****************************
+  dnl prep the pixmap generator
+  dnl ****************************
+  
+  AC_ARG_VAR(GLIB_GENMARSHAL, [The glib-genmarshal executable.])
+  AC_CHECK_PROG(GLIB_GENMARSHAL, glib-genmarshal, glib-genmarshal)
+  
+  AC_ARG_VAR(GDK_PIXBUF_CSOURCE, [The gdk-pixbuf-csource executable.])
+  AC_CHECK_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, gdk-pixbuf-csource)
+  
+  AC_CHECK_FUNC(gettimeofday,
+  	[AC_DEFINE(HAVE_GETTIMEOFDAY, 1,
+  		[Define if the gettimeofday function is available]
+  	)])
+  
+  dnl M_PI
+  AC_MSG_CHECKING([whether M_PI is available])
+  AC_TRY_COMPILE([#include <math.h>], [double f = M_PI], works_without_bsd_source=yes, works_without_bsd_source=no)
+  AC_MSG_RESULT($works_without_bsd_source)
+  
+  if test $works_without_bsd_source = no ; then
+  	CFLAGS="$CFLAGS -D_BSD_SOURCE"
+  	AC_MSG_CHECKING([whether M_PI is available with -D_BSD_SOURCE])
+  	AC_TRY_COMPILE([#include <math.h>], [double f = M_PI], m_pi_works=yes, m_pi_works=no)
+  	AC_MSG_RESULT($m_pi_works)
+  	if test $m_pi_works = no ; then
+  		AC_MSG_ERROR([M_PI is not available])
+  	fi
+  fi
+  
+  dnl
+  dnl On Solaris finite() needs ieeefp.h
+  dnl Either of these seem to signal IEEE754 math, see mathfunc.c
+  dnl
+  AC_CHECK_HEADERS(ieeefp.h ieee754.h)
+  
+  dnl Check for some functions
+  AC_CHECK_FUNCS(random drand48 finite memmove mkdtemp uname times sysconf)
+  
+  dnl FIXME: Does this really belong here?
+  AC_CHECK_FUNC(bind_textdomain_codeset,,[AC_CHECK_LIB(intl,bind_textdomain_codeset)])
+  
+  dnl isfinite is a macro on HPUX
+  AC_TRY_COMPILE([#include <math.h>], [int a = isfinite(0.0)],
+  	[AC_DEFINE(HAVE_ISFINITE, 1,
+  		[Define if the isfinite() macro is available]
+  	 )
+  	], [])
+  
+  dnl
+  dnl On BSD, we seem to need -lm for finite
+  dnl
+  if test $ac_cv_func_finite = no; then
+    AC_CHECK_LIB(m, finite,
+          [AC_DEFINE(HAVE_FINITE, 1,
+  		[Define if the finite function is available]
+  	 )
+           LIBS="$LIBS -lm"])
+  fi
+  
+  dnl check for complete locale implementation
+  AC_CHECK_HEADERS(langinfo.h)
+  
+  dnl Handle systems that have stuff in -lm.
+  AC_CHECK_FUNCS(log)
+  if test $ac_cv_func_log = no; then
+    AC_CHECK_LIB(m, log,
+          [AC_DEFINE(HAVE_LOG, 1,
+  		[Define if the log function is available]
+  	 )
+           LIBS="$LIBS -lm"])
+  fi
+  
+  AC_DEFUN([GOFFICE_CHECK_FUNC],
+  [AC_CHECK_FUNC([$1],
+  	[],
+  	[AC_DEFINE([GOFFICE_SUPPLIED_]AS_TR_CPP([$1]),
+  		1,
+  		[Define if G Office supplies $1.])])dnl
+  ])
+  GOFFICE_CHECK_FUNC(log1p)
+  GOFFICE_CHECK_FUNC(expm1)
+  GOFFICE_CHECK_FUNC(asinh)
+  GOFFICE_CHECK_FUNC(acosh)
+  GOFFICE_CHECK_FUNC(atanh)
+  
+  float_msg=no
+  EXTRA_LIBS= EXTRA_INCLUDES=
+  AC_C_LONG_DOUBLE
+  if test $ac_cv_c_long_double = yes; then
+      have_mandatory_funcs=yes
+      need_sunmath=0
+      sunmathlinkstuff='-L/opt/SUNWspro/lib -R/opt/SUNWspro/lib -lsunmath'
+      for ldfunc in fabsl logl log10l ceill floorl powl isnanl finitel; do
+  	    AC_CHECK_FUNC($ldfunc,
+  		  ,
+  		  [AC_CHECK_LIB(m,
+  		      $ldfunc,
+  		      ,
+  		      [AC_CHECK_LIB(sunmath,
+  			  $ldfunc,
+  			  [ if test $need_sunmath = 0; then
+  				# FIXME: better idea?
+  				LDFLAGS="$LDFLAGS $sunmathlinkstuff"
+  				sunmathinclude=`ls -d /opt/SUNWspro/*/include/cc | sed '$!d'`
+  				CPPFLAGS="$CPPFLAGS -I$sunmathinclude"
+  			    fi
+  			    need_sunmath=1 ],
+  			  [have_mandatory_funcs=no],
+  			  [-L/opt/SUNWspro/lib $GOFFICE_DEPS_LIBS])])])
+      done
+      if test $need_sunmath = 1; then
+  	EXTRA_LIBS="$EXTRA_LIBS $sunmathlinkstuff"
+  	EXTRA_INCLUDES="$EXTRA_INCLUDES -I$sunmathinclude"
+  	AC_CHECK_HEADERS([sunmath.h floatingpoint.h],
+  			 ,
+  			 [AC_MSG_WARN([Long doubles require the $ac_header header.])
+  			  have_mandatory_funcs=no])
+      fi
+      unset need_sunmath
+      unset sunmathlinkstuff
+      unset sunmathinclude
+  
+      GOFFICE_CHECK_FUNC(modfl)
+      GOFFICE_CHECK_FUNC(ldexpl)
+      GOFFICE_CHECK_FUNC(frexpl)
+  
+      AC_CHECK_FUNCS(strtold)
+      if test "$ac_cv_func_strtold" = yes; then
+  	AC_MSG_CHECKING([if we must prototype strtold ourselves])
+  	AC_TRY_RUN([#include <stdlib.h>
+  		int main ()
+  		{
+  			const char *s = "+3.1415e+0";
+  			char *theend;
+  			long double res = strtold (s, &theend);
+  			return !(*theend == 0 && finitel (res) &&
+  				 res >= 3.14 && res <= 3.15);
+  		}],
+  		[AC_MSG_RESULT(no)],
+  		[AC_MSG_RESULT(yes)
+  		 AC_DEFINE([GOFFICE_SUPPLIED_STRTOLD], 1,
+  			   [Define if G Office supplies strtold.])
+  		],
+  		[AC_MSG_RESULT(assuming not)])
+      else 
+  	AC_DEFINE([GOFFICE_SUPPLIED_STRTOLD], 1,
+  		  [Define if G Office supplies strtold.])
+  	AC_CHECK_FUNCS(string_to_decimal decimal_to_quadruple)
+  	if test "x$ac_cv_func_string_to_decimal" != "xyes" || \
+  	   test "x$ac_cv_func_decimal_to_quadruple" != "xyes" || \
+  	   test "x$ac_cv_header_floatingpoint_h" != "xyes"; then
+  		AC_MSG_WARN([You lack the strtold function -- precision will be impaired])
+  	fi
+      fi
+      if test "$have_mandatory_funcs" = yes; then
+  	float_msg=yes
+  	AC_DEFINE([GOFFICE_WITH_LONG_DOUBLE], 1,
+  		  [Define if G Office supports long double.])
+      else
+  	AC_MSG_WARN([Long double support disabled because of library problems])
+      fi
+      unset have_mandatory_funcs
+  fi
+  AC_SUBST(EXTRA_LIBS)
+  AC_SUBST(EXTRA_INCLUDES)
+  
+  dnl ******************
+  dnl * Config defaults
+  dnl ******************
+  dnl
+  dnl These are changed in goffice.c for WIN32 packages
+  AC_SUBST(goffice_datadir, '${datadir}/gnucash/goffice/${GOFFICE_VERSION}')
+  AC_SUBST(goffice_libdir, '${libdir}/gnucash/goffice/${GOFFICE_VERSION}')
+  AC_SUBST(goffice_icondir, '${datadir}/gnucash/pixmaps/goffice')
+  AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale')
+  dnl
+  AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins')
+  AC_SUBST(goffice_gladedir, '${goffice_datadir}/glade')
+  
+  dnl Export to goffice-config.h and goffice-features.h
+  AC_DEFINE(GOFFICE_VERSION, "goffice_full_version",
+  	[The version number of this release, possibly with additional suffix])
+  AC_DEFINE(GO_VERSION_EPOCH, goffice_version_epoch,
+  	[The Epoch of this release])
+  AC_DEFINE(GO_VERSION_MAJOR, goffice_version_major,
+  	[The Major version number of this release])
+  AC_DEFINE(GO_VERSION_MINOR, goffice_version_minor,
+  	[The Minor version number of this release])
+  AC_DEFINE(GO_VERSION_EXTRA, "goffice_version_extra",
+  	[Extra, possibly empty tag for this release])
+  
+  else
+  
+  AM_CONDITIONAL(WITH_CAIRO, false)
+  AM_CONDITIONAL(WITH_GTK,   false)
+  AM_CONDITIONAL(WITH_GNOME, false)
+  AM_CONDITIONAL(WITH_WIN32, false)
+  
+  fi
+
+  ### -goffice-0.0.4
+  ### ------------------------------------------------------------------------
+else
+  ### A bunch of am conditionals that need to be set
+  AM_CONDITIONAL(HAVE_GTK26, false )
+  AM_CONDITIONAL(HAVE_PANGO18, false )
+  AM_CONDITIONAL(HAVE_LIBGSF, false)
+  AM_CONDITIONAL(HAVE_GOFFICE, false)
+  AM_CONDITIONAL(OS_WIN32, false)
+  AM_CONDITIONAL(PLATFORM_WIN32, false)
+  AM_CONDITIONAL(WITH_LIBGSF_GNOME, false)
+  AM_CONDITIONAL(WITH_PYTHON, false)
+
+  AM_CONDITIONAL(WITH_CAIRO, false)
+  AM_CONDITIONAL(WITH_GTK,   false)
+  AM_CONDITIONAL(WITH_GNOME, false)
+  AM_CONDITIONAL(WITH_WIN32, false)
+fi
+### End of gui-only checks
+
 ###-------------------------------------------------------------------------
 ### Selectively disable deprecated bits of glib/gdk/gtk/gnome
 ###-------------------------------------------------------------------------
@@ -2253,6 +2208,9 @@
 )
 AC_OUTPUT
 
+output_qof_prefix=`eval eval eval echo $QOF_PREFIX`
+output_qof_lib_dir=`eval eval eval echo $QOF_LIB_DIR`
+output_qof_xml_dir=`eval eval eval echo $QOF_XML_DIR`
 AC_MSG_RESULT([
   Options detected/selected
   -------------------------
@@ -2262,12 +2220,13 @@
   CPPFLAGS ............. : $CPPFLAGS
   CFLAGS ............... : $CFLAGS
   LDFLAGS .............. : $LDFLAGS
+  prefix.................: ${prefix}
   Native libgsf..........: $HAVE_LIBGSF
   Native goffice.........: $HAVE_GOFFICE
   QOF support ...........: $QOF_VERSION
-  QOF location ..........: $QOF_PREFIX
-  QOF library dir .......: $QOF_LIB_DIR
-  QOF backend config ....: $QOF_XML_DIR
+  QOF location ..........: $output_qof_prefix
+  QOF library dir .......: $output_qof_lib_dir
+  QOF backend config ....: $output_qof_xml_dir
 
 
 ])



More information about the gnucash-changes mailing list