r14933 - gnucash/branches/2.0 - Unconditionally call AC_CONFIG_HEADERS for libgsf and goffice config

[Andreas Köhler]

Author: andi5
Date: 2006-10-06 12:17:07 -0400 (Fri, 06 Oct 2006)
New Revision: 14933
Trac: http://svn.gnucash.org/trac/changeset/14933

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/configure.in
Log:
Unconditionally call AC_CONFIG_HEADERS for libgsf and goffice config
header files. This way automake and config.status agree upon the list of
these files. Otherwise, in rare cases, make distclean might not remove a
file stamp-h5, making distcheck fail.

approved by warlord.
merged from r14932.



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:692
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13376
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13376
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/configure.in
===================================================================
--- gnucash/branches/2.0/configure.in	2006-10-06 16:02:37 UTC (rev 14932)
+++ gnucash/branches/2.0/configure.in	2006-10-06 16:17:07 UTC (rev 14933)
@@ -24,6 +24,10 @@
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(src/engine/Transaction.h)
 
+AC_CONFIG_HEADERS(gsf-config.h)
+AC_CONFIG_HEADERS(goffice-config.h)
+AC_CONFIG_HEADERS(goffice-features.h)
+
 # Initialize automake -- make sure we have at least version 1.9
 AM_INIT_AUTOMAKE(1.9)
 
@@ -1270,11 +1274,6 @@
 :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
   
@@ -1564,13 +1563,6 @@
   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. */