build: Add --enable-doctool option

diff --git a/Makefile-tools.am b/Makefile-tools.am
index f84de999d73b2172fb5c09db42729b95a6bc2d70..34d2a25594cb0483273bc680048ec55970514f9a 100644 (file)
--- a/Makefile-tools.am
+++ b/Makefile-tools.am
@@ -1,5 +1,9 @@
 bin_PROGRAMS += g-ir-compiler g-ir-generate
-bin_SCRIPTS += g-ir-scanner g-ir-annotation-tool g-ir-doc-tool
+bin_SCRIPTS += g-ir-scanner g-ir-annotation-tool
+
+if BUILD_DOCTOOL
+bin_SCRIPTS += g-ir-doc-tool
+endif
 
 EXTRA_DIST +=                          \
        tools/g-ir-scanner.in           \

diff --git a/configure.ac b/configure.ac
index c311f66072fc12a9cf9c406a7ec03db0108ec112..0b67b085928dda3105934ec8c00bcdd58910a33b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -272,7 +272,11 @@ if test "x$os_win32" = "xyes"; then
   AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.]))
 fi
 
-AM_CHECK_PYMOD(mako,,,[AC_MSG_ERROR(Could not find python module: mako)])
+AC_ARG_ENABLE(doctool,[  --enable-doctool           enable g-ir-doctool ], enable_doctool=$enableval,enable_doctool=no)
+if test x$enable_doctool != xno; then
+   AM_CHECK_PYMOD(mako,,,[AC_MSG_ERROR(Could not find python module: mako)])
+fi
+AM_CONDITIONAL(BUILD_DOCTOOL, test x$enable_doctool != xno)
 
 # Glib documentation
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2d395a38749774aae0ff70d962f6c107b0c4e31e..8a1aa26deb4c067a2a4d7666880455f654cafc15 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,12 @@
 include $(top_srcdir)/common.mk
 
-SUBDIRS = . scanner repository offsets warn doctool
+SUBDIRS = . scanner repository offsets warn
+DIST_SUBDIRS =
+if BUILD_DOCTOOL
+SUBDIRS += doctool
+else
+DIST_SUBDIRS += doctool
+endif
 
 EXTRA_DIST=
 BUILT_SOURCES=