configure, motion_est/configure: remove module-specific crud from top-level

configure script, and enable motion_est now by default.

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

diff --git a/configure b/configure
index 65961fa..2551220 100755 (executable)
--- a/configure
+++ b/configure
@@ -17,7 +17,6 @@ General build options:
   --prefix=directory      - install prefix for path (default: $prefix)
   --libdir=directory      - lib directory (default: $prefix/lib)
   --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)
@@ -123,7 +122,6 @@ export debug=true
 export mmx=true
 export gpl=false
 export cpu=
-export motionest=false
 
 # Determine OS
 targetos=$(uname -s)
@@ -152,7 +150,6 @@ do
                --disable-debug )       debug=false ;;
                --disable-mmx )         mmx=false ;;
                --enable-gpl )          gpl=true ;;
-               --enable-motion-est )   motionest=true ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
        esac
 done
@@ -200,8 +197,3 @@ build_pkgconfig
 ( [ "$gpl" = "false" ] && 
 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
deleted file mode 100755 (executable)
index 6116a9a..0000000
--- a/src/modules/motion_est/configure
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ "$help" != "1" ]
-then
-
-if [ "$motionest" = "false" ]
-then
-       touch ../disable-motion_est
-       echo "- motion estimation components disabled. Add --enable-motion-est to enable." 
-fi
-
-fi