Skip to content

Commit

Permalink
Work around ffmpeg generating incorrect LIBS in libavutil.pc
Browse files Browse the repository at this point in the history
  • Loading branch information
tgoyne committed Jun 5, 2014
1 parent 905d995 commit 9203af5
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 10 deletions.
25 changes: 15 additions & 10 deletions configure
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.69 for ffms2 2.19.0.5.
# Generated by GNU Autoconf 2.69 for ffms2 2.19.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ffms2'
PACKAGE_TARNAME='ffms2'
PACKAGE_VERSION='2.19.0.5'
PACKAGE_STRING='ffms2 2.19.0.5'
PACKAGE_VERSION='2.19.2'
PACKAGE_STRING='ffms2 2.19.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -1346,7 +1346,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 ffms2 2.19.0.5 to adapt to many kinds of systems.
\`configure' configures ffms2 2.19.2 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1416,7 +1416,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ffms2 2.19.0.5:";;
short | recursive ) echo "Configuration of ffms2 2.19.2:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1542,7 +1542,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ffms2 configure 2.19.0.5
ffms2 configure 2.19.2
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2082,7 +2082,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 ffms2 $as_me 2.19.0.5, which was
It was created by ffms2 $as_me 2.19.2, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -2947,7 +2947,7 @@ fi

# Define the identity of the package.
PACKAGE='ffms2'
VERSION='2.19.0.5'
VERSION='2.19.2'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -16014,6 +16014,9 @@ $as_echo "yes" >&6; }
fi
CPPFLAGS="$CPPFLAGS -D__STDC_CONSTANT_MACROS"

LIBAV_LIBS=$(echo $LIBAV_LIBS | sed 's/\(.*\) -lrt\(.*\)/\1\2 -lrt/')





Expand Down Expand Up @@ -16242,6 +16245,8 @@ $as_echo "#define WITH_AVRESAMPLE 1" >>confdefs.h

fi

AVRESAMPLE_LIBS=$(echo $AVRESAMPLE_LIBS | sed 's/\(.*\) -lrt\(.*\)/\1\2 -lrt/')




Expand Down Expand Up @@ -16880,7 +16885,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by ffms2 $as_me 2.19.0.5, which was
This file was extended by ffms2 $as_me 2.19.2, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -16946,7 +16951,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ffms2 config.status 2.19.0.5
ffms2 config.status 2.19.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down
3 changes: 3 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,9 @@ AS_IF([test x$enable_avresample != xno],
[libavresample="libavresample"
AC_DEFINE([WITH_AVRESAMPLE], [1], [Use avresample])])

dnl See similar thing for LIBAV_LIBS
AVRESAMPLE_LIBS=$(echo $AVRESAMPLE_LIBS | sed 's/\(.*\) -lrt\(.*\)/\1\2 -lrt/')

AC_SUBST([AVRESAMPLE_CFLAGS])
AC_SUBST([AVRESAMPLE_LIBS])
AC_SUBST([libavresample])
Expand Down

0 comments on commit 9203af5

Please sign in to comment.