Commit 6129f1ce authored by Eric Petit's avatar Eric Petit

contrib system adapted for BeOS (need to set LIBRARY_PATH and BELIBRARIES)

parent 23d3f63c
......@@ -34,9 +34,14 @@ ACLOCAL_ARGS="-I m4"
# Check for contrib directory
if test -d extras/contrib/bin; then
export PATH=./extras/contrib/bin:$PATH
export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
if test ".`uname -s`" = ".Darwin"; then
export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
elif test ".`uname -s`" = ".BeOS"; then
export LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH
export BELIBRARIES=./extras/contrib/lib:$BELIBRARIES
fi
fi
# Check for automake
......
......@@ -69,8 +69,6 @@ dnl
topdir="`pwd`"
if test -d ${topdir}/extras/contrib/lib; then
export PATH=${topdir}/extras/contrib/bin:$PATH
export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$DYLD_LIBRARY_PATH
CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
CPPFLAGS_save="${CPPFLAGS_save} -I${topdir}/extras/contrib/include"
CFLAGS="${CFLAGS} -I${topdir}/extras/contrib/include"
......@@ -87,6 +85,13 @@ if test -d ${topdir}/extras/contrib/lib; then
LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib"
with_livedotcom_tree=${topdir}/extras/contrib/src/live
with_goom_tree=${topdir}/extras/contrib/src/goom
if test ".`uname -s`" = ".Darwin"; then
export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$DYLD_LIBRARY_PATH
elif test ".`uname -s`" = ".BeOS"; then
export LIBRARY_PATH=${topdir}/extras/contrib/lib:$LIBRARY_PATH
export BELIBRARIES=${topdir}/extras/contrib/lib:$BELIBRARIES
fi
fi
dnl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment