|
Line
Link Here
|
| 0 |
-- configure.ac |
0 |
++ configure.ac |
|
Lines 115-120
Link Here
|
| 115 |
AC_MSG_WARN([please install pkg-config; Debian package: pkg-config]) |
115 |
AC_MSG_WARN([please install pkg-config; Debian package: pkg-config]) |
| 116 |
fi |
116 |
fi |
| 117 |
|
117 |
|
|
|
118 |
dnl libXext |
| 119 |
PKG_CHECK_MODULES([libXext], [xext], [HAVE_LIBXEXT=1], [HAVE_LIBXEXT=0]) |
| 120 |
|
| 118 |
dnl FFmpeg |
121 |
dnl FFmpeg |
| 119 |
PKG_CHECK_MODULES([libavformat], [libavformat >= 52.110.0 libavcodec libavutil], [HAVE_LIBAVFORMAT=1], [HAVE_LIBAVFORMAT=0]) |
122 |
PKG_CHECK_MODULES([libavformat], [libavformat >= 52.110.0 libavcodec libavutil], [HAVE_LIBAVFORMAT=1], [HAVE_LIBAVFORMAT=0]) |
| 120 |
if test "$HAVE_LIBAVFORMAT" != "1"; then |
123 |
if test "$HAVE_LIBAVFORMAT" != "1"; then |
|
Lines 326-331
Link Here
|
| 326 |
|
329 |
|
| 327 |
dnl Check if all libraries were found |
330 |
dnl Check if all libraries were found |
| 328 |
if test "$am_cv_func_iconv" != "yes" \ |
331 |
if test "$am_cv_func_iconv" != "yes" \ |
|
|
332 |
-o "$HAVE_LIBXEXT" != "1" \ |
| 329 |
-o "$HAVE_LIBAVFORMAT" != "1" \ |
333 |
-o "$HAVE_LIBAVFORMAT" != "1" \ |
| 330 |
-o "$HAVE_LIBAVDEVICE" != "1" \ |
334 |
-o "$HAVE_LIBAVDEVICE" != "1" \ |
| 331 |
-o "$HAVE_LIBSWSCALE" != "1" \ |
335 |
-o "$HAVE_LIBSWSCALE" != "1" \ |
| 332 |
-- src/Makefile.am |
336 |
++ src/Makefile.am |
|
Lines 121-131
Link Here
|
| 121 |
|
121 |
|
| 122 |
DEFS += -DHTMLDIR=\"$(htmldir)\" -DLOCALEDIR=\"$(localedir)\" |
122 |
DEFS += -DHTMLDIR=\"$(htmldir)\" -DLOCALEDIR=\"$(localedir)\" |
| 123 |
|
123 |
|
| 124 |
AM_CPPFLAGS = -I$(top_srcdir)/src/base \ |
124 |
AM_CPPFLAGS = -I$(top_srcdir)/src/base $(libXext_CFLAGS) \ |
| 125 |
$(libavformat_CFLAGS) $(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \ |
125 |
$(libavformat_CFLAGS) $(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \ |
| 126 |
$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_CFLAGS) $(libqtopengl_CFLAGS) |
126 |
$(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_CFLAGS) $(libqtopengl_CFLAGS) |
| 127 |
|
127 |
|
| 128 |
bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) \ |
128 |
bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) $(libXext_LIBS) \ |
| 129 |
$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) $(libass_LIBS) \ |
129 |
$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) $(libass_LIBS) \ |
| 130 |
$(libopenal_LIBS) $(libgl_LIBS) $(libglewmx_LIBS) $(libqtopengl_LIBS) |
130 |
$(libopenal_LIBS) $(libgl_LIBS) $(libglewmx_LIBS) $(libqtopengl_LIBS) |
