On 20/01/13 16:36, Brad Smith wrote:
> On Sun, Jan 20, 2013 at 07:09:31AM -0500, Brad Smith wrote:
>> The following diff is to fix the detection of the libgsm header in the
>> standard location. OpenBSD/FreeBSD/NetBSD only provide the header in
>> the standard location and are patching Libav/FFmpeg to allow the libgsm
>> to build. Some OS's based on Linux provide a symlink but when I looked
>> around almost all OS's provide the header in the standard location
>> (.e.g. PREFIX/include/gsm.h)
>
> And here was what I meant to submit.
>
> diff --git a/configure b/configure
> index b4ffbe6..44b706e 100755
> --- a/configure
> +++ b/configure
> @@ -1235,6 +1235,8 @@ HAVE_LIST="
> getservbyport
> gettimeofday
> gnu_as
> + gsm_h
> + gsm_gsm_h
The second is not necessary
> ibm_asm
> inet_aton
> io_h
> @@ -3408,6 +3410,8 @@ check_header direct.h
> check_header dlfcn.h
> check_header dxva.h
> check_header dxva2api.h
> +check_header gsm.h
> +check_header gsm/gsm.h
none of those are required
> check_header io.h
> check_header malloc.h
> check_header poll.h
> @@ -3474,7 +3478,9 @@ enabled gnutls && require_pkg_config gnutls
> gnutls/gnutls.h gnutls_global_in
> enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion
> -lfaac
> enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen
> -lfdk-aac
> enabled libfreetype && require_pkg_config freetype2 "ft2build.h
> freetype/freetype.h" FT_Init_FreeType
> -enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
> +enabled libgsm && { { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
> + check_lib "${gsm_hdr}" gsm_create -lgsm && break;
> done } ||
> + die "ERROR: libgsm not found"; }
Why not using require2?
Beside those small details the idea behind it is fine to me. Thank you
lu
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
