7fdac52af0
VideoLAN-SA-0702: format string injection in Vorbis, Theora, SAP and CDDA plugins - remove bogus PLIST entry from brad
58 lines
2.0 KiB
Plaintext
58 lines
2.0 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.9 2007/06/18 23:14:20 ajacoutot Exp $
|
|
--- configure.ac.orig Sat Jun 16 10:25:19 2007
|
|
+++ configure.ac Mon Jun 18 17:34:39 2007
|
|
@@ -210,7 +210,7 @@ case "${target_os}" in
|
|
VLC_ADD_CFLAGS([libvlc],[-x objective-c])
|
|
VLC_ADD_CFLAGS([vlc],[-x objective-c])
|
|
;;
|
|
- *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
|
|
+ *mingw32* | *cygwin* | *wince* | *mingwce*)
|
|
AC_CHECK_TOOL(WINDRES, windres, :)
|
|
|
|
case "${target_os}" in
|
|
@@ -226,7 +226,7 @@ case "${target_os}" in
|
|
#endif],
|
|
SYS=mingw32, SYS=cygwin)
|
|
;;
|
|
- *wince* | *mingwce* | *pe*)
|
|
+ *wince* | *mingwce*)
|
|
SYS=mingwce
|
|
;;
|
|
esac
|
|
@@ -664,6 +664,9 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
|
|
dnl Check for pthreads - borrowed from XMMS
|
|
THREAD_LIB=error
|
|
if test "${THREAD_LIB}" = "error"; then
|
|
+ AC_CHECK_LIB(pthread,main,THREAD_LIB="-pthread")
|
|
+fi
|
|
+if test "${THREAD_LIB}" = "error"; then
|
|
AC_CHECK_LIB(pthread,main,THREAD_LIB="-lpthread")
|
|
fi
|
|
if test "${THREAD_LIB}" = "error"; then
|
|
@@ -2695,7 +2698,7 @@ dnl Look for a ffmpeg-config (we are on debian )
|
|
else
|
|
|
|
dnl Trying with pkg-config
|
|
- PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
|
|
+ PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat, libpostproc],
|
|
[
|
|
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
|
|
AC_CHECK_HEADERS(ffmpeg/avformat.h)
|
|
@@ -3357,13 +3360,13 @@ AC_ARG_ENABLE(png,
|
|
[ --enable-png PNG support (default enabled)])
|
|
if test "${enable_png}" != "no"; then
|
|
AC_CHECK_HEADERS(png.h, [
|
|
- LDFLAGS="${LDFLAGS_save} -lz"
|
|
+ LDFLAGS="${LDFLAGS_save} -lz -lm"
|
|
AC_CHECK_LIB(png, png_set_rows, [
|
|
- VLC_ADD_LDFLAGS([png],[-lpng -lz])
|
|
+ VLC_ADD_LDFLAGS([png],[-lpng -lz -lm])
|
|
VLC_ADD_PLUGINS([png])
|
|
VLC_ADD_PLUGINS([osdmenu])
|
|
AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])],
|
|
- [],[-lz])
|
|
+ [],[-lz -lm])
|
|
LDFLAGS="${LDFLAGS_save}"
|
|
])
|
|
fi
|