d0a569e14d
when the dbus daemon is running Fix Help->About->Thanks dialog Unbreak after xulrunner update (patches adapted from archlinux) OK ajacoutot@, landry@
50 lines
2.5 KiB
Plaintext
50 lines
2.5 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.17 2010/06/17 07:42:16 dcoppa Exp $
|
|
--- configure.ac.orig Sun Apr 18 15:03:54 2010
|
|
+++ configure.ac Sun Jun 13 11:21:06 2010
|
|
@@ -826,6 +826,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
|
|
@@ -2525,7 +2528,7 @@ then
|
|
fi
|
|
|
|
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
|
|
- AC_CHECK_HEADERS(linux/videodev2.h, [
|
|
+ AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h sys/videodev2.h], [
|
|
VLC_ADD_PLUGIN([v4l2])
|
|
],[])
|
|
CPPFLAGS="${CPPFLAGS_save}"
|
|
@@ -3753,14 +3756,14 @@ 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} -lm -lz"
|
|
AC_CHECK_LIB(png, png_set_rows, [
|
|
- VLC_ADD_LIBS([png],[-lpng -lz])
|
|
+ VLC_ADD_LIBS([png],[-lpng -lm -lz])
|
|
VLC_ADD_PLUGIN([png])
|
|
VLC_ADD_PLUGIN([osdmenu])
|
|
VLC_ADD_PLUGIN([osd_parser])
|
|
AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])],
|
|
- [],[-lz])
|
|
+ [],[-lm -lz])
|
|
LDFLAGS="${LDFLAGS_save}"
|
|
])
|
|
fi
|
|
@@ -5746,7 +5749,7 @@ then
|
|
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
|
|
VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include])
|
|
if ${need_xpcom_libs}; then
|
|
- VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue])
|
|
+ VLC_ADD_LIBS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 ${LOCALBASE}/xulrunner1.9/libxpcomglue.a -L${X11BASE}/lib -lXt -lX11 -lSM -lICE -lXpm])
|
|
if test "${SYS}" = "mingw32"; then
|
|
dnl latest gecko sdk does not have embedstring
|
|
if test -d "${real_mozilla_sdk}/embedstring/bin"
|