New generated public header file pango-features.h. Currently contains the

2006-12-06  Behdad Esfahbod  <behdad@gnome.org>

        * configure.in:
        * pango/Makefile.am:
        New generated public header file pango-features.h.  Currently contains
        the version information.  In the future, can be expanded to define
        which backends have been enabled, etc.

        * pango/pango.def:
        * pango/pango-utils.h:
        * pango/pango-utils.c:
        New public macros and functions: PANGO_VERSION_ENCODE(),
        PANGO_VERSION_MAJOR, PANGO_VERSION_MINOR, PANGO_VERSION_MICRO,
        PANGO_VERSION, PANGO_VERSION_STRING, PANGO_VERSION_CHECK(),
        pango_version(), pango_version_string(), pango_version_check().

        * docs/pango-docs.sgml:
        * docs/pango-sections.txt:
        * docs/tmpl/pango-version.sgml:
        Docs for new symbols, in a new section.

        * examples/renderdemo.c (show_version):
        If run-time Pango lib version is different than the compile-time one,
        show that one too.

        * pango/pango.h:
        #include <pango-utils.h> as well as almost all other public pango-*.h
        headers (though, the other ones were already included indirectly).
        The only public pango-*.h header pango.h shouldn't include are
        pango-ot.h (which is really misnamed) and pango-modules.h (that should
        not be needed by 99.99% users anyway).

        * docs/Makefile.am:
        * docs/check.docs: Test to check that all symbols are documented and
        properly hooked into documentation tree.

        * pango/pango.rc.in:
        * pango/pangoft2.rc.in:
        * pango/pangowin32.rc.in:
        Update, reflecting some internal symbol changes.

        * pango/check.defs: Improve.

1 files changed, 50 insertions, 17 deletions

diff --git a/configure.in b/configure.in
index da9c83ed..709feea3 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ dnl                               Versioning
 dnl ==========================================================================
 
 dnl Making releases:
-dnl   PANGO_MICRO_VERSION += 1;
+dnl   PANGO_VERSION_MICRO += 1;
 dnl   PANGO_INTERFACE_AGE += 1;
 dnl   PANGO_BINARY_AGE += 1;
 dnl if any functions have been added, set PANGO_INTERFACE_AGE to 0.
@@ -20,18 +20,18 @@ dnl of them.
 dnl
 
 dnl The triplet 
-m4_define([pango_major_version], [1])
-m4_define([pango_minor_version], [15])
-m4_define([pango_micro_version], [1])
+m4_define([pango_version_major], [1])
+m4_define([pango_version_minor], [15])
+m4_define([pango_version_micro], [1])
 m4_define([pango_version],
-          [pango_major_version.pango_minor_version.pango_micro_version])
+          [pango_version_major.pango_version_minor.pango_version_micro])
 dnl The X.Y in -lpango-X.Y line. This is expected to stay 1.0 until Pango 2.
 m4_define([pango_api_version], [1.0])
 dnl Number of releases since we've added interfaces
 m4_define([pango_interface_age], [1])
 dnl Number of releases since we've broken binary compatibility.
 m4_define([pango_binary_age],
-          [m4_eval(100 * pango_minor_version + pango_micro_version)])
+          [m4_eval(100 * pango_version_minor + pango_version_micro)])
 dnl Module API version.  This should be stepped up when a change causes
 dnl older modules to not work with new pango.
 m4_define([pango_module_version], [1.6.0])
@@ -46,20 +46,20 @@ AM_INIT_AUTOMAKE(1.7 gnits)
 AM_CONFIG_HEADER([config.h])
 
 
-PANGO_MAJOR_VERSION=pango_major_version()
-PANGO_MINOR_VERSION=pango_minor_version()
-PANGO_MICRO_VERSION=pango_micro_version()
+PANGO_VERSION_MAJOR=pango_version_major()
+PANGO_VERSION_MINOR=pango_version_minor()
+PANGO_VERSION_MICRO=pango_version_micro()
 PANGO_VERSION=pango_version()
 PANGO_API_VERSION=pango_api_version()
 PANGO_INTERFACE_AGE=pango_interface_age()
 PANGO_BINARY_AGE=pango_binary_age()
 PANGO_MODULE_VERSION=pango_module_version()
 
