58 lines
2.0 KiB
Plaintext
58 lines
2.0 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.10 2007/12/11 11:07:54 jakemsr Exp $
|
|
--- configure.ac.orig Tue Nov 27 08:11:35 2007
|
|
+++ configure.ac Sat Dec 1 22:31:03 2007
|
|
@@ -198,7 +198,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
|
|
@@ -214,7 +214,7 @@ case "${target_os}" in
|
|
#endif],
|
|
SYS=mingw32, SYS=cygwin)
|
|
;;
|
|
- *wince* | *mingwce* | *pe*)
|
|
+ *wince* | *mingwce*)
|
|
SYS=mingwce
|
|
;;
|
|
esac
|
|
@@ -656,6 +656,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
|
|
@@ -2693,7 +2696,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)
|
|
@@ -3355,13 +3358,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
|