diff options
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.ac | 28 |
2 files changed, 28 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index b12a77e53..a35d18ffe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,12 +2,16 @@ ACLOCAL_AMFLAGS = -I m4 if ENABLE_SERVER SERVER_SUBDIRS = daemons init install ipaserver -else - SERVER_SUBDIRS = endif + +if WITH_IPATESTS + IPATESTS_SUBDIRS = ipatests +endif + IPACLIENT_SUBDIRS = ipaclient ipalib ipapython + SUBDIRS = asn1 util client contrib po \ - $(IPACLIENT_SUBDIRS) ipaplatform ipatests $(SERVER_SUBDIRS) + $(IPACLIENT_SUBDIRS) ipaplatform $(IPATESTS_SUBDIRS) $(SERVER_SUBDIRS) MOSTLYCLEANFILES = ipasetup.pyc ipasetup.pyo \ diff --git a/configure.ac b/configure.ac index 6192e4b63..9ee281a16 100644 --- a/configure.ac +++ b/configure.ac @@ -27,13 +27,20 @@ AC_HEADER_STDC PKG_PROG_PKG_CONFIG AC_ARG_ENABLE([server], -[ --disable-server Disable server support], -[case "${enableval}" in - yes) enable_server=true ;; - no) enable_server=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --disable-server]) ;; -esac],[enable_server=true]) -AM_CONDITIONAL([ENABLE_SERVER], [test x$enable_server = xtrue]) + [AC_HELP_STRING([--disable-server], [Disable server support])], + [case "${enableval}" in + yes) enable_server=yes ;; + no) enable_server=no ;; + *) AC_MSG_ERROR([bad value ${enableval} for --disable-server]) ;; + esac], + [enable_server=yes]) +AM_CONDITIONAL([ENABLE_SERVER], [test x$enable_server = xyes]) + +AC_ARG_WITH([ipatests], + [AC_HELP_STRING([--without-ipatests], [Build without ipatests])], + [with_ipatests=${withval}], + [with_ipatests=yes]) +AM_CONDITIONAL([WITH_IPATESTS], [test x"$with_ipatests" = xyes]) AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes]) @@ -516,3 +523,10 @@ AM_COND_IF([ENABLE_SERVER], [ echo "\ build mode: client only" ]) +AM_COND_IF([WITH_IPATESTS], [ + echo "\ + with ipatests: yes" +], [ + echo "\ + with ipatests: no" +]) |