Commit 8a608357 authored by Måns Rullgård's avatar Måns Rullgård

reorder setting of defaults by category

Originally committed as revision 7861 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d0115a26
...@@ -588,14 +588,19 @@ TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S" ...@@ -588,14 +588,19 @@ TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h" TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
# default parameters # default parameters
logging="yes" logging="yes"
logfile="config.err" logfile="config.err"
# installation paths
PREFIX="/usr/local" PREFIX="/usr/local"
libdir='${PREFIX}/lib' libdir='${PREFIX}/lib'
shlibdir="$libdir" shlibdir="$libdir"
incdir='${PREFIX}/include/ffmpeg' incdir='${PREFIX}/include/ffmpeg'
mandir='${PREFIX}/man' mandir='${PREFIX}/man'
bindir='${PREFIX}/bin' bindir='${PREFIX}/bin'
# toolchain
cross_prefix="" cross_prefix=""
cross_compile="no" cross_compile="no"
cc="gcc" cc="gcc"
...@@ -603,6 +608,9 @@ ar="ar" ...@@ -603,6 +608,9 @@ ar="ar"
ranlib="ranlib" ranlib="ranlib"
make="make" make="make"
strip="strip" strip="strip"
asmalign_pot="unknown"
# machine
arch=`uname -m` arch=`uname -m`
cpu="generic" cpu="generic"
powerpc_perf="no" powerpc_perf="no"
...@@ -615,6 +623,8 @@ iwmmxt="default" ...@@ -615,6 +623,8 @@ iwmmxt="default"
altivec="default" altivec="default"
dcbzl="no" dcbzl="no"
mmi="default" mmi="default"
bigendian="no"
case "$arch" in case "$arch" in
i386|i486|i586|i686|i86pc|BePC) i386|i486|i586|i686|i86pc|BePC)
arch="x86_32" arch="x86_32"
...@@ -669,24 +679,36 @@ case "$arch" in ...@@ -669,24 +679,36 @@ case "$arch" in
arch="unknown" arch="unknown"
;; ;;
esac esac
gprof="no"
video4linux="yes" # OS
video4linux2="yes" beos_netserver="no"
bktr="no" mingw32="no"
audio_oss="yes" os2="no"
wince="no"
# non-library system interfaces
audio_beos="no" audio_beos="no"
x11grab="no" audio_oss="yes"
bktr="no"
dv1394="yes" dv1394="yes"
video4linux2="yes"
video4linux="yes"
# libraries
amr_if2="no"
amr_nb="no"
amr_nb_fixed="no"
amr_wb="no"
avisynth="no"
dc1394="no" dc1394="no"
network="yes" dlfcn_h="no"
ipv6="yes" dlopen="no"
zlib="yes"
liba52="no" liba52="no"
liba52bin="no" liba52bin="no"
libdts="no" libdts="no"
libfaac="no" libfaac="no"
libfaad="no"
libfaad2="no" libfaad2="no"
libfaad="no"
libfaadbin="no" libfaadbin="no"
libgsm="no" libgsm="no"
libmp3lame="no" libmp3lame="no"
...@@ -694,32 +716,44 @@ libnut="no" ...@@ -694,32 +716,44 @@ libnut="no"
libogg="no" libogg="no"
libtheora="no" libtheora="no"
libvorbis="no" libvorbis="no"
xvid="no" mlib="no"
x11grab="no"
x264="no" x264="no"
pp="no" xvid="no"
mingw32="no" zlib="yes"
wince="no"
os2="no" # configurable options
lstatic="yes"
lshared="no"
optimize="yes"
debug="yes" debug="yes"
extrawarnings="no"
dostrip="yes" dostrip="yes"
extralibs="-lm" extrawarnings="no"
bigendian="no" ffmpeg="yes"
vhook="default" ffplay="yes"
avisynth="no" ffserver="yes"
dlfcn_h="no" gpl="no"
dlopen="no" gprof="no"
ipv6="yes"
lshared="no"
lstatic="yes"
memalign_hack="no"
mpegaudio_hp="yes" mpegaudio_hp="yes"
network="yes"
optimize="yes"
pp="no"
protocols="yes"
swscaler="no"
vhook="default"
# threading
beosthreads="no"
os2threads="no"
pthreads="no"
w32threads="no"
thread_type="no"
# build settings
extralibs="-lm"
SHFLAGS='-shared -Wl,-soname,$@' SHFLAGS='-shared -Wl,-soname,$@'
VHOOKSHFLAGS='$(SHFLAGS)' VHOOKSHFLAGS='$(SHFLAGS)'
beos_netserver="no"
protocols="yes"
ffmpeg="yes"
ffserver="yes"
ffplay="yes"
LIBOBJFLAGS="" LIBOBJFLAGS=""
FFLDFLAGS=-Wl,--warn-common FFLDFLAGS=-Wl,--warn-common
LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
...@@ -735,20 +769,6 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)' ...@@ -735,20 +769,6 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)' SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
EXESUF="" EXESUF=""
BUILDSUF="" BUILDSUF=""
amr_nb="no"
amr_wb="no"
amr_nb_fixed="no"
amr_if2="no"
mlib="no"
beosthreads="no"
os2threads="no"
pthreads="no"
w32threads="no"
thread_type="no"
swscaler="no"
gpl="no"
memalign_hack="no"
asmalign_pot="unknown"
LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(libdir)/$(LIB)"' LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(libdir)/$(LIB)"'
# OS specific # OS specific
......
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