Opss... My last commit was wrong; sorry!

This one moves the GPL check in the right place

Originally committed as revision 7359 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 21151ea..65b220d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1173,6 +1173,11 @@ EOF
         echo "The X11 grabber is under GPL and --enable-gpl is not specified."
         fail="yes"
     fi
+
+    if test "$swscaler" != "no"; then
+        echo "The software scaler is under GPL and --enable-gpl is not specified."
+        fail="yes"
+    fi
 fi
 
 if test "$fail" = "yes"; then
@@ -1357,11 +1362,6 @@ if test $arch = "powerpc"; then
             add_cflags "-maltivec -mabi=altivec"
         fi
     fi
-
-    if test "$swscaler" != "no"; then
-        echo "The software scaler is under GPL and --enable-gpl is not specified."
-        fail="yes"
-    fi
 fi
 
 check_header altivec.h