Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
edef2bc8
Commit
edef2bc8
authored
Oct 21, 2007
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some missing s/VLC_ADD_LDFLAGS/VLC_ADD_LIBS/
parent
aa734286
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
23 deletions
+23
-23
configure.ac
configure.ac
+23
-23
No files found.
configure.ac
View file @
edef2bc8
...
@@ -4211,8 +4211,8 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice
...
@@ -4211,8 +4211,8 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice
then
then
VLC_ADD_CFLAGS([freetype], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI])
VLC_ADD_CFLAGS([freetype], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI])
VLC_ADD_CPPFLAGS([skins2], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI])
VLC_ADD_CPPFLAGS([skins2], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI])
VLC_ADD_L
DFLAG
S([freetype], [`${FRIBIDI_CONFIG} --libs`])
VLC_ADD_L
IB
S([freetype], [`${FRIBIDI_CONFIG} --libs`])
VLC_ADD_L
DFLAG
S([skins2], [`${FRIBIDI_CONFIG} --libs`])
VLC_ADD_L
IB
S([skins2], [`${FRIBIDI_CONFIG} --libs`])
fi
fi
fi
fi
fi
fi
...
@@ -4233,7 +4233,7 @@ then
...
@@ -4233,7 +4233,7 @@ then
AC_PATH_PROG(XML2_CONFIG, xml2-config, no, ${XML2_PATH})
AC_PATH_PROG(XML2_CONFIG, xml2-config, no, ${XML2_PATH})
if test "${XML2_CONFIG}" != "no"; then
if test "${XML2_CONFIG}" != "no"; then
VLC_ADD_CPPFLAGS([xml],[`${XML2_CONFIG} --cflags`])
VLC_ADD_CPPFLAGS([xml],[`${XML2_CONFIG} --cflags`])
VLC_ADD_L
DFLAG
S([xml],[`${XML2_CONFIG} --libs`])
VLC_ADD_L
IB
S([xml],[`${XML2_CONFIG} --libs`])
dnl depends on the xmlTextReader extension
dnl depends on the xmlTextReader extension
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_xml}"
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_xml}"
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xml}"
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xml}"
...
@@ -4323,10 +4323,10 @@ dnl VLC_ADD_PLUGINS([qt_video])
...
@@ -4323,10 +4323,10 @@ dnl VLC_ADD_PLUGINS([qt_video])
dnl VLC_ADD_LIBS([qt_video],[-L${QTDIR}/lib])
dnl VLC_ADD_LIBS([qt_video],[-L${QTDIR}/lib])
dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt_video}"
dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt_video}"
dnl AC_CHECK_LIB(qt-mt,main,[
dnl AC_CHECK_LIB(qt-mt,main,[
dnl VLC_ADD_L
DFLAG
S([qt_video],[-lqt-mt])
dnl VLC_ADD_L
IB
S([qt_video],[-lqt-mt])
dnl ],[
dnl ],[
dnl AC_CHECK_LIB(qt,main,[
dnl AC_CHECK_LIB(qt,main,[
dnl VLC_ADD_L
DFLAG
S([qt_video],[-lqt])
dnl VLC_ADD_L
IB
S([qt_video],[-lqt])
dnl ])
dnl ])
dnl ])
dnl ])
dnl NEED_QTE_MAIN=yes
dnl NEED_QTE_MAIN=yes
...
@@ -4354,7 +4354,7 @@ if test "${enable_hd1000v}" != "no" -a "${CXX}" != "" &&
...
@@ -4354,7 +4354,7 @@ if test "${enable_hd1000v}" != "no" -a "${CXX}" != "" &&
if test "$can_build_roku" = "yes"
if test "$can_build_roku" = "yes"
then
then
VLC_ADD_PLUGINS([hd1000v])
VLC_ADD_PLUGINS([hd1000v])
VLC_ADD_L
DFLAG
S([hd1000v],[-lCascade -ldvbpsi -lmad])
VLC_ADD_L
IB
S([hd1000v],[-lCascade -ldvbpsi -lmad])
fi
fi
AC_LANG_POP([C++])
AC_LANG_POP([C++])
fi
fi
...
@@ -4380,15 +4380,15 @@ then
...
@@ -4380,15 +4380,15 @@ then
then
then
AC_CHECK_HEADERS(ddraw.h,
AC_CHECK_HEADERS(ddraw.h,
[ VLC_ADD_PLUGINS([vout_directx aout_directx])
[ VLC_ADD_PLUGINS([vout_directx aout_directx])
VLC_ADD_L
DFLAG
S([vout_directx],[-lgdi32])
VLC_ADD_L
IB
S([vout_directx],[-lgdi32])
])
])
AC_CHECK_HEADERS(GL/gl.h,
AC_CHECK_HEADERS(GL/gl.h,
[ VLC_ADD_PLUGINS([glwin32])
[ VLC_ADD_PLUGINS([glwin32])
VLC_ADD_L
DFLAG
S([glwin32],[-lopengl32 -lgdi32])
VLC_ADD_L
IB
S([glwin32],[-lopengl32 -lgdi32])
])
])
AC_CHECK_HEADERS(d3d9.h,
AC_CHECK_HEADERS(d3d9.h,
[ VLC_ADD_PLUGINS([direct3d])
[ VLC_ADD_PLUGINS([direct3d])
VLC_ADD_L
DFLAG
S([direct3d],[-lgdi32])
VLC_ADD_L
IB
S([direct3d],[-lgdi32])
])
])
else
else
AC_MSG_CHECKING(for directX headers in ${with_directx})
AC_MSG_CHECKING(for directX headers in ${with_directx})
...
@@ -4396,7 +4396,7 @@ then
...
@@ -4396,7 +4396,7 @@ then
then
then
VLC_ADD_PLUGINS([vout_directx aout_directx])
VLC_ADD_PLUGINS([vout_directx aout_directx])
VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}])
VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}])
VLC_ADD_L
DFLAG
S([vout_directx],[-lgdi32])
VLC_ADD_L
IB
S([vout_directx],[-lgdi32])
AC_MSG_RESULT(yes)
AC_MSG_RESULT(yes)
else
else
AC_MSG_RESULT(no)
AC_MSG_RESULT(no)
...
@@ -4436,7 +4436,7 @@ AC_ARG_ENABLE(svgalib,
...
@@ -4436,7 +4436,7 @@ AC_ARG_ENABLE(svgalib,
if test "${enable_svgalib}" = "yes"
if test "${enable_svgalib}" = "yes"
then
then
VLC_ADD_PLUGINS([svgalib])
VLC_ADD_PLUGINS([svgalib])
VLC_ADD_L
DFLAG
S([svgalib],[-lvgagl -lvga])
VLC_ADD_L
IB
S([svgalib],[-lvgagl -lvga])
fi
fi
dnl
dnl
...
@@ -4517,7 +4517,7 @@ AC_ARG_ENABLE(ggi,
...
@@ -4517,7 +4517,7 @@ AC_ARG_ENABLE(ggi,
if test "${enable_ggi}" = "yes"
if test "${enable_ggi}" = "yes"
then
then
VLC_ADD_PLUGINS([ggi])
VLC_ADD_PLUGINS([ggi])
VLC_ADD_L
DFLAG
S([ggi],[-lggi])
VLC_ADD_L
IB
S([ggi],[-lggi])
AC_ARG_WITH(ggi,
AC_ARG_WITH(ggi,
[ --with-ggi=PATH path to libggi],
[ --with-ggi=PATH path to libggi],
[ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
[ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
...
@@ -4546,7 +4546,7 @@ then
...
@@ -4546,7 +4546,7 @@ then
CFLAGS="$CFLAGS -I/usr/include/glide"
CFLAGS="$CFLAGS -I/usr/include/glide"
AC_CHECK_HEADER(glide.h,[
AC_CHECK_HEADER(glide.h,[
VLC_ADD_PLUGINS([glide])
VLC_ADD_PLUGINS([glide])
VLC_ADD_L
DFLAG
S([glide],[-lglide2x -lm])
VLC_ADD_L
IB
S([glide],[-lglide2x -lm])
VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide])
VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide])
],[
],[
AC_MSG_ERROR([You don't have libglide. Install it or do not use --enable-glide])
AC_MSG_ERROR([You don't have libglide. Install it or do not use --enable-glide])
...
@@ -4565,7 +4565,7 @@ then
...
@@ -4565,7 +4565,7 @@ then
if test "${have_aa}" = "true"
if test "${have_aa}" = "true"
then
then
VLC_ADD_PLUGINS([aa])
VLC_ADD_PLUGINS([aa])
VLC_ADD_L
DFLAG
S([aa],[-laa])
VLC_ADD_L
IB
S([aa],[-laa])
fi
fi
fi
fi
...
@@ -4588,7 +4588,7 @@ then
...
@@ -4588,7 +4588,7 @@ then
then
then
VLC_ADD_PLUGINS([caca])
VLC_ADD_PLUGINS([caca])
VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`])
VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`])
VLC_ADD_L
DFLAG
S([caca],[`${CACA_CONFIG} --plugin-libs`])
VLC_ADD_L
IB
S([caca],[`${CACA_CONFIG} --plugin-libs`])
fi
fi
fi
fi
...
@@ -4600,7 +4600,7 @@ AC_ARG_ENABLE(wingdi,
...
@@ -4600,7 +4600,7 @@ AC_ARG_ENABLE(wingdi,
if test "${enable_wingdi}" != "no"; then
if test "${enable_wingdi}" != "no"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
VLC_ADD_PLUGINS([wingdi])
VLC_ADD_PLUGINS([wingdi])
VLC_ADD_L
DFLAG
S([wingdi],[-lgdi32])
VLC_ADD_L
IB
S([wingdi],[-lgdi32])
fi
fi
if test "${SYS}" = "mingwce"; then
if test "${SYS}" = "mingwce"; then
VLC_ADD_PLUGINS([wingdi wingapi])
VLC_ADD_PLUGINS([wingdi wingapi])
...
@@ -4625,7 +4625,7 @@ if test "${enable_oss}" != "no" &&
...
@@ -4625,7 +4625,7 @@ if test "${enable_oss}" != "no" &&
then
then
AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [
AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [
VLC_ADD_PLUGINS([oss])
VLC_ADD_PLUGINS([oss])
AC_CHECK_LIB(ossaudio,main,VLC_ADD_L
DFLAG
S([oss],[-lossaudio]))
AC_CHECK_LIB(ossaudio,main,VLC_ADD_L
IB
S([oss],[-lossaudio]))
])
])
fi
fi
...
@@ -4641,7 +4641,7 @@ AC_ARG_ENABLE(esd,
...
@@ -4641,7 +4641,7 @@ AC_ARG_ENABLE(esd,
then
then
VLC_ADD_PLUGINS([esd])
VLC_ADD_PLUGINS([esd])
VLC_ADD_CFLAGS([esd],[`${ESD_CONFIG} --cflags`])
VLC_ADD_CFLAGS([esd],[`${ESD_CONFIG} --cflags`])
VLC_ADD_L
DFLAG
S([esd],[`${ESD_CONFIG} --libs`])
VLC_ADD_L
IB
S([esd],[`${ESD_CONFIG} --libs`])
fi
fi
fi])
fi])
...
@@ -4655,9 +4655,9 @@ AC_ARG_ENABLE(portaudio,
...
@@ -4655,9 +4655,9 @@ AC_ARG_ENABLE(portaudio,
VLC_ADD_PLUGINS([portaudio])
VLC_ADD_PLUGINS([portaudio])
VLC_ADD_CXXFLAGS([portaudio],[])
VLC_ADD_CXXFLAGS([portaudio],[])
if test "${SYS}" = "mingw32"; then
if test "${SYS}" = "mingw32"; then
VLC_ADD_L
DFLAG
S([portaudio],[-lportaudio -lwinmm -lole32])
VLC_ADD_L
IB
S([portaudio],[-lportaudio -lwinmm -lole32])
else
else
VLC_ADD_L
DFLAG
S([portaudio],[-lportaudio])
VLC_ADD_L
IB
S([portaudio],[-lportaudio])
fi
fi
fi])
fi])
...
@@ -4673,7 +4673,7 @@ AC_ARG_ENABLE(arts,
...
@@ -4673,7 +4673,7 @@ AC_ARG_ENABLE(arts,
then
then
VLC_ADD_PLUGINS([arts])
VLC_ADD_PLUGINS([arts])
VLC_ADD_CFLAGS([arts],[`${ARTS_CONFIG} --cflags`])
VLC_ADD_CFLAGS([arts],[`${ARTS_CONFIG} --cflags`])
VLC_ADD_L
DFLAG
S([arts],[`${ARTS_CONFIG} --libs `])
VLC_ADD_L
IB
S([arts],[`${ARTS_CONFIG} --libs `])
fi
fi
fi])
fi])
...
@@ -4694,7 +4694,7 @@ then
...
@@ -4694,7 +4694,7 @@ then
[snd_pcm_hw_params_get_period_time(0,0,0);],
[snd_pcm_hw_params_get_period_time(0,0,0);],
AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
VLC_ADD_PLUGINS([alsa])
VLC_ADD_PLUGINS([alsa])
VLC_ADD_L
DFLAG
S([alsa],[-lasound -lm -ldl])
VLC_ADD_L
IB
S([alsa],[-lasound -lm -ldl])
else
else
if test "${enable_alsa}" = "yes"; then
if test "${enable_alsa}" = "yes"; then
AC_MSG_ERROR([Could not find ALSA development headers])
AC_MSG_ERROR([Could not find ALSA development headers])
...
@@ -4710,7 +4710,7 @@ AC_ARG_ENABLE(waveout,
...
@@ -4710,7 +4710,7 @@ AC_ARG_ENABLE(waveout,
if test "${enable_waveout}" != "no"; then
if test "${enable_waveout}" != "no"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then
VLC_ADD_PLUGINS([waveout])
VLC_ADD_PLUGINS([waveout])
VLC_ADD_L
DFLAG
S([waveout],[-lwinmm])
VLC_ADD_L
IB
S([waveout],[-lwinmm])
fi
fi
if test "${SYS}" = "mingwce"; then
if test "${SYS}" = "mingwce"; then
VLC_ADD_PLUGINS([waveout])
VLC_ADD_PLUGINS([waveout])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment