mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-05-05 16:58:01 +02:00
Patch from Behdad Esfahbod <behdad@cs.toronto.edu>:
Update to use AC_INIT and AM_INIT_AUTOMAKE in recommended ways. Add support for substituting CAIRO_VERSION_MAJOR/MINOR/MICRO into generated headers. Add CAIRO_VERSION_MAJOR/MINOR/MICRO and CAIRO_VERSION_STRING which are generated by configure.
This commit is contained in:
parent
52ec34a157
commit
82fbb9c381
3 changed files with 39 additions and 9 deletions
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2005-08-10 Carl Worth <cworth@cworth.org>
|
||||
|
||||
Patch from Behdad Esfahbod <behdad@cs.toronto.edu>:
|
||||
|
||||
* configure.in: Update to use AC_INIT and AM_INIT_AUTOMAKE in
|
||||
recommended ways. Add support for substituting
|
||||
CAIRO_VERSION_MAJOR/MINOR/MICRO into generated headers.
|
||||
|
||||
* src/cairo-features.h.in: Add CAIRO_VERSION_MAJOR/MINOR/MICRO and
|
||||
CAIRO_VERSION_STRING which are generated by configure.
|
||||
|
||||
2005-08-10 Carl Worth <cworth@cworth.org>
|
||||
|
||||
* src/cairo-path-data-private.h:
|
||||
|
|
|
|||
31
configure.in
31
configure.in
|
|
@ -1,12 +1,21 @@
|
|||
AC_PREREQ(2.54)
|
||||
|
||||
AC_INIT(src/cairo.h)
|
||||
# cairo package version number, (as distinct from shared library version)
|
||||
# An odd micro number indicates in-progress development, (eg. from CVS)
|
||||
# An even micro number indicates a released version.
|
||||
m4_define(cairo_version_major, 0)
|
||||
m4_define(cairo_version_minor, 9)
|
||||
m4_define(cairo_version_micro, 1)
|
||||
|
||||
AC_INIT([cairo],
|
||||
cairo_version_major.cairo_version_minor.cairo_version_micro,
|
||||
[http://bugs.freedesktop.org/enter_bug.cgi?product=cairo])
|
||||
AC_CONFIG_SRCDIR(src/cairo.h)
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
AM_INIT_AUTOMAKE([1.7])
|
||||
|
||||
dnl ===========================================================================
|
||||
|
||||
# Package version number, (as distinct from shared library version)
|
||||
CAIRO_VERSION=0.9.0-head
|
||||
|
||||
# libtool shared library version
|
||||
|
||||
# Increment if the interface has additions, changes, removals.
|
||||
|
|
@ -21,13 +30,17 @@ LT_REVISION=0
|
|||
# precedence over adding, so set to 0 if both happened.
|
||||
LT_AGE=0
|
||||
|
||||
VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
|
||||
AC_SUBST(VERSION_INFO)
|
||||
|
||||
dnl ===========================================================================
|
||||
|
||||
AM_INIT_AUTOMAKE(cairo, $CAIRO_VERSION)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
|
||||
AC_SUBST(VERSION_INFO)
|
||||
CAIRO_VERSION_MAJOR=cairo_version_major()
|
||||
CAIRO_VERSION_MINOR=cairo_version_minor()
|
||||
CAIRO_VERSION_MICRO=cairo_version_micro()
|
||||
AC_SUBST(CAIRO_VERSION_MAJOR)
|
||||
AC_SUBST(CAIRO_VERSION_MINOR)
|
||||
AC_SUBST(CAIRO_VERSION_MICRO)
|
||||
AC_SUBST(CAIRO_VERSION_OTHER)
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
|
|
|
|||
|
|
@ -45,6 +45,12 @@
|
|||
# define CAIRO_END_DECLS
|
||||
#endif
|
||||
|
||||
#define CAIRO_VERSION_MAJOR @CAIRO_VERSION_MAJOR@
|
||||
#define CAIRO_VERSION_MINOR @CAIRO_VERSION_MINOR@
|
||||
#define CAIRO_VERSION_MICRO @CAIRO_VERSION_MICRO@
|
||||
|
||||
#define CAIRO_VERSION_STRING "@CAIRO_VERSION_MAJOR@.@CAIRO_VERSION_MINOR@.@CAIRO_VERSION_MICRO@"
|
||||
|
||||
@PS_SURFACE_FEATURE@
|
||||
|
||||
@PDF_SURFACE_FEATURE@
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue