summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-04 23:29:41 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-12-04 23:29:41 +0000
commitadc876c7c04b5e35accd89559913b624d58312f5 (patch)
tree3271c725ccb3e684df17b28f0a2cae27c68aa1a8 /configure
parented8794eefa6ee1ac9c7a9ccfa99a0875f255b9c4 (diff)
downloadmpv-adc876c7c04b5e35accd89559913b624d58312f5.tar.bz2
mpv-adc876c7c04b5e35accd89559913b624d58312f5.tar.xz
a little (my first!) patch to add some info about MPlayer on Irix 6.5 to
documentation.html and some changes to the configure script + Makefile to support optional different "install" location and change ranlib to ar when Irix is detected. Steffen Boelaars <mplayer.development@graphicscave.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8354 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure16
1 files changed, 15 insertions, 1 deletions
diff --git a/configure b/configure
index 81a572d30d..e2efdc2435 100755
--- a/configure
+++ b/configure
@@ -222,6 +222,9 @@ Miscellaneous options:
--language=xx select a language (for translated messages/gui) [en]
(Available: $LANGUAGES)
--enable-shared-pp install & use shared postprocessing lib
+ --install-path=PATH the path to a custom install program (useful if
+ your OS uses a GNU-incompatible install utility by
+ default and you want to point to the GNU version)
Advanced options:
--enable-mmx build with mmx support [autodetect]
@@ -272,6 +275,8 @@ done # for parm in ...
# 1st pass checking for vital options
+_install=install
+_ranlib=ranlib
_cc=gcc
test "$CC" && _cc="$CC"
_as=auto
@@ -315,6 +320,9 @@ for ac_option do
--disable-runtime-cpudetection)
_runtime_cpudetection=no
;;
+ --install-path=*)
+ _install=`echo $ac_option | cut -d '=' -f 2 | sed 's/\/$//'`"/install"
+ ;;
esac
done
@@ -1036,6 +1044,7 @@ for ac_option do
--with-extralibdir=*) ;;
--enable-runtime-cpudetection) ;;
--disable-runtime-cpudetection) ;;
+ --install-path=*) ;;
# Real 2nd pass
--enable-mencoder) _mencoder=yes ;;
@@ -1474,6 +1483,10 @@ die "no awk"
fi
fi
+# If IRIX we must use ar instead of ranlib (not present on IRIX systems)
+if irix ; then
+ _ranlib='ar -r'
+fi
######################
# MAIN TESTS GO HERE #
@@ -4570,7 +4583,8 @@ LIBDIR = \$(DESTDIR)$_libdir
#AR = ar
CC = $_cc
AWK = $_awk
-RANLIB = ranlib
+RANLIB = $_ranlib
+INSTALL = $_install
# OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math
OPTFLAGS = $CFLAGS
EXTRA_INC = $_inc_extra $_inc_gtk