Merge pull request maxmind#136 from ffontaine/master

Add --disable-tests to configure
zeitgeist · May 15, 2017 · 6a63165 · 6a63165
2 parents 08e44e1 + 8287848
commit 6a63165
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Makefile.am b/Makefile.am
@@ -5,8 +5,12 @@ nodist_include_HEADERS = include/maxminddb_config.h
 
 SUBDIRS = \
   src     \
-  bin     \
+  bin
+
+if TESTS
+SUBDIRS += \
   t
+endif
 
 EXTRA_DIST = doc t Changes.md LICENSE NOTICE README.md projects/VS12 projects/VS12-tests
 dist-hook:

diff --git a/configure.ac b/configure.ac
@@ -119,6 +119,12 @@ AC_ARG_ENABLE(
         esac],[debug=false])
 AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
 
+AC_ARG_ENABLE([tests],
+        AS_HELP_STRING([--enable-tests], [Compilation of tests code]),
+        [enable_tests=${enableval}],
+        [enable_tests=yes])
+AM_CONDITIONAL([TESTS], [test "${enable_tests}" = "yes"])
+
 AC_CONFIG_FILES([Makefile
                  src/Makefile
                  bin/Makefile