[cairo-commit] build/configure.ac.version src/cairoint.h

[Behdad Esfahbod]

 build/configure.ac.version |    7 +++++++
 src/cairoint.h             |    7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 567be443a2add00b4ea9b888ee35aeac5b41dc16
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Sep 18 16:27:02 2008 -0400

    [configure.ac] Make sure version information do not end up in config.h
    
    By introducing $(top_srcdir)/cairo-version.h I tried to make it
    unnecessary to rebuild the entire library when the version changes.
    That comes handy around releases and when bisecting.
    
    However this was not working as the version info was also ending
    up in config.h and hence forcing a full rebuild upon change.
    I now undefine the PACKAGE_VERSION* macros that autoconf defines,
    so config.h does not change when cairo-version.h changes.

diff --git a/build/configure.ac.version b/build/configure.ac.version
index 7d5dc09..31ba7f4 100644
--- a/build/configure.ac.version
+++ b/build/configure.ac.version
@@ -41,3 +41,10 @@ AC_SUBST(CAIRO_VERSION_SONUM)
 AC_SUBST(CAIRO_RELEASE_STATUS)
 AC_SUBST(CAIRO_LIBTOOL_VERSION_INFO)
 
+dnl Disable autoconf's version macros.  We try hard to not rebuild the entire
+dnl library just because version changed.  The PACKAGE_VERSION* stuff in
+dnl config.h is negating all the effort.
+AC_DEFINE(PACKAGE_VERSION,	[USE_cairo_version_OR_cairo_version_string_INSTEAD])
+AC_DEFINE(PACKAGE_STRING,	[USE_cairo_version_OR_cairo_version_string_INSTEAD])
+AC_DEFINE(PACKAGE_NAME,		[USE_cairo_INSTEAD])
+AC_DEFINE(PACKAGE_TARNAME,	[USE_cairo_INSTEAD])
diff --git a/src/cairoint.h b/src/cairoint.h
index da57c3e..94d8904 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -50,13 +50,6 @@
 #include "config.h"
 #endif
 
-/* We use our own macros */
-#undef PACKAGE
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>