[vlc-devel] commit: Grrr, wrong line ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sat Aug 29 22:07:56 CEST 2009
vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 29 23:07:45 2009 +0300| [3c9a7262c354f7969d6d19dae8d27163e7859a69] | committer: Rémi Denis-Courmont
Grrr, wrong line
(cherry picked from commit 9ba95700cd794c45c8d8ee7e1c5be4de2b6f2ab5)
Conflicts:
configure.ac
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3c9a7262c354f7969d6d19dae8d27163e7859a69
---
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8949f74..4e0544f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -716,10 +716,10 @@ AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt})
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_TYPE_SIGNAL
AC_CHECK_LIB(m,cos,[
- VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene],[-lm])
+ VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua],[-lm])
])
AC_CHECK_LIB(m,pow,[
- VLC_ADD_LIBS([avcodec avformat swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore vorbis freetype mod mpc dmo quicktime realaudio realvideo galaktos opengl kate flac lua],[-lm])
+ VLC_ADD_LIBS([avcodec avformat swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore vorbis freetype mod mpc dmo quicktime realaudio realvideo galaktos opengl],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LIBS([headphone_channel_mixer normvol speex mono colorthres extract],[-lm])
More information about the vlc-devel
mailing list