-AC_SUBST(PANGO_MAJOR_VERSION)
-AC_SUBST(PANGO_MINOR_VERSION)
+AC_SUBST(PANGO_VERSION_MAJOR)
+AC_SUBST(PANGO_VERSION_MINOR)
+AC_SUBST(PANGO_VERSION_MICRO)
 AC_SUBST(PANGO_VERSION)
 AC_SUBST(PANGO_API_VERSION)
-AC_SUBST(PANGO_MICRO_VERSION)
 AC_SUBST(PANGO_INTERFACE_AGE)
 AC_SUBST(PANGO_BINARY_AGE)
 AC_SUBST(PANGO_MODULE_VERSION)
@@ -67,12 +67,12 @@ AC_SUBST(PANGO_MODULE_VERSION)
 AC_DEFINE(MODULE_VERSION, "pango_module_version()", [Module interface version])
 AC_DEFINE(PANGO_BINARY_AGE, pango_binary_age(), [PANGO binary age])
 AC_DEFINE(PANGO_INTERFACE_AGE, pango_interface_age(), [PANGO interface age])
-AC_DEFINE(PANGO_MAJOR_VERSION, pango_major_version(), [PANGO major version])
-AC_DEFINE(PANGO_MINOR_VERSION, pango_minor_version(), [PANGO minor version])
-AC_DEFINE(PANGO_MICRO_VERSION, pango_micro_version(), [PANGO micro version])
+AC_DEFINE(PANGO_VERSION_MAJOR, pango_version_major(), [PANGO major version])
+AC_DEFINE(PANGO_VERSION_MINOR, pango_version_minor(), [PANGO minor version])
+AC_DEFINE(PANGO_VERSION_MICRO, pango_version_micro(), [PANGO micro version])
 
 dnl libtool versioning
-m4_define([lt_current], [m4_eval(100 * pango_minor_version + pango_micro_version - pango_interface_age)])
+m4_define([lt_current], [m4_eval(100 * pango_version_minor + pango_version_micro - pango_interface_age)])
 m4_define([lt_revision], [pango_interface_age])
 m4_define([lt_age], [m4_eval(pango_binary_age - pango_interface_age)])
 VERSION_INFO="lt_current():lt_revision():lt_age()"
@@ -158,7 +158,7 @@ changequote([,])dnl
 dnl declare --enable-* args and collect ac_help strings
 
 m4_define([debug_default],
-          m4_if(m4_eval(pango_minor_version() % 2), [1], [yes], [minimum]))
+          m4_if(m4_eval(pango_version_minor() % 2), [1], [yes], [minimum]))
 
 AC_ARG_ENABLE(debug,
               AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
@@ -853,6 +853,39 @@ AC_CHECK_HEADERS(unistd.h)
 
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+dnl ===========================================================================
+AC_CONFIG_COMMANDS([pango/pango-features.h],
+          [featuresfile=pango/pango-features.h
+           outfile=$featuresfile.tmp
+           AC_MSG_NOTICE([creating $featuresfile])
+           cat >$outfile <<_EOF
+/* Generated by configure. Do not edit */
+#ifndef PANGO_FEATURES_H
+#define PANGO_FEATURES_H
+
+#define PANGO_VERSION_MAJOR $PANGO_VERSION_MAJOR
+#define PANGO_VERSION_MINOR $PANGO_VERSION_MINOR
+#define PANGO_VERSION_MICRO $PANGO_VERSION_MICRO
+
+#define PANGO_VERSION_STRING "$PANGO_VERSION_MAJOR.$PANGO_VERSION_MINOR.$PANGO_VERSION_MICRO"
+
+_EOF
+	# TODO: define macros for enabled features/backends here
+
+        echo '' >>$outfile
+        echo '#endif' >>$outfile
+
+        if cmp -s $outfile $featuresfile; then
+          AC_MSG_NOTICE([$featuresfile is unchanged])
+          rm -f $outfile
+        else
+          mv $outfile $featuresfile
+        fi
+],[
+        PANGO_VERSION_MAJOR=$PANGO_VERSION_MAJOR
+        PANGO_VERSION_MINOR=$PANGO_VERSION_MINOR
+        PANGO_VERSION_MICRO=$PANGO_VERSION_MICRO
+])
 
 AC_CONFIG_FILES([
 Makefile