$OpenBSD: patch-configure_ac,v 1.11 2012/04/08 07:37:25 ajacoutot Exp $ --- configure.ac.orig Sun Jan 1 12:30:52 2012 +++ configure.ac Sat Apr 7 13:58:35 2012 @@ -558,9 +558,9 @@ t q b :q q" -x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.so"* "${x_libraries:-/usr/lib}/libX11.so"* 2>/dev/null | sed -e \"${soname_script}\"`" +x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.so"* "${x_libraries:-/usr/lib}/libX11.so"* 2>/dev/null | sed 1q`" AC_DEFINE_UNQUOTED([LIBX11_SO], "${x_lib_location:-libX11.so}", [The soname of libX11, needed for dlopen()]) -x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"* "${x_libraries:-/usr/lib}/libXv.so"* 2>/dev/null | sed -e \"${soname_script}\"`" +x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"* "${x_libraries:-/usr/lib}/libXv.so"* 2>/dev/null | sed 1q`" AC_DEFINE_UNQUOTED([LIBXV_SO], "${x_lib_location:-libXv.so}", [The soname of libXv, needed for dlopen()]) @@ -1395,9 +1395,10 @@ if test "x$with_mng" = "xyes"; then AC_CHECK_LIB(mng, mng_initialize, [ AC_CHECK_HEADER(libmng.h, [ have_libmng=yes - MNG_LIBS="-lmng" ], + MNG_LIBS="-lmng -llcms -ljpeg -lz -lm" ], AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]))], - AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***])) + AC_MSG_RESULT([*** All libmng dependent parts will be disabled ***]), + [-llcms -ljpeg -lz -lm]) AC_SUBST(MNG_LIBS) else have_libmng=no @@ -1672,6 +1673,22 @@ else no_gdkpixbuf=yes fi AM_CONDITIONAL(HAVE_GDK_PIXBUF, test "x$no_gdkpixbuf" != "xyes") + +dnl --------------------------------------------- +dnl libbluray support +dnl --------------------------------------------- +AC_ARG_ENABLE([bluray], + AS_HELP_STRING([--disable-bluray], [Do not build BluRay support]), + [with_bluray=$enableval], [with_bluray=yes]) + +if test "x$with_bluray" != "xno"; then + PKG_CHECK_MODULES([LIBBLURAY], [libbluray >= 0.2.1], + [have_libbluray=yes], + AC_MSG_RESULT(*** All of the libbluray dependent parts will be disabled ***)) + AC_SUBST(LIBBLURAY_CFLAGS) + AC_SUBST(LIBBLURAY_LIBS) +fi +AM_CONDITIONAL(HAVE_LIBBLURAY, test "x$have_libbluray" = "xyes") dnl --------------------------------------------- dnl libsmbclient support