From 9dae1e9714c0ddaeb6f666a13839be16d37f7335 Mon Sep 17 00:00:00 2001 From: darkeye Date: Sun, 2 Sep 2001 12:02:29 +0000 Subject: [PATCH] changed default lame install dir from /usr/local to /usr --- darkice/trunk/INSTALL | 7 ++++--- darkice/trunk/configure.in | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/darkice/trunk/INSTALL b/darkice/trunk/INSTALL index c735e1e..6b69587 100644 --- a/darkice/trunk/INSTALL +++ b/darkice/trunk/INSTALL @@ -51,7 +51,7 @@ DarkIce tarball. Go to the directory you extracted it, and try: This will give you all the compile configuration options. Options of particlar interest are: - --with-lame-prefix=DIR alternate location for lame [/usr/local] + --with-lame-prefix=DIR alternate location for lame [/usr] files looked for: LAME-PREFIX/lib/libmp3lame.a LAME-PREFIX/include/lame/lame.h --enable-static link everything into the executable statically [no] @@ -66,9 +66,10 @@ if you plan to deploy DarkIce on a system where either the Lame shared object is not installed or its location is unknown. In general it is a better idea to link dynamically (not using this option). -If chosing the default compile options, compilation is done as follows: +If chosing the default compile options, with lame installed under /usr/local, +compilation is done as follows: -./configure +./configure --with-lame-prefix=/usr/local make make install diff --git a/darkice/trunk/configure.in b/darkice/trunk/configure.in index c0ce8b6..ce919ae 100644 --- a/darkice/trunk/configure.in +++ b/darkice/trunk/configure.in @@ -25,10 +25,10 @@ dnl checkin for lame library AC_MSG_CHECKING(lame library) WARNING= AC_ARG_WITH(lame-prefix, -[ --with-lame-prefix=DIR alternate location for lame [/usr/local] +[ --with-lame-prefix=DIR alternate location for lame [/usr] files looked for: LAME-PREFIX/lib/libmp3lame.a LAME-PREFIX/include/lame/lame.h], - CONFIG_LAME_PREFIX="${withval}", CONFIG_LAME_PREFIX="/usr/local") + CONFIG_LAME_PREFIX="${withval}", CONFIG_LAME_PREFIX="/usr") if test "x${CONFIG_LAME_PREFIX}" != "x" ; then # look for lame lib. This overrides any standard location LA_SEARCH_LIB(LAME_LIB_LOC, LAME_INC_LOC, libmp3lame.a, lame/lame.h, ${CONFIG_LAME_PREFIX})