diff options
Diffstat (limited to 'mediaplugin/src/plugins/media/ffmpeg/configure')
| -rwxr-xr-x | mediaplugin/src/plugins/media/ffmpeg/configure | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/mediaplugin/src/plugins/media/ffmpeg/configure b/mediaplugin/src/plugins/media/ffmpeg/configure index b47f5bf6..3c45e448 100755 --- a/mediaplugin/src/plugins/media/ffmpeg/configure +++ b/mediaplugin/src/plugins/media/ffmpeg/configure @@ -2497,8 +2497,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # find tools # ----------------------------------------- -#LT_INIT - # options for make command { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } @@ -4011,13 +4009,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4014: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4012: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4017: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4015: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4020: output\"" >&5) + (eval echo "\"\$as_me:4018: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5223,7 +5221,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5226 "configure"' > conftest.$ac_ext + echo '#line 5224 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6748,11 +6746,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6751: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6749: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6755: \$? = $ac_status" >&5 + echo "$as_me:6753: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7087,11 +7085,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7090: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7088: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7094: \$? = $ac_status" >&5 + echo "$as_me:7092: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7192,11 +7190,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7195: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7193: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7199: \$? = $ac_status" >&5 + echo "$as_me:7197: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7247,11 +7245,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7250: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7248: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7254: \$? = $ac_status" >&5 + echo "$as_me:7252: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9631,7 +9629,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9634 "configure" +#line 9632 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9727,7 +9725,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9730 "configure" +#line 9728 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10598,7 +10596,7 @@ fi # check for compilers # ----------------------------------------- -#AC_CANONICAL_HOST + # find and test the C compiler (for C-libs and wrappers) ac_ext=c @@ -13681,11 +13679,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13684: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13682: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13688: \$? = $ac_status" >&5 + echo "$as_me:13686: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13780,11 +13778,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13783: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13781: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13787: \$? = $ac_status" >&5 + echo "$as_me:13785: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13832,11 +13830,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13835: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13833: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13839: \$? = $ac_status" >&5 + echo "$as_me:13837: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15045,6 +15043,14 @@ fi # adds a preprocessor definition +case "${host_os}" in + darwin*) + CPPFLAGS="-arch i386" + CFLAGS="-arch i386" + CXXFLAGS="-arch i386" + ;; +esac + # ----------------------------------------- # check for libraries # ----------------------------------------- |