Build: merge install/configure.ac into top-level configure.ac

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>

4 files changed, 69 insertions, 108 deletions

diff --git a/Makefile b/Makefile
index b61adde87..cf85ac76b 100644
--- a/Makefile
+++ b/Makefile
@@ -100,11 +100,9 @@ client-check: client-autogen
 bootstrap-autogen: version-update client-autogen
 	@echo "Building IPA $(IPA_VERSION)"
 	./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR)
-	cd install; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi
 
 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
 
 install: all server-install tests-install client-install
 	@for subdir in $(SUBDIRS); do \
@@ -251,7 +249,7 @@ tarballs: local-archive
 	cd dist/$(TARBALL_PREFIX)/asn1; make distclean
 	cd dist/$(TARBALL_PREFIX)/daemons; make distclean
 	cd dist/$(TARBALL_PREFIX)/client; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
-	cd dist/$(TARBALL_PREFIX)/install; ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); make distclean
+	cd dist/$(TARBALL_PREFIX)/install; make distclean
 	cd dist; tar cfz sources/$(TARBALL) $(TARBALL_PREFIX)
 	rm -rf dist/$(TARBALL_PREFIX)
 
diff --git a/configure.ac b/configure.ac
index ba1b42b04..d4ea256ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,7 +225,50 @@ dnl - Set the data install directory since we don't use pkgdatadir
 dnl ---------------------------------------------------------------------------
 
 IPA_DATA_DIR="$datadir/ipa"
+IPA_SYSCONF_DIR="$sysconfdir/ipa"
 AC_SUBST(IPA_DATA_DIR)
+AC_SUBST(IPA_SYSCONF_DIR)
+
+dnl ---------------------------------------------------------------------------
+dnl Translations
+dnl ---------------------------------------------------------------------------
+AC_SUBST(GETTEXT_DOMAIN, [ipa])
+
+AC_PROG_MKDIR_P
+AC_PROG_AWK
+AC_PROG_SED
+
+AC_PATH_PROG(XGETTEXT, xgettext, [no])
+if test "x$XGETTEXT" = "xno"; then
+    AC_MSG_ERROR([xgettext not found, install gettext])
+fi
+
+AC_PATH_PROG(MSGFMT, msgfmt, [no])
+if test "x$MSGFMT" = "xno"; then
+    AC_MSG_ERROR([msgfmt not found, install gettext])
+fi
+
+AC_PATH_PROG(MSGINIT, msginit, [no])
+if test "x$MSGINIT" = "xno"; then
+    AC_MSG_ERROR([msginit not found, install gettext])
+fi
+
+AC_PATH_PROG(MSGMERGE, msgmerge, [no])
+if test "x$MSGMERGE" = "xno"; then
+    AC_MSG_ERROR([msgmerge not found, install gettext])
+fi
+
+AC_PATH_PROG(MSGCMP, msgcmp, [no])
+if test "x$MSGCMP" = "xno"; then
+    AC_MSG_ERROR([msgcmp not found, install gettext])
+fi
+
+AC_PATH_PROG(MSGATTRIB, msgattrib, [no])
+if test "x$MSGATTRIB" = "xno"; then
+    AC_MSG_ERROR([msgattrib not found, install gettext])
+fi
+
+AC_PATH_PROG(TX, tx, [/usr/bin/tx])
 
 dnl ---------------------------------------------------------------------------
 dnl Finish
@@ -304,6 +347,31 @@ AC_CONFIG_FILES([
     daemons/ipa-slapi-plugins/ipa-sidgen/Makefile
     daemons/ipa-slapi-plugins/ipa-range-check/Makefile
     daemons/ipa-slapi-plugins/topology/Makefile
+    install/Makefile
+    install/certmonger/Makefile
+    install/conf/Makefile
+    install/html/Makefile
+    install/migration/Makefile
+    install/share/Makefile
+    install/share/advise/Makefile
+    install/share/advise/legacy/Makefile
+    install/share/profiles/Makefile
+    install/share/schema.d/Makefile
+    install/ui/Makefile
+    install/ui/css/Makefile
+    install/ui/src/Makefile
+    install/ui/src/libs/Makefile
+    install/ui/images/Makefile
+    install/ui/build/Makefile
+    install/ui/build/dojo/Makefile
+    install/ui/build/freeipa/Makefile
+    install/tools/Makefile
+    install/tools/man/Makefile
+    install/updates/Makefile
+    install/po/Makefile
+    install/restart_scripts/Makefile
+    install/wsgi/Makefile
+    install/oddjob/Makefile
     ipatests/man/Makefile
     util/Makefile
 ])
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 4fd232f9e..7beee3cca 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -668,7 +668,6 @@ make LIBDIR=%{_libdir} version-update
 ./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}
 cd client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
 %if ! %{ONLY_CLIENT}
