diff -urN movit-1.1.3-orig/configure movit-1.1.3-dwok/configure --- movit-1.1.3-orig/configure 2015-03-29 01:07:21.000000000 +0100 +++ movit-1.1.3-dwok/configure 2015-12-22 01:20:20.000000000 +0100 @@ -14877,7 +14877,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_Eigen3_CFLAGS=`$PKG_CONFIG --cflags "eigen3" 2>/dev/null` + pkg_cv_Eigen3_CFLAGS="-I/usr/include/eigen3" test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15556,12 +15556,12 @@ pkg_cv_libpng_CFLAGS="$libpng_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng12\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng16\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpng16") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libpng_CFLAGS=`$PKG_CONFIG --cflags "libpng12" 2>/dev/null` + pkg_cv_libpng_CFLAGS=`$PKG_CONFIG --cflags "libpng16" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15573,12 +15573,12 @@ pkg_cv_libpng_LIBS="$libpng_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng12\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpng12") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng16\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpng16") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libpng_LIBS=`$PKG_CONFIG --libs "libpng12" 2>/dev/null` + pkg_cv_libpng_LIBS=`$PKG_CONFIG --libs "libpng16" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15599,20 +15599,20 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libpng_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng12" 2>&1` + libpng_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng16" 2>&1` else - libpng_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng12" 2>&1` + libpng_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng16" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$libpng_PKG_ERRORS" >&5 - with_demo_app=no; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libpng12 not found, demo program will not be built" >&5 -$as_echo "$as_me: WARNING: libpng12 not found, demo program will not be built" >&2;} + with_demo_app=no; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libpng16 not found, demo program will not be built" >&5 +$as_echo "$as_me: WARNING: libpng16 not found, demo program will not be built" >&2;} elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - with_demo_app=no; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libpng12 not found, demo program will not be built" >&5 -$as_echo "$as_me: WARNING: libpng12 not found, demo program will not be built" >&2;} + with_demo_app=no; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libpng16 not found, demo program will not be built" >&5 +$as_echo "$as_me: WARNING: libpng16 not found, demo program will not be built" >&2;} else libpng_CFLAGS=$pkg_cv_libpng_CFLAGS libpng_LIBS=$pkg_cv_libpng_LIBS