---
 Makefile.am         |    9 +++++++--
 bootstrap-configure |    1 +
 configure.ac        |    4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4b0d7e8..2a140c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -231,7 +231,7 @@ doc_files = doc/overview.txt doc/ofono-paper.txt \
                        doc/call-meter-api.txt \
                        doc/dataconnectionmanager-api.txt
 
-test_files = test/test-manager test/test-modem test/test-voicecall \
+test_scripts = test/test-manager test/test-modem test/test-voicecall \
                test/test-network-registration test/test-phonebook \
                test/test-advice-of-charge test/test-call-settings \
                test/test-call-forwarding test/test-call-barring \
@@ -244,10 +244,15 @@ test_files = test/test-manager test/test-modem 
test/test-voicecall \
                test/activate-context test/deactivate-context \
                test/process-context-settings
 
+if TEST
+testdir = $(pkglibdir)/test
+test_SCRIPTS = $(test_scripts)
+endif
+
 conf_files = src/ofono.conf plugins/modem.conf
 
 EXTRA_DIST = src/genbuiltin plugins/example_history.c $(doc_files) \
-                               $(test_files) $(conf_files) $(udev_files)
+                               $(test_scripts) $(conf_files) $(udev_files)
 
 dist_man_MANS = doc/ofonod.8
 
diff --git a/bootstrap-configure b/bootstrap-configure
index 63a689a..f665943 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -7,6 +7,7 @@ fi
 ./bootstrap && \
     ./configure --enable-maintainer-mode \
                --enable-debug \
+               --enable-test \
                --prefix=/usr \
                --mandir=/usr/share/man \
                --sysconfdir=/etc \
diff --git a/configure.ac b/configure.ac
index 5c2255a..a3b7d75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,10 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
        fi
 ])
 
+AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],
+               [enable test/example scripts]), [enable_test=${enableval}])
+AM_CONDITIONAL(TEST, test "${enable_test}" = "yes")
+
 AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
                        [enable position independent executables flag]), [
        if (test "${enableval}" = "yes" &&
-- 
1.6.1.3

_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono

Reply via email to