Merge https://github.com/pez4brian/mlt

diff --git a/src/framework/configure b/src/framework/configure
index 439a473e3f9107629652287e580d10ae1c656e3e..7cb01d58460a5448fc146ef0454a06b64dd02720 100755 (executable)
--- a/src/framework/configure
+++ b/src/framework/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 echo "framework        -I$prefix/include -I$prefix/include/mlt -D_REENTRANT    -L$libdir -lmlt" >> ../../packages.dat
 
-echo -n > config.mak
+echo > config.mak
 if [ "$(uname -s)" = "FreeBSD" ]
 then
        printf "#include <sys/param.h>\n int main(){ return 0;}" | gcc -c -x c - >/dev/null 2>&1

diff --git a/src/modules/gtk2/configure b/src/modules/gtk2/configure
index a01e40801f38dc85ce8f5c3301bd6e2e855a9364..06ca6a61dee3349b4bbd88a812179cf3075b0a81 100755 (executable)
--- a/src/modules/gtk2/configure
+++ b/src/modules/gtk2/configure
@@ -9,7 +9,7 @@ then
        pkg-config gdk-pixbuf-2.0 2> /dev/null
        disable_pixbuf=$?
 
-       pkg-config pangoft2 2> /dev/null
+       pkg-config gdk-pixbuf-2.0 pangoft2 2> /dev/null
        disable_pango=$?
 
        if [ "$disable_gtk2" != "0" -a "$disable_pixbuf" != 0 -a "$disable_pango" != "0" ]