[FFmpeg-devel] [PATCH] Revert "configure: Support preprocessor macros as header names"

Alexander Strasser eclipse7 at gmx.net
Fri Jan 31 13:54:49 CET 2014


On 2014-01-08 22:36 +0100, Alexander Strasser wrote:
> This reverts commit 52ccc4a0ece88030e67254418317d72089a0ecc8
> 
> The libfreetype test was fixed a month ago in FFmpeg
> 
> Chances are that similar checks will never be needed. No need
> to modify the generic code for now.
> 
> The reverted commit is not working as expected with header
> names that do not end in ".h" as often seen for C++ headers.
> 
> It lacks documentation and is potentially not understandable
> for people that need to extend the configure script (which
> are often no experts for FFmpeg configure).
> 
> Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
> ---
>  configure | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)

  Hmm, if I see no comments I will push soon.

  Alexander

> diff --git a/configure b/configure
> index 1cc9ab1..f0c029d 100755
> --- a/configure
> +++ b/configure
> @@ -845,13 +845,6 @@ check_ld(){
>      check_cmd $ld $LDFLAGS $flags $(ld_o $TMPE) $TMPO $libs $extralibs
>  }
>  
> -print_include(){
> -    hdr=$1
> -    test "${hdr%.h}" = "${hdr}" &&
> -        echo "#include $hdr"    ||
> -        echo "#include <$hdr>"
> -}
> -
>  check_code(){
>      log check_code "$@"
>      check=$1
> @@ -860,7 +853,7 @@ check_code(){
>      shift 3
>      {
>          for hdr in $headers; do
> -            print_include $hdr
> +            echo "#include <$hdr>"
>          done
>          echo "int main(void) { $code; return 0; }"
>      } | check_$check "$@"
> @@ -963,7 +956,7 @@ check_func_headers(){
>      shift 2
>      {
>          for hdr in $headers; do
> -            print_include $hdr
> +            echo "#include <$hdr>"
>          done
>          for func in $funcs; do
>              echo "long check_$func(void) { return (long) $func; }"
> -- 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140131/b9f1355c/attachment.asc>


More information about the ffmpeg-devel mailing list