Prevent motion estimation components from building unless requested.

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@753 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/configure b/configure
index 2e2f2bedfc6b81bdec69f1f29a3ba84eea6639c3..cfa00fb0ec6d75c3737c56cf6dad83caf69ebe58 100755 (executable)
--- a/configure
+++ b/configure
@@ -13,6 +13,7 @@ General build options:
 
   --prefix=directory      - install prefix for path (default: $prefix)
   --enable-gpl            - Enable GPL components
+  --enable-motion-est    - Enable motion estimation components
   --disable-debug         - Compile without debug support (default: on)
   --disable-mmx           - Compile without MMX support (default: on)
   --cpu='cpu'             - Compile for a specific CPU/architectre (default: none)
@@ -111,6 +112,7 @@ export debug=true
 export mmx=true
 export gpl=false
 export cpu=
+export motionest=false
 
 # Determine OS
 targetos=$(uname -s)
@@ -138,6 +140,7 @@ do
                --disable-debug )       debug=false ;;
                --disable-mmx )         mmx=false ;;
                --enable-gpl )          gpl=true ;;
+               --enable-motion-est )   motionest=true ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
        esac
 done
@@ -174,3 +177,7 @@ build_pkgconfig
 echo "GPL Components are disabled" || 
 echo "GPL License Used" )
 
+if [ "$motionest" = "true" -a "$gpl" = "false" ]
+then
+       echo "Add the --enable-gpl flag to build the motion estimation components."
+fi

diff --git a/src/modules/motion_est/configure b/src/modules/motion_est/configure
index 0dae7494a09bdd7f5f11ba9af4d38240ff713188..51cabb137a69c6f9ea703f776d8c5e9629a6d2d4 100755 (executable)
--- a/src/modules/motion_est/configure
+++ b/src/modules/motion_est/configure
@@ -10,4 +10,10 @@ crop_detect          libmltmotion_est.so
 autotrack_rectangle    libmltmotion_est.so
 EOF
 
+       if [ "$motionest" = "false" ]
+       then
+               touch ../disable-motion-est
+       fi
+               
+
 fi

diff --git a/src/modules/motion_est/gpl b/src/modules/motion_est/gpl
new file mode 100644 (file)
index 0000000..e69de29