mirror of
https://github.com/Motion-Project/motion.git
synced 2026-06-11 23:34:36 -04:00
Fix detection of ffmpeg for debian package in multimedia
This commit is contained in:
AngelCarpintero
72
configure
vendored
72
configure
vendored
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for motion trunk-r428.
|
||||
# Generated by GNU Autoconf 2.61 for motion trunk-r429.
|
||||
#
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||||
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='motion'
|
||||
PACKAGE_TARNAME='motion'
|
||||
PACKAGE_VERSION='trunk-r428'
|
||||
PACKAGE_STRING='motion trunk-r428'
|
||||
PACKAGE_VERSION='trunk-r429'
|
||||
PACKAGE_STRING='motion trunk-r429'
|
||||
PACKAGE_BUGREPORT=''
|
||||
|
||||
ac_unique_file="motion.c"
|
||||
@@ -1177,7 +1177,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures motion trunk-r428 to adapt to many kinds of systems.
|
||||
\`configure' configures motion trunk-r429 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1238,7 +1238,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of motion trunk-r428:";;
|
||||
short | recursive ) echo "Configuration of motion trunk-r429:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1374,7 +1374,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
motion configure trunk-r428
|
||||
motion configure trunk-r429
|
||||
generated by GNU Autoconf 2.61
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
@@ -1388,7 +1388,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by motion $as_me trunk-r428, which was
|
||||
It was created by motion $as_me trunk-r429, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -3241,38 +3241,42 @@ fi
|
||||
#
|
||||
|
||||
if test "${FFMPEG_OK}" = "found"; then
|
||||
{ echo "$as_me:$LINENO: checking for ffmpeg headers in ${FFMPEG_DIR}" >&5
|
||||
{ echo "$as_me:$LINENO: checking for ffmpeg headers in ${FFMPEG_DIR}" >&5
|
||||
echo $ECHO_N "checking for ffmpeg headers in ${FFMPEG_DIR}... $ECHO_C" >&6; }
|
||||
|
||||
if test -f ${FFMPEG_DIR}/include/avformat.h; then
|
||||
{ echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/include/avformat.h" >&5
|
||||
if test -f ${FFMPEG_DIR}/include/avformat.h; then
|
||||
{ echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/include/avformat.h" >&5
|
||||
echo "${ECHO_T}found ${FFMPEG_DIR}/include/avformat.h" >&6; }
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include"
|
||||
elif test -f ${FFMPEG_DIR}/avformat.h; then
|
||||
{ echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/avformat.h" >&5
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include"
|
||||
elif test -f ${FFMPEG_DIR}/avformat.h; then
|
||||
{ echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/avformat.h" >&5
|
||||
echo "${ECHO_T}found ${FFMPEG_DIR}/avformat.h" >&6; }
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}"
|
||||
elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then
|
||||
{ echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/include/ffmpeg/avformat.h" >&5
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}"
|
||||
elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then
|
||||
{ echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/include/ffmpeg/avformat.h" >&5
|
||||
echo "${ECHO_T}found ${FFMPEG_DIR}/include/ffmpeg/avformat.h" >&6; }
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg"
|
||||
elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
|
||||
{ echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/include/libavformat/avformat.h" >&5
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg"
|
||||
elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
|
||||
{ echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/include/libavformat/avformat.h" >&5
|
||||
echo "${ECHO_T}found ${FFMPEG_DIR}/include/libavformat/avformat.h" >&6; }
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: not found" >&5
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
|
||||
elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then
|
||||
{ echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h" >&5
|
||||
echo "${ECHO_T}found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h" >&6; }
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES"
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: not found" >&5
|
||||
echo "${ECHO_T}not found" >&6; }
|
||||
FFMPEG_OK="no_found"
|
||||
echo "**********************************************"
|
||||
echo "* avformat.h not found: *"
|
||||
echo "* ALL FFMPEG FEATURES DISABLED *"
|
||||
echo "* *"
|
||||
echo "* Please read the Motion Guide for help: *"
|
||||
echo "* http://motion.sourceforge.net *"
|
||||
echo "**********************************************"
|
||||
echo ""
|
||||
fi
|
||||
FFMPEG_OK="no_found"
|
||||
echo "**********************************************"
|
||||
echo "* avformat.h not found: *"
|
||||
echo "* ALL FFMPEG FEATURES DISABLED *"
|
||||
echo "* *"
|
||||
echo "* Please read the Motion Guide for help: *"
|
||||
echo "* http://motion.sourceforge.net *"
|
||||
echo "**********************************************"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
#
|
||||
# If ffmpeg libs and headers have been found
|
||||
@@ -8122,7 +8126,7 @@ exec 6>&1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by motion $as_me trunk-r428, which was
|
||||
This file was extended by motion $as_me trunk-r429, which was
|
||||
generated by GNU Autoconf 2.61. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -8171,7 +8175,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
motion config.status trunk-r428
|
||||
motion config.status trunk-r429
|
||||
configured by $0, generated by GNU Autoconf 2.61,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
53
configure.in
53
configure.in
@@ -375,32 +375,35 @@ fi
|
||||
#
|
||||
|
||||
if test "${FFMPEG_OK}" = "found"; then
|
||||
AC_MSG_CHECKING(for ffmpeg headers in ${FFMPEG_DIR})
|
||||
AC_MSG_CHECKING(for ffmpeg headers in ${FFMPEG_DIR})
|
||||
|
||||
if test -f ${FFMPEG_DIR}/include/avformat.h; then
|
||||
AC_MSG_RESULT(found ${FFMPEG_DIR}/include/avformat.h)
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include"
|
||||
elif test -f ${FFMPEG_DIR}/avformat.h; then
|
||||
AC_MSG_RESULT(found ${FFMPEG_DIR}/avformat.h)
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}"
|
||||
elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then
|
||||
AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h)
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg"
|
||||
elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
|
||||
AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h)
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
|
||||
else
|
||||
AC_MSG_RESULT(not found)
|
||||
FFMPEG_OK="no_found"
|
||||
echo "**********************************************"
|
||||
echo "* avformat.h not found: *"
|
||||
echo "* ALL FFMPEG FEATURES DISABLED *"
|
||||
echo "* *"
|
||||
echo "* Please read the Motion Guide for help: *"
|
||||
echo "* http://motion.sourceforge.net *"
|
||||
echo "**********************************************"
|
||||
echo ""
|
||||
fi
|
||||
if test -f ${FFMPEG_DIR}/include/avformat.h; then
|
||||
AC_MSG_RESULT(found ${FFMPEG_DIR}/include/avformat.h)
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include"
|
||||
elif test -f ${FFMPEG_DIR}/avformat.h; then
|
||||
AC_MSG_RESULT(found ${FFMPEG_DIR}/avformat.h)
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}"
|
||||
elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then
|
||||
AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h)
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg"
|
||||
elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
|
||||
AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h)
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
|
||||
elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then
|
||||
AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h)
|
||||
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES"
|
||||
else
|
||||
AC_MSG_RESULT(not found)
|
||||
FFMPEG_OK="no_found"
|
||||
echo "**********************************************"
|
||||
echo "* avformat.h not found: *"
|
||||
echo "* ALL FFMPEG FEATURES DISABLED *"
|
||||
echo "* *"
|
||||
echo "* Please read the Motion Guide for help: *"
|
||||
echo "* http://motion.sourceforge.net *"
|
||||
echo "**********************************************"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
#
|
||||
# If ffmpeg libs and headers have been found
|
||||
|
||||
Reference in New Issue
Block a user