diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-11-03 11:03:03 +0100 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-11-09 13:08:32 +0100 |
| commit | 288d624336d502a7df9856cdc2f6543b6e7c0b79 (patch) | |
| tree | 963009cf0594db73bba8c58ae6510f5be74be9c6 /configure.ac | |
| parent | a027bf739848371fa91b5ba9766e031c9003d322 (diff) | |
| download | freeipa-288d624336d502a7df9856cdc2f6543b6e7c0b79.tar.gz freeipa-288d624336d502a7df9856cdc2f6543b6e7c0b79.tar.xz freeipa-288d624336d502a7df9856cdc2f6543b6e7c0b79.zip | |
Build: integrate init and init/systemd into build system
At the same time, I've renamed tmpfilesd config file to static name
"ipa.conf" instead of using package-specific name. It had no purpose
and just complicated build and packaging.
Variable substitution into configuration has to be done in Makefile
and not in Autoconf as documented in:
Autoconf v2.69 manual chapter 4.8.2 Installation Directory Variables:
... Most of these variables have values that rely on prefix or
exec_prefix. ... Similarly, you should not rely on AC_CONFIG_FILES
to replace bindir and friends in your shell scripts and other files;
instead, let make manage their replacement.
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 | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 1a6e489a0..0fafe0d38 100644 --- a/configure.ac +++ b/configure.ac @@ -241,7 +241,7 @@ dnl --------------------------------------------------------------------------- PKG_CHECK_MODULES([INI], [ini_config >= 1.2.0]) dnl --------------------------------------------------------------------------- -dnl - Check for systemd unit directory +dnl - Check for systemd directories dnl --------------------------------------------------------------------------- PKG_CHECK_EXISTS([systemd], [], [AC_MSG_ERROR([systemd not found])]) AC_ARG_WITH([systemdsystemunitdir], @@ -251,6 +251,13 @@ AC_ARG_WITH([systemdsystemunitdir], [systemdsystemunitdir=$($PKG_CONFIG --define-variable=prefix='${prefix}' --variable=systemdsystemunitdir systemd)]) AC_SUBST([systemdsystemunitdir]) +AC_ARG_WITH([systemdtmpfilesdir], + AS_HELP_STRING([--with-systemdtmpfilesdir=DIR], + [Directory for systemd-tmpfiles configuration files]), + [systemdtmpfilesdir=$with_systemdtmpfilesdir], + [systemdtmpfilesdir=$($PKG_CONFIG --define-variable=prefix='${prefix}' --variable=tmpfilesdir systemd)]) +AC_SUBST([systemdtmpfilesdir]) + dnl --------------------------------------------------------------------------- dnl - Get /etc/sysconfig directory path dnl --------------------------------------------------------------------------- @@ -451,6 +458,9 @@ AC_CONFIG_FILES([ daemons/ipa-slapi-plugins/topology/Makefile daemons/ipa-version.h freeipa.spec + init/systemd/Makefile + init/tmpfilesd/Makefile + init/Makefile install/Makefile install/certmonger/Makefile install/conf/Makefile @@ -510,6 +520,7 @@ echo " datadir: ${datadir} krb5rundir: ${krb5rundir} systemdsystemunitdir: ${systemdsystemunitdir} + systemdtmpfilesdir: ${systemdtmpfilesdir} source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} |