Create gd.h from gd.h.in to properly include current library version

master
Ondřej Surý 2013-06-26 17:09:02 +02:00
parent 9f0a7e7f4f
commit f47a1df550
2 changed files with 9 additions and 6 deletions

View File

@ -7,7 +7,7 @@ AC_PREREQ(2.54)
m4_define([gd_MAJOR],[2])dnl
m4_define([gd_MINOR],[1])dnl
m4_define([gd_REVISION],[0])dnl
dnl m4_define([gd_EXTRA],[rc2])
m4_define([gd_EXTRA],[])dnl
m4_ifdef([gd_EXTRA],
[m4_define([gd_PKG_VERSION],[gd_MAJOR.gd_MINOR.gd_REVISION-gd_EXTRA])],
@ -25,10 +25,12 @@ GDLIB_MAJOR=gd_MAJOR
GDLIB_MINOR=gd_MINOR
GDLIB_REVISION=gd_REVISION
GDLIB_EXTRA=gd_EXTRA
GDLIB_VERSION=gd_PKG_VERSION
AC_SUBST(GDLIB_MAJOR)
AC_SUBST(GDLIB_MINOR)
AC_SUBST(GDLIB_REVISION)
AC_SUBST(GDLIB_EXTRA)
AC_SUBST(GDLIB_VERSION)
# Dynamic library version information
# See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
@ -455,6 +457,7 @@ AC_MSG_RESULT([
AC_CONFIG_FILES([Makefile
src/Makefile
src/gd.h
tests/Makefile
tests/test_config.h
config/Makefile

View File

@ -5,11 +5,11 @@ extern "C" {
#ifndef GD_H
#define GD_H 1
#define GD_MAJOR_VERSION 2
#define GD_MINOR_VERSION 1
#define GD_RELEASE_VERSION 0
#define GD_EXTRA_VERSION "alpha"
#define GD_VERSION_STRING "2.1.0-alpha"
#define GD_MAJOR_VERSION @GDLIB_MAJOR@
#define GD_MINOR_VERSION @GDLIB_MINOR@
#define GD_RELEASE_VERSION @GDLIB_REVISION@
#define GD_EXTRA_VERSION @GDLIB_EXTRA@
#define GD_VERSION_STRING @GDLIB_VERSION@
/* Do the DLL dance: dllexport when building the DLL,
dllimport when importing from it, nothing when