Put version information into the configure script. Reported by Paul

Watson <pwatson@redlinepy.com>.

* builds/unix/configure.ac: Renamed to...
* builds/unix/configure.raw: This which now serves (with appropriate
modifications) as a template for configure.ac.

* version.sed: New script.

* autogen.sh: Generate configure.ac from configure.raw, using
FREETYPE_MAJOR, FREETYPE_MINOR, and FREETYPE_PATCH from freetype.h.
This commit is contained in:
Werner Lemberg 2006-05-08 07:10:29 +00:00
parent 1639c79482
commit 4df5b26fdf
5 changed files with 35 additions and 3 deletions

View File

@ -1,3 +1,17 @@
2006-05-07 Werner Lemberg <wl@gnu.org>
Put version information into the configure script. Reported by Paul
Watson <pwatson@redlinepy.com>.
* builds/unix/configure.ac: Renamed to...
* builds/unix/configure.raw: This which now serves (with appropriate
modifications) as a template for configure.ac.
* version.sed: New script.
* autogen.sh: Generate configure.ac from configure.raw, using
FREETYPE_MAJOR, FREETYPE_MINOR, and FREETYPE_PATCH from freetype.h.
2006-05-06 Werner Lemberg <wl@gnu.org>
* include/freetype/freetype.h (FREETYPE_PATCH): Set to 1.

View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright 2005 by
# Copyright 2005, 2006 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@ -20,14 +20,26 @@ run ()
fi
}
if test ! -f ./builds/unix/configure.ac; then
if test ! -f ./builds/unix/configure.raw; then
echo "You must be in the same directory as \`autogen.sh'."
echo "Bootstrapping doesn't work if srcdir != builddir."
exit 1
fi
# This sets freetype_major, freetype_minor, and freetype_patch.
eval `sed -nf version.sed include/freetype/freetype.h`
# We set freetype-patch to an empty value if it is zero.
if test "$freetype_patch" = ".0"; then
freetype_patch=
fi
cd builds/unix
echo "generating \`configure.ac'"
sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
< configure.raw > configure.ac
run aclocal -I . --force
run libtoolize --force --copy
run autoconf --force

View File

@ -6,6 +6,7 @@ config.log
config.status
config.sub
configure
configure.ac
freetype2.pc
freetype-config
ftconfig.h

View File

@ -11,7 +11,7 @@
# indicate that you have read the license and understand and accept it
# fully.
AC_INIT
AC_INIT([FreeType], [@VERSION@], [freetype@nongnu.org], [freetype])
AC_CONFIG_SRCDIR([ftconfig.in])

5
version.sed Normal file
View File

@ -0,0 +1,5 @@
#! /usr/bin/sed -nf
s/^#define *FREETYPE_MAJOR *\([^ ][^ ]*\).*$/freetype_major="\1" ;/p
s/^#define *FREETYPE_MINOR *\([^ ][^ ]*\).*$/freetype_minor=".\1" ;/p
s/^#define *FREETYPE_PATCH *\([^ ][^ ]*\).*$/freetype_patch=".\1" ;/p