From 46d93cfefefd921ce1adf4e40c25f9177cb152b4 Mon Sep 17 00:00:00 2001 From: darkeye Date: Sun, 9 Sep 2001 11:43:55 +0000 Subject: [PATCH] new version 0.5 do not add extra include and library path to gcc if lame was found in /usr --- darkice/trunk/configure.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/darkice/trunk/configure.in b/darkice/trunk/configure.in index 77d6463..3e76896 100644 --- a/darkice/trunk/configure.in +++ b/darkice/trunk/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/DarkIce.cpp) -AM_INIT_AUTOMAKE(darkice, 0.4) +AM_INIT_AUTOMAKE(darkice, 0.5) AM_CONFIG_HEADER(config.h) @@ -34,8 +34,12 @@ AC_ARG_WITH(lame-prefix, LA_SEARCH_LIB(LAME_LIB_LOC, LAME_INC_LOC, libmp3lame.a, lame/lame.h, ${CONFIG_LAME_PREFIX}) if test "x${LAME_LIB_LOC}" != "x" ; then AC_DEFINE(HAVE_LAME_LIB, 1, build with lame library calls) - LAME_INCFLAGS="-I${LAME_INC_LOC}" - LAME_LDFLAGS="-Wl,--rpath -Wl,${LAME_LIB_LOC} -lmp3lame" + if test "x${LAME_INC_LOC}" != "x/usr/include" ; then + LAME_INCFLAGS="-I${LAME_INC_LOC}" + LAME_LDFLAGS="-Wl,--rpath -Wl,${LAME_LIB_LOC} -lmp3lame" + else + LAME_LDFLAGS="-lmp3lame" + fi AC_MSG_RESULT( "lame found at ${LAME_LIB_LOC}") else AC_MSG_ERROR( "lame library not found")