X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=configure;h=ba046e9959a5110e4be734df055e0e168cbe06a7;hb=34c7916b96a65dbfb6d9414aca781d6292474f98;hp=59508f7d1704130d4d739eb27a8f85f53af1fc42;hpb=eae86b6ff2d11421e4839ffbe79c4c547d15751a;p=melted

diff --git a/configure b/configure
index 59508f7..ba046e9 100755
--- 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)
@@ -38,6 +39,7 @@ function build_config
 		echo "version=$version"
 		echo "prefix=$prefix"
 		echo "bindir=$prefix/bin"
+		echo "targetos=$targetos"
 
 		[ "$mmx" = "true" ] && 
 		echo "MMX_FLAGS=-DUSE_MMX"
@@ -50,16 +52,18 @@ function build_config
 		[ "$cpu" != "" ] &&
 		echo "TARGETARCH=-march=$cpu" &&
 		echo "TARGETCPU=-mcpu=$cpu"
+		echo "OPTIMISATIONS=-O4 -pipe -fomit-frame-pointer"
 
-		echo "OPTIMISATIONS=-O4 -pipe -ffast-math -fomit-frame-pointer"
 		echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
 
 		case $targetos in
 		Darwin)
-		echo "CFLAGS+=-DDARWIN"
+		echo "CFLAGS+=-D__DARWIN__ `sdl-config --cflags`"
 		echo "SHFLAGS=-dynamiclib"
+		echo "LDFLAGS+=`sdl-config --libs`"
 		;;
 		Linux)
+		echo "OPTIMISATIONS+=-ffast-math"
 		echo "CFLAGS+=-pthread"
 		echo "SHFLAGS=-shared"
 		echo "LIBDL=-ldl"
@@ -110,6 +114,7 @@ export debug=true
 export mmx=true
 export gpl=false
 export cpu=
+export motionest=false
 
 # Determine OS
 targetos=$(uname -s)
@@ -117,6 +122,7 @@ targetos=$(uname -s)
 case $targetos in
 	Darwin)
 	LIBSUF=".dylib"
+	mmx=false
 	;;
 	Linux)
 	LIBSUF=".so"
@@ -136,10 +142,17 @@ do
 		--disable-debug )	debug=false ;;
 		--disable-mmx )		mmx=false ;;
 		--enable-gpl )		gpl=true ;;
+		--enable-motion-est )	motionest=true ;;
 		--cpu=* )			cpu="${i#--cpu=}" ;;
 	esac
 done
 
+# Double check mmx (may end up disabling mmx on non-linux platforms incorrectly)
+if [ "$mmx" = "true" ]
+then
+	grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
+fi
+
 # Show help if requested
 [ $help = 1 ] && show_help || build_config
 
@@ -166,3 +179,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