r14932 - gnucash/trunk - Unconditionally call AC_CONFIG_HEADERS for libgsf and goffice config
Andreas Köhler
andi5 at cvs.gnucash.org
Fri Oct 6 12:02:38 EDT 2006
Author: andi5
Date: 2006-10-06 12:02:37 -0400 (Fri, 06 Oct 2006)
New Revision: 14932
Trac: http://svn.gnucash.org/trac/changeset/14932
Modified:
gnucash/trunk/
gnucash/trunk/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.
Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
- 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:681
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13379
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
+ 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:694
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13379
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2006-10-06 11:48:43 UTC (rev 14931)
+++ gnucash/trunk/configure.in 2006-10-06 16:02:37 UTC (rev 14932)
@@ -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)
@@ -1337,11 +1341,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
@@ -1605,13 +1604,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. */
More information about the gnucash-changes
mailing list