diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-10-12 20:47:07 +0200 |
|---|---|---|
| committer | David Kupka <dkupka@redhat.com> | 2016-10-24 13:30:12 +0200 |
| commit | 5e028b59bcd3c485cc034f491a0171f26b03ce3a (patch) | |
| tree | a5de8db3f0ec63b5dd69d5087b695416f22cad13 | |
| parent | 6e1d777d2878de1e90e1dab4949075d31ffb0d52 (diff) | |
| download | freeipa-5e028b59bcd3c485cc034f491a0171f26b03ce3a.tar.gz freeipa-5e028b59bcd3c485cc034f491a0171f26b03ce3a.tar.xz freeipa-5e028b59bcd3c485cc034f491a0171f26b03ce3a.zip | |
Build: merge ipatests/man/configure.ac to top-level configure.ac
At the same time, I removed unnecessary checks for mkdir etc. and added
missing check for gzip.
https://fedorahosted.org/freeipa/ticket/6418
Reviewed-By: Lukas Slebodnik <lslebodn@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | ipatests/man/configure.ac | 24 |
3 files changed, 5 insertions, 28 deletions
@@ -106,9 +106,6 @@ client-autogen: version-update cd client; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi cd install; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi -tests-man-autogen: version-update - cd ipatests/man; if [ ! -e Makefile ]; then ../../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi - install: all server-install tests-install client-install @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ @@ -224,7 +221,7 @@ server-install: server (cd ipaplatform && $(PYTHON) setup.py install --root $(DESTDIR)) || exit 1; \ fi -tests: version-update tests-man-autogen +tests: version-update cd ipatests; $(PYTHON) setup.py build cd ipatests/man && $(MAKE) all diff --git a/configure.ac b/configure.ac index 17bac9360..ba1b42b04 100644 --- a/configure.ac +++ b/configure.ac @@ -304,9 +304,13 @@ AC_CONFIG_FILES([ daemons/ipa-slapi-plugins/ipa-sidgen/Makefile daemons/ipa-slapi-plugins/ipa-range-check/Makefile daemons/ipa-slapi-plugins/topology/Makefile + ipatests/man/Makefile util/Makefile ]) +dnl GZIP is used for compressing manual pages +AC_CHECK_PROG([GZIP], [gzip], [yes], [AC_MSG_ERROR(gzip not found)]) + AC_OUTPUT echo " diff --git a/ipatests/man/configure.ac b/ipatests/man/configure.ac deleted file mode 100644 index 8ddb93abb..000000000 --- a/ipatests/man/configure.ac +++ /dev/null @@ -1,24 +0,0 @@ -AC_PREREQ(2.59) -m4_include(../../version.m4) -AC_INIT([ipa-tests], - IPA_VERSION, - [https://hosted.fedoraproject.org/projects/freeipa/newticket]) - -AM_INIT_AUTOMAKE([foreign]) - -AM_MAINTAINER_MODE - -AC_SUBST(VERSION) -AC_SUBST([INSTALL_DATA], ['$(INSTALL) -m 644 -p']) - -AC_PROG_MKDIR_P -AC_PROG_AWK -AC_PROG_SED - -# Files - -AC_CONFIG_FILES([ - Makefile -]) - -AC_OUTPUT |