+ Correction for uninstalled sdl image lib

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

diff --git a/src/modules/sdl/configure b/src/modules/sdl/configure
index 253d181..af5568c 100755 (executable)
--- a/src/modules/sdl/configure
+++ b/src/modules/sdl/configure
@@ -13,9 +13,11 @@ then
                echo "sdl                               libmltsdl$LIBSUF" >> ../consumers.dat
                echo "sdl_preview               libmltsdl$LIBSUF" >> ../consumers.dat
                echo "sdl_still                 libmltsdl$LIBSUF" >> ../consumers.dat
-               [ -f "$image" ] && 
-               echo "sdl_image                 libmltsdl$LIBSUF" >> ../producers.dat &&
-               echo "WITH_SDL_IMAGE=1" >> config.mak
+               if [ -f "$image" ]
+               then
+                       echo "sdl_image                 libmltsdl$LIBSUF" >> ../producers.dat
+                       echo "WITH_SDL_IMAGE=1" >> config.mak
+               fi
        else
                echo "- sdl development libs not found: disabling"
                touch ../disable-sdl

diff --git a/src/modules/sdl/factory.c b/src/modules/sdl/factory.c
index 91d1b0a..c944be1 100644 (file)
--- a/src/modules/sdl/factory.c
+++ b/src/modules/sdl/factory.c
@@ -21,12 +21,17 @@
 #include <string.h>
 
 #include "consumer_sdl.h"
+
+#ifdef WITH_SDL_IMAGE
 #include "producer_sdl_image.h"
+#endif
 
 void *mlt_create_producer( char *id, void *arg )
 {
+#ifdef WITH_SDL_IMAGE
        if ( !strcmp( id, "sdl_image" ) )
                return producer_sdl_image_init( arg );
+#endif
        return NULL;
 }