diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | VERSION | 1 | ||||
| -rw-r--r-- | common/configure.ac | 3 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | server/configure.ac | 5 | ||||
| -rw-r--r-- | sss_client/configure.ac | 3 | ||||
| -rw-r--r-- | version.m4 | 12 |
7 files changed, 23 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index dd70034b..8801d08c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,6 @@ RPMBUILD ?= $(PWD)/rpmbuild builddir ?= . dist_noinst_DATA = \ - VERSION \ m4 \ contrib/sssd.spec.in \ BUILD.txt \ diff --git a/VERSION b/VERSION deleted file mode 100644 index 1f61f612..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.0.99 diff --git a/common/configure.ac b/common/configure.ac index d069708c..1df6c227 100644 --- a/common/configure.ac +++ b/common/configure.ac @@ -1,5 +1,6 @@ +m4_include([../version.m4]) AC_INIT([sssd_libs], - m4_esyscmd([cat ../VERSION |head -n1 | tr -d '\n']), + VERSION_NUMBER, [sssd-devel@lists.fedorahosted.org]) AC_CONFIG_SRCDIR([README]) AC_CONFIG_AUX_DIR([build]) diff --git a/configure.ac b/configure.ac index b1e7d85e..d0785ad7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ +m4_include([version.m4]) AC_INIT([sssd], - m4_esyscmd([cat VERSION |head -n1 | tr -d '\n']), + VERSION_NUMBER, [sssd-devel@lists.fedorahosted.org]) AC_CONFIG_SRCDIR([BUILD.txt]) AC_CONFIG_AUX_DIR([build]) @@ -9,15 +10,8 @@ AC_PROG_INSTALL AC_CONFIG_SUBDIRS([replace common server sss_client]) -# If the VERSION file has a second line, we'll append it -# to the release tag when creating an RPM or SRPM -# This is intended for build systems to create snapshot -# RPMs. The format should be something like: -# .20090915gitf1bcde7 -# and would result in an SRPM looking like: -# sssd-0.5.0-0.20090915gitf1bcde7.fc11.src.rpm AC_SUBST([PRERELEASE_VERSION], - m4_esyscmd([cat VERSION |tail --lines=+2 |head -n1 | tr -d '\n'])) + PRERELEASE_VERSION_NUMBER) AC_CONFIG_FILES([Makefile contrib/sssd.spec]) AC_OUTPUT diff --git a/server/configure.ac b/server/configure.ac index 4f560239..75c07dab 100644 --- a/server/configure.ac +++ b/server/configure.ac @@ -11,9 +11,12 @@ AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""]) AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""]) AC_DEFUN([SMB_EXT_LIB], [echo -n ""]) AC_DEFUN([SMB_ENABLE], [echo -n ""]) + +m4_include([../version.m4]) AC_INIT([sss_daemon], - m4_esyscmd([cat ../VERSION |head -n1 | tr -d '\n']), + VERSION_NUMBER, [sssd-devel@lists.fedorahosted.org]) + CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" AC_CONFIG_SRCDIR([conf_macros.m4]) diff --git a/sss_client/configure.ac b/sss_client/configure.ac index ab670723..c32bb6fd 100644 --- a/sss_client/configure.ac +++ b/sss_client/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ(2.50) +m4_include([../version.m4]) AC_INIT([sss_client], - m4_esyscmd([cat ../VERSION |head -n1 | tr -d '\n']), + VERSION_NUMBER, [sssd-devel@lists.fedorahosted.org]) AC_CONFIG_SRCDIR([common.c]) AC_CONFIG_HEADER(config.h) diff --git a/version.m4 b/version.m4 new file mode 100644 index 00000000..a78a611c --- /dev/null +++ b/version.m4 @@ -0,0 +1,12 @@ +# Primary version number +m4_define([VERSION_NUMBER], [1.0.99]) + +# If the PRERELEASE_VERSION_NUMBER is set, we'll append +# it to the release tag when creating an RPM or SRPM +# This is intended for build systems to create snapshot +# RPMs. The format should be something like: +# .20090915gitf1bcde7 +# and would result in an SRPM looking like: +# sssd-0.5.0-0.20090915gitf1bcde7.fc11.src.rpm +m4_define([PRERELEASE_VERSION_NUMBER], []) + |