ffmpeg | branch: master | Ricardo Constantino <wiia...@gmail.com> | Fri Jun 23 
01:53:37 2017 +0100| [0bf857a13fd5a9ae1f5c3f15e1d16d91a0213a26] | committer: wm4

configure: use pkg-config for libgme, if available

The pkg-config file is relatively new (2013), so some distros might
not have it yet. And the -lstdc++ being required for the static lib
is only present since the last release in December 2016.

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

 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 1c65b536d5..1704fc30af 100755
--- a/configure
+++ b/configure
@@ -5841,7 +5841,8 @@ enabled fontconfig        && enable libfontconfig
 enabled libfontconfig     && require_pkg_config fontconfig 
"fontconfig/fontconfig.h" FcInit
 enabled libfreetype       && require_pkg_config freetype2 "ft2build.h 
FT_FREETYPE_H" FT_Init_FreeType
 enabled libfribidi        && require_pkg_config fribidi fribidi.h 
fribidi_version_info
-enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme 
-lstdc++
+enabled libgme            && { use_pkg_config libgme gme/gme.h gme_new_emu ||
+                               require libgme gme/gme.h gme_new_emu -lgme 
-lstdc++; }
 enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
                                    check_lib libgsm "${gsm_hdr}" gsm_create 
-lgsm && break;
                                done || die "ERROR: libgsm not found"; }

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to