Add --enable-freedist option for configuration.

diff --git a/configure.ac b/configure.ac
index f65642f9cbda04ea800a730871ccf0f0bd9a0ad7..3e3527aa2ff228bd07649e957b77462b2201bb9d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,14 @@ AX_LIB_XERCES
 AZ_PYTHON_DEFAULT
 AZ_PYTHON_WITH
 AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+AC_ARG_ENABLE([freedist],
+     [  --enable-freedist    Ensure source distribution is of BSD-licensed code.],
+     [case "${enableval}" in
+       yes) freedist=true ;;
+       no)  freedist=false ;;
+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-freedist]) ;;
+     esac],[freedist=false])
+     AM_CONDITIONAL([FREEDIST], [test x$freedist = xtrue])
 
 # Checks for libraries.
 AC_CHECK_LIB([pthread], [pthread_create])

diff --git a/src/Makefile.am b/src/Makefile.am
index fa681a45682d76c50cd69487006a351b9b18fa3e..7b509ca5ad02c1f116687964dec8e19bb0c23f4f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -110,7 +110,11 @@ TESTS_ENVIRONMENT = BUILD_DIR="." TEST_FILES=../tests TEST_FILE_PREFIX=DCPd1-M1
 
 # files to include in the distribution that automake doesn't automatically include
 EXTRA_DIST = fips-186-test-harness.pl $(TESTS)
-
+if PYTHON_USE
+if !FREEDIST
+EXTRA_DIST += $(nodist_libpyasdcp_la_SOURCES) $(nodist_kumu_la_SOURCES) $(nodist_asdcp_la_SOURCES)
+endif
+endif
 
 # source files that are themselves built
 BUILT_SOURCES = Metadata.h Metadata.cpp MDD.h MDD.cpp