diff options
| author | Steve Kondik <shade@chemlab.org> | 2014-07-25 05:33:22 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-07-25 05:33:22 -0700 |
| commit | a05c01b7806ce0ff2b110ad36dbfe5727cb8cd4f (patch) | |
| tree | a5d0d048e3976331e7001ed2eea256c67dc10b2a /libFLAC/libFLAC.m4 | |
| parent | d3c04b5f963ef86e1aeb74656151f175aefa4c48 (diff) | |
| download | android_external_flac-stable/cm-11.0-XNF9X.tar.gz android_external_flac-stable/cm-11.0-XNF9X.tar.bz2 android_external_flac-stable/cm-11.0-XNF9X.zip | |
Upgrade to libFLAC 1.3.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0
Change-Id: Ibd991640b7c85a96f4d1a43381acd199a6d197fd
Diffstat (limited to 'libFLAC/libFLAC.m4')
| -rw-r--r-- | libFLAC/libFLAC.m4 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libFLAC/libFLAC.m4 b/libFLAC/libFLAC.m4 index 24eb0c5..da7354e 100644 --- a/libFLAC/libFLAC.m4 +++ b/libFLAC/libFLAC.m4 @@ -14,14 +14,18 @@ AC_ARG_WITH(libFLAC-includes,[ --with-libFLAC-includes=DIR Directory where li AC_ARG_ENABLE(libFLACtest, [ --disable-libFLACtest Do not try to compile and run a test libFLAC program],, enable_libFLACtest=yes) if test "x$libFLAC_libraries" != "x" ; then - LIBFLAC_LIBDIR="$libFLAC_libraries" + LIBFLAC_LIBS="-L$libFLAC_libraries" + elif test "x$libFLAC_prefix" = "xno" || test "x$libFLAC_prefix" = "xyes" ; then + LIBFLAC_LIBS="" elif test "x$libFLAC_prefix" != "x" ; then - LIBFLAC_LIBDIR="$libFLAC_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - LIBFLAC_LIBDIR="$libdir" + LIBFLAC_LIBS="-L$libFLAC_prefix/lib" + elif test "x$prefix" != "xNONE"; then + LIBFLAC_LIBS="-L$prefix/lib" fi - LIBFLAC_LIBS="-L$LIBFLAC_LIBDIR -lFLAC $OGG_LIBS -lm" + if test "x$libFLAC_prefix" != "xno" ; then + LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC $OGG_LIBS -lm" + fi if test "x$libFLAC_includes" != "x" ; then LIBFLAC_CFLAGS="-I$libFLAC_includes" |