diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-10-21 22:35:28 +0200 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-11-09 13:08:32 +0100 |
| commit | c48e5fd811326dc64e19490f88003e442815a052 (patch) | |
| tree | e63d94b25d76b643dc05d6e2da2e9daef7438b40 /configure.ac | |
| parent | 2725e440bf1e4930f9b1d19223424bcb0d4b7066 (diff) | |
| download | freeipa-c48e5fd811326dc64e19490f88003e442815a052.tar.gz freeipa-c48e5fd811326dc64e19490f88003e442815a052.tar.xz freeipa-c48e5fd811326dc64e19490f88003e442815a052.zip | |
Build: move version handling from Makefile to configure
Version information is now in VERSION.m4 instead of VERSION.
Makefile target version-update was minimized and configure can be run
before make. Makefile temporarily contains hardcoded version which has
to match the one specified in VERSION.m4.
This is preparatory step which will allow us to replace hand-made
Makefile with one generated by Automake.
https://fedorahosted.org/freeipa/ticket/6418
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index b9f424ea6..6464d196a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -m4_include(version.m4) +m4_include(VERSION.m4) AC_INIT([ipa-server], IPA_VERSION, [https://hosted.fedoraproject.org/projects/freeipa/newticket]) @@ -9,7 +9,6 @@ AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) -AM_MAINTAINER_MODE AC_PROG_CC_C99 AC_DISABLE_STATIC LT_INIT @@ -333,6 +332,22 @@ AC_MSG_RESULT([${IPAPLATFORM}]) dnl --------------------------------------------------------------------------- +dnl Version information from VERSION.m4 and command line +dnl --------------------------------------------------------------------------- +AC_ARG_WITH([vendor-suffix], + AS_HELP_STRING([--with-vendor-suffix=STRING], + [Vendor string used by package system, e.g. "-1.fc24"]), + [VENDOR_SUFFIX=${withval}], + [VENDOR_SUFFIX=""]) + +dnl TODO: IPA_VENDOR_RELEASE +AC_SUBST([API_VERSION], [IPA_API_VERSION]) +AC_SUBST([DATA_VERSION], [IPA_DATA_VERSION]) +AC_SUBST([NUM_VERSION], [IPA_NUM_VERSION]) +AC_SUBST(VENDOR_SUFFIX) +AC_SUBST([VERSION], [IPA_VERSION]) + +dnl --------------------------------------------------------------------------- dnl Finish dnl --------------------------------------------------------------------------- @@ -383,6 +398,7 @@ AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) + # Files AC_CONFIG_LINKS([ipaplatform/__init__.py:ipaplatform/$IPAPLATFORM/__init__.py ipaplatform/constants.py:ipaplatform/$IPAPLATFORM/constants.py @@ -417,6 +433,8 @@ AC_CONFIG_FILES([ daemons/ipa-slapi-plugins/ipa-sidgen/Makefile daemons/ipa-slapi-plugins/ipa-range-check/Makefile daemons/ipa-slapi-plugins/topology/Makefile + daemons/ipa-version.h + freeipa.spec install/Makefile install/certmonger/Makefile install/conf/Makefile @@ -431,6 +449,7 @@ AC_CONFIG_FILES([ install/ui/css/Makefile install/ui/src/Makefile install/ui/src/libs/Makefile + install/ui/src/libs/loader.js install/ui/images/Makefile install/ui/build/Makefile install/ui/build/dojo/Makefile @@ -441,6 +460,8 @@ AC_CONFIG_FILES([ install/restart_scripts/Makefile install/wsgi/Makefile install/oddjob/Makefile + ipapython/version.py + ipasetup.py ipatests/man/Makefile po/Makefile util/Makefile @@ -455,6 +476,7 @@ echo " IPA Server $VERSION ======================== + vendor version: ${VERSION}${VENDOR_SUFFIX} prefix: ${prefix} exec_prefix: ${exec_prefix} libdir: ${libdir} @@ -472,5 +494,4 @@ echo " KRB5 libs: ${KRB5_LIBS} KRAD libs: ${KRAD_LIBS} OpenSSL crypto libs: ${CRYPTO_LIBS} - Maintainer mode: ${USE_MAINTAINER_MODE} " |