From 42a167fe20ee609a832c27f4b23fee884037c90f Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Wed, 26 May 2004 20:20:22 +0000 Subject: [PATCH] use $libdir instead of $prefix/lib to find library dir --- configure.in | 2 +- src/libFLAC++/libFLAC++.m4 | 2 +- src/libFLAC/libFLAC.m4 | 2 +- src/libOggFLAC++/libOggFLAC++.m4 | 2 +- src/libOggFLAC/libOggFLAC.m4 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 1114916..71f8c6a 100644 --- a/configure.in +++ b/configure.in @@ -46,7 +46,7 @@ AC_ARG_ENABLE(id3libtest, [ --disable-id3libtest Do not try to compile an elif test "x$id3lib_prefix" != "x" ; then ID3LIB_LIBS="-L$id3lib_prefix/lib" elif test "x$prefix" != "xNONE" ; then - ID3LIB_LIBS="-L$prefix/lib" + ID3LIB_LIBS="-L$libdir" fi ID3LIB_LIBS="$ID3LIB_LIBS -lid3" diff --git a/src/libFLAC++/libFLAC++.m4 b/src/libFLAC++/libFLAC++.m4 index 7620606..bae7835 100644 --- a/src/libFLAC++/libFLAC++.m4 +++ b/src/libFLAC++/libFLAC++.m4 @@ -19,7 +19,7 @@ AC_ARG_ENABLE(libFLACPPtest, [ --disable-libFLACPPtest Do not try to comp elif test "x$libFLACPP_prefix" != "x" ; then LIBFLACPP_LIBS="-L$libFLACPP_prefix/lib" elif test "x$prefix" != "xNONE" ; then - LIBFLACPP_LIBS="-L$prefix/lib" + LIBFLACPP_LIBS="-L$libdir" fi LIBFLACPP_LIBS="$LIBFLACPP_LIBS -lFLAC++ $LIBFLAC_LIBS" diff --git a/src/libFLAC/libFLAC.m4 b/src/libFLAC/libFLAC.m4 index 88d8e84..c2ed03d 100644 --- a/src/libFLAC/libFLAC.m4 +++ b/src/libFLAC/libFLAC.m4 @@ -18,7 +18,7 @@ AC_ARG_ENABLE(libFLACtest, [ --disable-libFLACtest Do not try to compile elif test "x$libFLAC_prefix" != "x" ; then LIBFLAC_LIBS="-L$libFLAC_prefix/lib" elif test "x$prefix" != "xNONE" ; then - LIBFLAC_LIBS="-L$prefix/lib" + LIBFLAC_LIBS="-L$libdir" fi LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm" diff --git a/src/libOggFLAC++/libOggFLAC++.m4 b/src/libOggFLAC++/libOggFLAC++.m4 index ead89d6..aa03399 100644 --- a/src/libOggFLAC++/libOggFLAC++.m4 +++ b/src/libOggFLAC++/libOggFLAC++.m4 @@ -19,7 +19,7 @@ AC_ARG_ENABLE(libOggFLACPPtest, [ --disable-libOggFLACPPtest Do not try t elif test "x$libOggFLACPP_prefix" != "x" ; then LIBOGGFLACPP_LIBS="-L$libOggFLACPP_prefix/lib" elif test "x$prefix" != "xNONE" ; then - LIBOGGFLACPP_LIBS="-L$prefix/lib" + LIBOGGFLACPP_LIBS="-L$libdir" fi LIBOGGFLACPP_LIBS="$LIBOGGFLACPP_LIBS -lOggFLAC++ $LIBOGGFLAC_LIBS" diff --git a/src/libOggFLAC/libOggFLAC.m4 b/src/libOggFLAC/libOggFLAC.m4 index 5ce8bda..ff03be1 100644 --- a/src/libOggFLAC/libOggFLAC.m4 +++ b/src/libOggFLAC/libOggFLAC.m4 @@ -18,7 +18,7 @@ AC_ARG_ENABLE(libOggFLACtest, [ --disable-libOggFLACtest Do not try to co elif test "x$libOggFLAC_prefix" != "x" ; then LIBOGGFLAC_LIBS="-L$libOggFLAC_prefix/lib" elif test "x$prefix" != "xNONE" ; then - LIBOGGFLAC_LIBS="-L$prefix/lib" + LIBOGGFLAC_LIBS="-L$libdir" fi LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm" -- 2.7.4