-cd install; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
 %endif # ONLY_CLIENT
 
 %if ! %{ONLY_CLIENT}
diff --git a/install/configure.ac b/install/configure.ac
deleted file mode 100644
index b89593308..000000000
--- a/install/configure.ac
+++ /dev/null
@@ -1,104 +0,0 @@
-AC_PREREQ(2.59)
-m4_include(../version.m4)
-AC_INIT([ipa-server],
-        IPA_VERSION,
-        [https://hosted.fedoraproject.org/projects/freeipa/newticket])
-
-#AC_CONFIG_SRCDIR([ipaserver/ipaldap.py])
-AC_CONFIG_HEADERS([config.h])
-
-AM_INIT_AUTOMAKE([foreign])
-
-AM_MAINTAINER_MODE
-#AC_PROG_CC
-#AC_STDC_HEADERS
-#AC_DISABLE_STATIC
-
-#AC_HEADER_STDC
-
-AC_SUBST(VERSION)
-AC_SUBST([INSTALL_DATA], ['$(INSTALL) -m 644 -p'])
-
-AC_PROG_MKDIR_P
-AC_PROG_AWK
-AC_PROG_SED
-
-AC_PATH_PROG(XGETTEXT, xgettext, [no])
-if test "x$XGETTEXT" = "xno"; then
-    AC_MSG_ERROR([xgettext not found, install gettext])
-fi
-
-AC_PATH_PROG(MSGFMT, msgfmt, [no])
-if test "x$MSGFMT" = "xno"; then
-    AC_MSG_ERROR([msgfmt not found, install gettext])
-fi
-
-AC_PATH_PROG(MSGINIT, msginit, [no])
-if test "x$MSGINIT" = "xno"; then
-    AC_MSG_ERROR([msginit not found, install gettext])
-fi
-
-AC_PATH_PROG(MSGMERGE, msgmerge, [no])
-if test "x$MSGMERGE" = "xno"; then
-    AC_MSG_ERROR([msgmerge not found, install gettext])
-fi
-
-AC_PATH_PROG(MSGCMP, msgcmp, [no])
-if test "x$MSGCMP" = "xno"; then
-    AC_MSG_ERROR([msgcmp not found, install gettext])
-fi
-
-AC_PATH_PROG(MSGATTRIB, msgattrib, [no])
-if test "x$MSGATTRIB" = "xno"; then
-    AC_MSG_ERROR([msgattrib not found, install gettext])
-fi
-
-AC_PATH_PROG(TX, tx, [/usr/bin/tx])
-
-AC_ARG_WITH([gettext_domain],
-  [AS_HELP_STRING([--with-gettext-domain=name],
-    [set the name of the i18n message catalog])],
-  [],
-  [with_gettext_domain=ipa])
-AC_SUBST(GETTEXT_DOMAIN, $with_gettext_domain)
-
-dnl ---------------------------------------------------------------------------
-dnl - Set the data install directory since we don't use pkgdatadir
-dnl ---------------------------------------------------------------------------
-
-IPA_DATA_DIR="$datadir/ipa"
-IPA_SYSCONF_DIR="$sysconfdir/ipa"
-AC_SUBST(IPA_DATA_DIR)
-AC_SUBST(IPA_SYSCONF_DIR)
-
-# Files
-
-AC_CONFIG_FILES([
-    Makefile
-    certmonger/Makefile
-    conf/Makefile
-    html/Makefile
-    migration/Makefile
-    share/Makefile
-    share/advise/Makefile
-    share/advise/legacy/Makefile
-    share/profiles/Makefile
-    share/schema.d/Makefile
-    ui/Makefile
-    ui/css/Makefile
-    ui/src/Makefile
-    ui/src/libs/Makefile
-    ui/images/Makefile
-    ui/build/Makefile
-    ui/build/dojo/Makefile
-    ui/build/freeipa/Makefile
-    tools/Makefile
-    tools/man/Makefile
-    updates/Makefile
-    po/Makefile
-    restart_scripts/Makefile
-    wsgi/Makefile
-    oddjob/Makefile
-])
-
-AC_OUTPUT