diff options
| author | Pavel Šimerda <psimerda@redhat.com> | 2012-11-05 11:35:34 +0100 |
|---|---|---|
| committer | Pavel Šimerda <psimerda@redhat.com> | 2012-11-13 20:23:06 +0100 |
| commit | faa1bcb540c3dac9bc1a85aa3518f8513fa44417 (patch) | |
| tree | 512926191fa2514e8753e02513ca59edc5fcd0dc /callouts | |
| parent | e19ef483b77b724b6ec45c4c3c6106a2f9308769 (diff) | |
build: improve documentation and test configure options
Use --enable-doc and --enable-tests instead of --with-docs and
--with-tests. This is consistent with other features and with
--enable-gtk-doc option. Support current variants as fallback.
Don't build tests unless --enable-tests is specified.
Diffstat (limited to 'callouts')
| -rw-r--r-- | callouts/Makefile.am | 2 | ||||
| -rw-r--r-- | callouts/tests/Makefile.am | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/callouts/Makefile.am b/callouts/Makefile.am index d7fbec01eb..b27fdd79f2 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS=. tests +SUBDIRS = . tests ########################################### # Test libraries diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index 93d3fae7fc..e8a13fc6ea 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -1,3 +1,5 @@ +if ENABLE_TESTS + INCLUDES = \ -I$(top_srcdir)/include \ -I${top_builddir}/include \ @@ -25,16 +27,13 @@ test_dispatcher_envp_LDADD = \ ########################################### -if WITH_TESTS - check-local: test-dispatcher-envp $(abs_builddir)/test-dispatcher-envp $(abs_srcdir) -endif - EXTRA_DIST= \ dispatcher-old-down \ dispatcher-old-up \ dispatcher-old-vpn-down \ dispatcher-old-vpn-up +endif |