aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Revol <revol@free.fr>2007-02-08 22:51:26 +0000
committerFrançois Revol <revol@free.fr>2007-02-08 22:51:26 +0000
commit74cec57d8e892ff8ac6d8e570b634ae8d7e94a9f (patch)
tree67f1364469f9e7b4ed1eb0510965fbef5fc4eadf
parentfbabf1e0b600ac5e2a4ad85ac1c5dc38b0dfc7ef (diff)
downloadffmpeg-74cec57d8e892ff8ac6d8e570b634ae8d7e94a9f.tar.gz
BeOS specifics: check for Haiku & Zeta (for the future); ignore ldconfig, it just runs here :) ; comment about network checks.
Originally committed as revision 7886 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index 741362baec..709ff5da36 100755
--- a/configure
+++ b/configure
@@ -774,8 +774,8 @@ LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(libdir)/$(LIB)"'
# OS specific
targetos=`uname -s`
case $targetos in
- BeOS)
- PREFIX="/boot/home/config"
+ BeOS|Haiku|Zeta)
+ PREFIX="$HOME/config"
# helps building libavcodec
add_cflags "-DPIC -fomit-frame-pointer"
# 3 gcc releases known for BeOS, each with ugly bugs
@@ -788,6 +788,7 @@ case $targetos in
add_cflags "-fno-expensive-optimizations"
;;
esac
+ LDCONFIG="echo ignoring ldconfig"
SHFLAGS=-nostart
# disable Linux things
audio_oss="no"
@@ -798,6 +799,7 @@ case $targetos in
audio_beos="yes"
# no need for libm, but the inet stuff
# Check for BONE
+ # XXX: actually should check for NOT net_server
if (echo $BEINCLUDES|grep 'headers/be/bone' >/dev/null); then
extralibs="-lbind -lsocket"
else