[FFmpeg-cvslog] configure: Support preprocessor macros as header names

Diego Biurrun git at videolan.org
Tue Jun 3 01:01:50 CEST 2014


ffmpeg | branch: release/0.10 | Diego Biurrun <diego at biurrun.de> | Mon Dec 23 01:03:48 2013 +0100| [7b00340f97f2d9456a0e6d6cee4c1a92165cde91] | committer: Luca Barbato

configure: Support preprocessor macros as header names

New versions of FreeType have moved the location of their API
header(s) and hide the location behind a macro.

Since the location changes between versions and no other way
to know the location exists, this workaround becomes necessary.

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
(cherry picked from commit 52ccc4a0ece88030e67254418317d72089a0ecc8)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

Conflicts:
	configure

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b00340f97f2d9456a0e6d6cee4c1a92165cde91
---

 configure |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 844069b..f9eac08 100755
--- a/configure
+++ b/configure
@@ -654,6 +654,13 @@ check_ld(){
     check_cmd $ld $LDFLAGS $flags -o $TMPE $TMPO $libs $extralibs
 }
 
+print_include(){
+    hdr=$1
+    test "${hdr%.h}" = "${hdr}" &&
+        echo "#include $hdr"    ||
+        echo "#include <$hdr>"
+}
+
 check_cppflags(){
     log check_cppflags "$@"
     set -- $($filter_cppflags "$@")
@@ -723,7 +730,7 @@ check_func_headers(){
     shift 2
     {
         for hdr in $headers; do
-            echo "#include <$hdr>"
+            print_include $hdr
         done
         for func in $funcs; do
             echo "long check_$func(void) { return (long) $func; }"



More information about the ffmpeg-cvslog mailing list