forked from sackmotion/motion
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Get rid of ffmpeg-config in debian , it's deprecated.
- Loading branch information
AngelCarpintero
authored and
AngelCarpintero
committed
Sep 17, 2008
1 parent
8e9e91d
commit ae4fae3
Showing
4 changed files
with
20 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #! /bin/sh | ||
| # Guess values for system-dependent variables and create Makefiles. | ||
| # Generated by GNU Autoconf 2.61 for motion trunk-r409. | ||
| # Generated by GNU Autoconf 2.61 for motion trunk-r410. | ||
| # | ||
| # 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-r409' | ||
| PACKAGE_STRING='motion trunk-r409' | ||
| PACKAGE_VERSION='trunk-r410' | ||
| PACKAGE_STRING='motion trunk-r410' | ||
| 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-r409 to adapt to many kinds of systems. | ||
| \`configure' configures motion trunk-r410 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-r409:";; | ||
| short | recursive ) echo "Configuration of motion trunk-r410:";; | ||
| 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-r409 | ||
| motion configure trunk-r410 | ||
| 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-r409, which was | ||
| It was created by motion $as_me trunk-r410, which was | ||
| generated by GNU Autoconf 2.61. Invocation command line was | ||
| $ $0 $@ | ||
|
|
@@ -3173,14 +3173,7 @@ else if test "${FFMPEG_DIR}" = "yes"; then | |
| { echo "$as_me:$LINENO: checking for ffmpeg autodetecting" >&5 | ||
| echo $ECHO_N "checking for ffmpeg autodetecting... $ECHO_C" >&6; } | ||
| # weird hack to fix debian problem TO BE REMOVED | ||
| if test -f /usr/bin/ffmpeg-config; then | ||
| FFMPEG_LIBS_DEB="`ffmpeg-config --libs avformat`" | ||
| FFMPEG_CFLAGS_DEB="`ffmpeg-config --cflags`" | ||
| FFMPEG_OK="found" | ||
| { echo "$as_me:$LINENO: result: found for debian" >&5 | ||
| echo "${ECHO_T}found for debian" >&6; } | ||
| elif test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then | ||
| if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then | ||
| { echo "$as_me:$LINENO: result: found in /usr/lib64" >&5 | ||
| echo "${ECHO_T}found in /usr/lib64" >&6; } | ||
| FFMPEG_OK="found" | ||
|
|
@@ -3251,11 +3244,7 @@ if test "${FFMPEG_OK}" = "found"; then | |
| { 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 "${FFMPEG_CFLAGS_DEB}" != "" ; then | ||
| FFMPEG_CFLAGS="${FFMPEG_CFLAGS_DEB}" | ||
| { echo "$as_me:$LINENO: result: found for debian" >&5 | ||
| echo "${ECHO_T}found for debian" >&6; } | ||
| elif test -f ${FFMPEG_DIR}/include/avformat.h; then | ||
| 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" | ||
|
|
@@ -3290,13 +3279,8 @@ echo "${ECHO_T}not found" >&6; } | |
| # | ||
| if test "${FFMPEG_OK}" = "found"; then | ||
| if test "${FFMPEG_LIBS_DEB}" != ""; then | ||
| TEMP_LIBS="$TEMP_LIBS ${FFMPEG_LIBS_DEB}" | ||
| else | ||
| TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz" | ||
| TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}" | ||
| fi | ||
| TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz" | ||
| TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}" | ||
| TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}" | ||
| FFMPEG_OBJ="ffmpeg.o" | ||
|
|
@@ -8138,7 +8122,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-r409, which was | ||
| This file was extended by motion $as_me trunk-r410, which was | ||
| generated by GNU Autoconf 2.61. Invocation command line was | ||
| CONFIG_FILES = $CONFIG_FILES | ||
|
|
@@ -8187,7 +8171,7 @@ Report bugs to <[email protected]>." | |
| _ACEOF | ||
| cat >>$CONFIG_STATUS <<_ACEOF | ||
| ac_cs_version="\\ | ||
| motion config.status trunk-r409 | ||
| motion config.status trunk-r410 | ||
| configured by $0, generated by GNU Autoconf 2.61, | ||
| with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters