merge r3986 (configure release support.

Originally committed to SVN as r4022.
This commit is contained in:
Amar Takhar 2010-01-21 00:29:26 +00:00
parent f43bff1e97
commit 73ab47f8ec

View file

@ -3,10 +3,13 @@ AC_PREREQ(2.57)
######################
# aegisub version info
######################
# MAKE SURE YOU UPDATE THE VERSION INFO BELOW WHEN YOU SET THIS TO '1'
m4_define([aegisub_FINAL_RELEASE], [0])
m4_define([aegisub_version_major], [2])
m4_define([aegisub_version_minor], [2])
m4_define([aegisub_version_revision], [0])
m4_define([aegisub_version], [aegisub_version_major.aegisub_version_minor.aegisub_version_revision-dev])
m4_define([aegisub_version], [aegisub_version_major.aegisub_version_minor.aegisub_version_revision])
m4_define([aegisub_version_data], [aegisub_version_major.aegisub_version_minor])
@ -221,10 +224,19 @@ fi
# This is required in order for the config file to work correctly.
AC_DEFINE_UNQUOTED([BUILD_SVN_REVISION], [$SVN_REVISION], [SVN Revision number, used for config.dat and verison.cpp])
# Used on OSX and Unix for packing building.
PACKAGE_STRING="${PACKAGE_STRING}-r$SVN_REVISION"
PACKAGE_VERSION="${PACKAGE_VERSION}-r$SVN_REVISION"
VERSION="${VERSION}-r$SVN_REVISION"
# Release information.
if test "aegisub_FINAL_RELEASE" = "1"; then
AC_DEFINE([FINAL_RELEASE], [aegisub_FINAL_RELEASE], [This is only set to 1 for a RELEASE VERSION.])
PACKAGE_STRING="${PACKAGE_STRING}"
PACKAGE_VERSION="${PACKAGE_VERSION}"
VERSION="${VERSION}"
else
PACKAGE_STRING="${PACKAGE_STRING}-dev-r$SVN_REVISION"
PACKAGE_VERSION="${PACKAGE_VERSION}-dev-r$SVN_REVISION"
VERSION="${VERSION}-dev-r$SVN_REVISION"
fi
# Used in version.cpp
AC_MSG_CHECKING([for build date])
@ -235,6 +247,8 @@ AC_SUBST(SVN_REVISION)
AC_SUBST(BUILD_DATE)
###################################################
# Check for pthreads and setup variables / compiler
###################################################