47 lines
2.1 KiB
Plaintext
47 lines
2.1 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.7 2010/09/13 20:12:16 sthen Exp $
|
|
--- configure.ac.orig Sun Jul 25 10:37:30 2010
|
|
+++ configure.ac Wed Aug 25 11:21:06 2010
|
|
@@ -565,9 +565,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()])
|
|
|
|
|
|
@@ -1309,7 +1309,7 @@ if test "x$enable_a52dec" = "xno"; then
|
|
AC_MSG_RESULT([a52dec support disabled])
|
|
elif test "x$external_a52dec" = "xyes"; then
|
|
have_a52="yes"
|
|
- AC_CHECK_HEADERS([a52dec/a52.h a52dec/a52_internal.h],, have_a52="no",
|
|
+ AC_CHECK_HEADERS([a52dec/a52.h],, have_a52="no",
|
|
[
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
@@ -1402,9 +1402,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
|
|
@@ -2708,6 +2709,8 @@ CC_CHECK_CFLAGS_APPEND([-Wformat=2 -Wformat],
|
|
[CC_CHECK_CFLAGS_APPEND([-Wno-format-zero-length])
|
|
break;
|
|
])
|
|
+
|
|
+CC_CHECK_CFLAGS_APPEND([-Wformat-security])
|
|
|
|
dnl check for strict aliasing problem, get the highest between =2 and
|
|
dnl normal.
|