|
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 |
AM_CONDITIONAL([HAVE_LIBXEXT], [test "$HAVE_LIBXEXT" = "1"]) |
| 121 |
|
| 118 |
dnl FFmpeg |
122 |
dnl FFmpeg |
| 119 |
PKG_CHECK_MODULES([libavformat], [libavformat >= 52.110.0 libavcodec libavutil], [HAVE_LIBAVFORMAT=1], [HAVE_LIBAVFORMAT=0]) |
123 |
PKG_CHECK_MODULES([libavformat], [libavformat >= 52.110.0 libavcodec libavutil], [HAVE_LIBAVFORMAT=1], [HAVE_LIBAVFORMAT=0]) |
| 120 |
if test "$HAVE_LIBAVFORMAT" != "1"; then |
124 |
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 153-158
Link Here
|
| 153 |
bino_LDADD += $(xnvctrl_LDFLAGS) -lXNVCtrl |
153 |
bino_LDADD += $(xnvctrl_LDFLAGS) -lXNVCtrl |
| 154 |
endif |
154 |
endif |
| 155 |
|
155 |
|
|
|
156 |
if HAVE_LIBXEXT |
| 157 |
AM_CPPFLAGS += $(libXext_CFLAGS) |
| 158 |
bino_LDADD += $(libXext_LIBS) |
| 159 |
endif |
| 160 |
|
| 156 |
iconsdatadir = $(datadir)/icons/hicolor |
161 |
iconsdatadir = $(datadir)/icons/hicolor |
| 157 |
icons16dir = $(iconsdatadir)/16x16/apps |
162 |
icons16dir = $(iconsdatadir)/16x16/apps |
| 158 |
icons32dir = $(iconsdatadir)/32x32/apps |
163 |
icons32dir = $(iconsdatadir)/32x32/apps |
