diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | asn1/configure.ac | 24 | ||||
| -rw-r--r-- | client/Makefile.am | 1 | ||||
| -rw-r--r-- | client/configure.ac | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | freeipa.spec.in | 2 |
6 files changed, 2 insertions, 31 deletions
@@ -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 asn1; 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 client-autogen: version-update - cd asn1; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi 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 diff --git a/asn1/configure.ac b/asn1/configure.ac deleted file mode 100644 index c02091428..000000000 --- a/asn1/configure.ac +++ /dev/null @@ -1,24 +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_HEADERS([config.h]) -AC_PROG_CC_C99 -LT_INIT - -AM_INIT_AUTOMAKE([foreign]) - -AM_MAINTAINER_MODE - -AC_SUBST(VERSION) - -# Files - -AC_CONFIG_FILES([ - Makefile - asn1c/Makefile -]) - -AC_OUTPUT diff --git a/client/Makefile.am b/client/Makefile.am index 3d135a344..e95fba268 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -93,7 +93,6 @@ ipa_join_LDADD = \ $(NULL) SUBDIRS = \ - ../asn1 \ man \ $(NULL) diff --git a/client/configure.ac b/client/configure.ac index 58f23afa7..1de1db8f2 100644 --- a/client/configure.ac +++ b/client/configure.ac @@ -6,7 +6,6 @@ AC_INIT([ipa-client], LT_INIT AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_SUBDIRS([../asn1]) AM_INIT_AUTOMAKE([foreign]) @@ -220,7 +219,6 @@ dnl --------------------------------------------------------------------------- AC_CONFIG_FILES([ Makefile - ../asn1/Makefile man/Makefile ]) diff --git a/configure.ac b/configure.ac index e89a79a71..17bac9360 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,6 @@ AC_INIT([ipa-server], [https://hosted.fedoraproject.org/projects/freeipa/newticket]) AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_SUBDIRS([asn1]) AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) @@ -283,6 +282,7 @@ AC_SUBST(LDFLAGS) AC_CONFIG_FILES([ asn1/Makefile + asn1/asn1c/Makefile daemons/Makefile daemons/ipa-kdb/Makefile daemons/ipa-sam/Makefile diff --git a/freeipa.spec.in b/freeipa.spec.in index a17bc6b22..4fd232f9e 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -665,9 +665,9 @@ rm -f ipaplatform/tasks.py rm -f ipaplatform/paths.py rm -f ipaplatform/constants.py 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} -./autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} cd install; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd .. %endif # ONLY_CLIENT |