diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-29 15:40:44 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-29 15:40:44 +0100 |
| commit | d18314fa05a078867b530268de546af2a7d154e4 (patch) | |
| tree | e4707530406cca98b9b97fd66c8ef0e5bc154fe5 /m4 | |
| parent | 26a9ce7b2927f2fc79af46c3152fbc41ee602197 (diff) | |
| download | mpd-d18314fa05a078867b530268de546af2a7d154e4.tar.gz mpd-d18314fa05a078867b530268de546af2a7d154e4.tar.xz mpd-d18314fa05a078867b530268de546af2a7d154e4.zip | |
faad.m4: remove faad --with-* options
Some of these are not implemented properly and never worked. And the
others are not useful; you can easily set environment variables
instead.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/faad.m4 | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/m4/faad.m4 b/m4/faad.m4 index 7b5daabb1..c3813464e 100644 --- a/m4/faad.m4 +++ b/m4/faad.m4 @@ -8,33 +8,9 @@ AC_ARG_ENABLE(aac, [disable AAC support (default: enable)]),, enable_aac=yes) -AC_ARG_WITH(faad, - AS_HELP_STRING([--with-faad=PFX], - [prefix where faad2 is installed (optional)]),, - faad_prefix="") -AC_ARG_WITH(faad-libraries, - AS_HELP_STRING([--with-faad-libraries=DIR], - [directory where faad2 library is installed (optional)]),, - faad_libraries="") -AC_ARG_WITH(faad-includes, - AS_HELP_STRING([--with-faad-includes=DIR], - [directory where faad2 header files are installed (optional)]),, - faad_includes="") - if test x$enable_aac = xyes; then - if test "x$faad_libraries" != "x" ; then - FAAD_LIBS="-L$faad_libraries" - elif test "x$faad_prefix" != "x" ; then - FAAD_LIBS="-L$faad_prefix/lib" - fi - - FAAD_LIBS="$FAAD_LIBS -lfaad" - - if test "x$faad_includes" != "x" ; then - FAAD_CFLAGS="-I$faad_includes" - elif test "x$faad_prefix" != "x" ; then - FAAD_CFLAGS="-I$faad_prefix/include" - fi + FAAD_LIBS="-lfaad" + FAAD_CFLAGS="" oldcflags=$CFLAGS oldlibs=$LIBS |