Commit 5dfec30a authored by mru's avatar mru

merge print_config_enable() and print_config() as only the former is used


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9325 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 238a942e
...@@ -310,23 +310,17 @@ print_config(){ ...@@ -310,23 +310,17 @@ print_config(){
makefile=$3 makefile=$3
shift 3 shift 3
for cfg; do for cfg; do
ucname="`toupper $cfg`"
if enabled $cfg; then if enabled $cfg; then
ucname="${pfx}`toupper $cfg`" echo "#define ${pfx}${ucname} 1" >> $header
echo "#define ${ucname} 1" >> $header echo "#define ENABLE_${ucname} 1" >> $header
echo "${ucname}=yes" >> $makefile echo "${pfx}${ucname}=yes" >> $makefile
else
echo "#define ENABLE_${ucname} 0" >> $header
fi fi
done done
} }
print_config_enable(){
print_config $@
shift 3
for cfg; do
enabled $cfg && val=1 || val=0
echo "#define ENABLE_`toupper $cfg` $val" >> $header
done
}
flags_saved(){ flags_saved(){
(: ${SAVE_CFLAGS?}) 2>/dev/null (: ${SAVE_CFLAGS?}) 2>/dev/null
} }
...@@ -2030,9 +2024,9 @@ fi ...@@ -2030,9 +2024,9 @@ fi
echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak echo "LIB_INSTALL_EXTRA_CMD=${LIB_INSTALL_EXTRA_CMD}" >> config.mak
echo "EXTRALIBS=$extralibs" >> config.mak echo "EXTRALIBS=$extralibs" >> config.mak
print_config_enable ARCH_ $TMPH config.mak $ARCH_LIST print_config ARCH_ $TMPH config.mak $ARCH_LIST
print_config_enable HAVE_ $TMPH config.mak $HAVE_LIST print_config HAVE_ $TMPH config.mak $HAVE_LIST
print_config_enable CONFIG_ $TMPH config.mak $CONFIG_LIST \ print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \
$DECODER_LIST \ $DECODER_LIST \
$ENCODER_LIST \ $ENCODER_LIST \
$PARSER_LIST \ $PARSER_LIST \
......
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