From 3ac444d2b7266512b53070cdda17e158697c89cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Tue, 6 May 2014 09:28:14 +0000 Subject: [PATCH] openjpeg: Win32-compatible OpenJPEG-2.0 detection OpenJPEG 2.0 API uses stdcall on W32 by default. This prevents normal autoconf library macros from finding its functions. A more compatible check is to acutally link a program that includes a real header. https://bugzilla.gnome.org/show_bug.cgi?id=733487 --- configure.ac | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 839ab7753a..0eccfb39d3 100644 --- a/configure.ac +++ b/configure.ac @@ -2553,7 +2553,18 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_OPENJPEG, true) AG_GST_CHECK_FEATURE(OPENJPEG, [openjpeg library], openjpeg, [ HAVE_OPENJPEG="no" - AG_GST_CHECK_LIBHEADER(OPENJPEG, openjp2, opj_version, ,openjpeg-2.0/openjpeg.h, OPENJPEG_LIBS="-lopenjp2") + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + OPENJPEG_LIBS="-lopenjp2" + LIBS="$LIBS $OPENJPEG_LIBS" + CFLAGS="$CFLAGS $OPENJPEG_CFLAGS" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include ], + [return (int) *opj_version ();]) + ], [HAVE_OPENJPEG=yes], [HAVE_OPENJPEG=no]) + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + if test x"$HAVE_OPENJPEG" = x"no"; then PKG_CHECK_MODULES(OPENJPEG, libopenjpeg1, HAVE_OPENJPEG="yes",