[Gnucash-changes] r11939 - gnucash/branches/goffice-update - actually check for the correct external libraries, and correctly HAVE_-check them. :p

[Joshua Sled]

Author: jsled
Date: 2005-11-14 21:36:15 -0500 (Mon, 14 Nov 2005)
New Revision: 11939
Trac: http://svn.gnucash.org/trac/changeset/11939

Modified:
   gnucash/branches/goffice-update/configure.in
Log:
actually check for the correct external libraries, and correctly HAVE_-check them. :p


Modified: gnucash/branches/goffice-update/configure.in
===================================================================
--- gnucash/branches/goffice-update/configure.in	2005-11-15 01:27:51 UTC (rev 11938)
+++ gnucash/branches/goffice-update/configure.in	2005-11-15 02:36:15 UTC (rev 11939)
@@ -472,6 +472,7 @@
 if $PKG_CONFIG 'libgsf-1 >= 1.12.2'
 then
   AC_DEFINE(HAVE_LIBGSF,1,[System has libgsf-1.12.2 or better])
+  HAVE_LIBGSF=yes
 else
   AC_MSG_NOTICE(using internally-packaged libgsf)
   GSF_CFLAGS='-I${top_srcdir}/lib/libgsf-1.12.3'
@@ -482,10 +483,11 @@
 AC_SUBST(GSF_LIBS)
 
 # $4=true => don't die if failure.
-PKG_CHECK_MODULES(GOFFICE, goffice >= 0.0.4,,true)
-if $PKG_CONFIG 'goffice >= 0.0.4'
+PKG_CHECK_MODULES(GOFFICE, libgoffice-1 >= 0.0.4,,true)
+if $PKG_CONFIG 'libgoffice-1 >= 0.0.4'
 then
-  AC_DEFINE(HAVE_LIBGOFFICE,1,[System has goffice-0.0.4 or better])
+  AC_DEFINE(HAVE_GOFFICE,1,[System has goffice-0.0.4 or better])
+  HAVE_GOFFICE=yes
 else
   AC_MSG_NOTICE(using internally-packaged goffice)
   GOFFICE_CFLAGS='-I${top_srcdir}/lib/goffice-0.0.4'
@@ -498,9 +500,8 @@
 ### ----------
 
 ### +libgsf-1.12.3
+AC_MSG_NOTICE('internal libgsf configuration...')
 
-AC_MSG_NOTICE('internal libgsf configuration')
-
 m4_define([libgsf_version_major], [1])
 m4_define([libgsf_version_minor], [12])
 m4_define([libgsf_version_micro], [3])
@@ -508,7 +509,7 @@
 m4_define([libgsf_full_version],
     [libgsf_version_major.libgsf_version_minor.libgsf_version_micro[]libgsf_version_extra])
 
-AC_CONFIG_SRCDIR(lib/libgsf-1.12.3/gsf/gsf.h)
+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)
@@ -812,9 +813,8 @@
 # -libgsf-1.12.3
 
 # +goffice-0.0.4
+AC_MSG_NOTICE('internal goffice configuration...')
 
-AC_MSG_NOTICE('internal goffice configuration')
-
 m4_define([goffice_version_epoch], [0])
 m4_define([goffice_version_major], [0])
 m4_define([goffice_version_minor], [4])
@@ -822,9 +822,6 @@
 m4_define([goffice_full_version],
     [goffice_version_epoch.goffice_version_major.goffice_version_minor[]goffice_version_extra])
 
-#AC_INIT([goffice], [goffice_full_version],
-#	[http://bugzilla.gnome.org/enter_bug.cgi?product=libgoffice])
-
 AC_CONFIG_SRCDIR(lib/goffice-0.0.4/goffice/goffice.h)
 
 AC_SUBST(GOFFICE_LIB_VERSION,
@@ -843,7 +840,7 @@
 #define GOFFICE_FEATURES_H])
 
 dnl We use $host_os:
-#AC_CANONICAL_HOST
+dnl AC_CANONICAL_HOST
 
 AC_ISC_POSIX
 AC_PROG_CC
@@ -2161,6 +2158,8 @@
   CPPFLAGS ............. : $CPPFLAGS
   CFLAGS ............... : $CFLAGS
   LDFLAGS .............. : $LDFLAGS
+  Have libgsf............: $HAVE_LIBGSF
+  Have goffice...........: $HAVE_GOFFICE
   QOF support ...........: $QOF_VERSION
   QOF location ..........: $QOF_PREFIX
   QOF library dir .......: $QOF_LIB_DIR