Browse Source

Rename --cross-compile option to --enable-cross-compile.

Allows handling the option in a more standard fashion.

Originally committed as revision 12586 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Diego Biurrun 17 years ago
parent
commit
db6107b68f
1 changed files with 3 additions and 4 deletions
  1. +3
    -4
      configure

+ 3
- 4
configure View File

@@ -107,7 +107,7 @@ show_help(){
echo "Advanced options (experts only):" echo "Advanced options (experts only):"
echo " --source-path=PATH path to source code [$source_path]" echo " --source-path=PATH path to source code [$source_path]"
echo " --cross-prefix=PREFIX use PREFIX for compilation tools [$cross_prefix]" echo " --cross-prefix=PREFIX use PREFIX for compilation tools [$cross_prefix]"
echo " --cross-compile assume a cross-compiler is used"
echo " --enable-cross-compile assume a cross-compiler is used"
echo " --target-os=OS compiler targets OS [$targetos]" echo " --target-os=OS compiler targets OS [$targetos]"
echo " --cc=CC use C compiler CC [$cc]" echo " --cc=CC use C compiler CC [$cc]"
echo " --make=MAKE use specified make [$make]" echo " --make=MAKE use specified make [$make]"
@@ -770,6 +770,7 @@ CMDLINE_SELECT="
$ARCH_EXT_LIST $ARCH_EXT_LIST
$CONFIG_LIST $CONFIG_LIST
$THREADS_LIST $THREADS_LIST
cross_compile
debug debug
extra_warnings extra_warnings
logging logging
@@ -1008,8 +1009,6 @@ for opt do
;; ;;
--cross-prefix=*) cross_prefix="$optval" --cross-prefix=*) cross_prefix="$optval"
;; ;;
--cross-compile) enable cross_compile
;;
--target-os=*) targetos="$optval" --target-os=*) targetos="$optval"
;; ;;
--cc=*) cc="$optval" --cc=*) cc="$optval"
@@ -1486,7 +1485,7 @@ EOF
if test "$?" != 0; then if test "$?" != 0; then
echo "$cc is unable to create an executable file." echo "$cc is unable to create an executable file."
if test -z "$cross_prefix" && ! enabled cross_compile ; then if test -z "$cross_prefix" && ! enabled cross_compile ; then
echo "If $cc is a cross-compiler, use the --cross-compile option."
echo "If $cc is a cross-compiler, use the --enable-cross-compile option."
echo "Only do this if you know what cross compiling means." echo "Only do this if you know what cross compiling means."
fi fi
die "C compiler test failed." die "C compiler test failed."


Loading…
Cancel
Save