fixed a problem where configure was complaining and aborted when

--disable-ffmpeg option was specified
cmd-ntrf · Jan 10, 2010 · 7886483 · 7886483
1 parent 7f82559
commit 7886483
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/configure.ac b/configure.ac
@@ -1570,7 +1570,13 @@ if test "x$FFMPEG_STATUS" = xyes; then
     AC_SUBST(FFMPEG_LDFLAGS)
     AC_SUBST(FFMPEG_LIBS)
 else
-    if test "x$FFMPEG_OPTION_REQUESTED" = xyes; then
+    if (test "x$FFMPEG_OPTION_ENABLED" != xyes); then
+        AC_MSG_NOTICE("SETTING FFMPEG TO DISABLED!\n");
+        FFMPEG_STATUS=disabled
+    fi
+
+    if (test "x$FFMPEG_OPTION_REQUESTED" = xyes) && 
+       (test "x$FFMPEG_OPTION_ENABLED" = xyes); then
         AC_MSG_ERROR(unable to configure ffmpeg support)
     fi
 fi