Ticket #18850: patch-configure.diff

File patch-configure.diff, 3.2 KB (added by dbevans (David B. Evans), 16 years ago)

for files directory

  • configure

    old new  
    2612326123if test "x$FFMPEG_OK" = xyes; then
    2612426124    if test -n "$FFMPEG_SEARCH_HEADERS" ; then
    2612526125        CPPFLAGS="-I$FFMPEG_SEARCH_HEADERS"
    26126         as_ac_Header=`echo "ac_cv_header_$FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h" | $as_tr_sh`
    26127 { echo "$as_me:$LINENO: checking for $FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h" >&5
    26128 echo $ECHO_N "checking for $FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h... $ECHO_C" >&6; }
     26126        as_ac_Header=`echo "ac_cv_header_$FFMPEG_SEARCH_HEADERS/libavformat/avformat.h" | $as_tr_sh`
     26127{ echo "$as_me:$LINENO: checking for $FFMPEG_SEARCH_HEADERS/libavformat/avformat.h" >&5
     26128echo $ECHO_N "checking for $FFMPEG_SEARCH_HEADERS/libavformat/avformat.h... $ECHO_C" >&6; }
    2612926129if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    2613026130  echo $ECHO_N "(cached) $ECHO_C" >&6
    2613126131else
     
    2614126141
    2614226142
    2614326143
    26144 #include <$FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h>
     26144#include <$FFMPEG_SEARCH_HEADERS/libavformat/avformat.h>
    2614526145_ACEOF
    2614626146rm -f conftest.$ac_objext
    2614726147if { (ac_try="$ac_compile"
     
    2618726187
    2618826188
    2618926189    else
    26190         { echo "$as_me:$LINENO: checking for ffmpeg/avformat.h" >&5
    26191 echo $ECHO_N "checking for ffmpeg/avformat.h... $ECHO_C" >&6; }
     26190        { echo "$as_me:$LINENO: checking for libavformat/avformat.h" >&5
     26191echo $ECHO_N "checking for libavformat/avformat.h... $ECHO_C" >&6; }
    2619226192if test "${ac_cv_header_ffmpeg_avformat_h+set}" = set; then
    2619326193  echo $ECHO_N "(cached) $ECHO_C" >&6
    2619426194else
     
    2620426204
    2620526205
    2620626206
    26207 #include <ffmpeg/avformat.h>
     26207#include <libavformat/avformat.h>
    2620826208_ACEOF
    2620926209rm -f conftest.$ac_objext
    2621026210if { (ac_try="$ac_compile"
     
    2624126241
    2624226242                CPPFLAGS="-I$SEARCH_DIR_HEADERS"
    2624326243                unset ac_cv_header_ffmpeg_avformat_h
    26244                 as_ac_Header=`echo "ac_cv_header_$SEARCH_DIR_HEADERS/ffmpeg/avformat.h" | $as_tr_sh`
    26245 { echo "$as_me:$LINENO: checking for $SEARCH_DIR_HEADERS/ffmpeg/avformat.h" >&5
    26246 echo $ECHO_N "checking for $SEARCH_DIR_HEADERS/ffmpeg/avformat.h... $ECHO_C" >&6; }
     26244                as_ac_Header=`echo "ac_cv_header_$SEARCH_DIR_HEADERS/libavformat/avformat.h" | $as_tr_sh`
     26245{ echo "$as_me:$LINENO: checking for $SEARCH_DIR_HEADERS/libavformat/avformat.h" >&5
     26246echo $ECHO_N "checking for $SEARCH_DIR_HEADERS/libavformat/avformat.h... $ECHO_C" >&6; }
    2624726247if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    2624826248  echo $ECHO_N "(cached) $ECHO_C" >&6
    2624926249else
     
    2625926259
    2626026260
    2626126261
    26262 #include <$SEARCH_DIR_HEADERS/ffmpeg/avformat.h>
     26262#include <$SEARCH_DIR_HEADERS/libavformat/avformat.h>
    2626326263_ACEOF
    2626426264rm -f conftest.$ac_objext
    2626526265if { (ac_try="$ac_compile"
     
    2684626846
    2684726847                #define __STDC_CONSTANT_MACROS
    2684826848                #include <stdint.h>
    26849                 #include <ffmpeg/avformat.h>
     26849                #include <libavformat/avformat.h>
    2685026850
    2685126851int
    2685226852main ()
     
    2689526895                    #define __STDC_CONSTANT_MACROS
    2689626896                    #include <stdint.h>
    2689726897                    extern "C" {
    26898                         #include <ffmpeg/avformat.h>
     26898                        #include <libavformat/avformat.h>
    2689926899                    }
    2690026900
    2690126901int