Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
L
libvncserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
rasky
libvncserver
Commits
714bd045
Commit
714bd045
authored
Jun 06, 2005
by
dscho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
link to libmp3lame only if exists
parent
89148d77
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
Makefile.am
client_examples/Makefile.am
+5
-1
configure.ac
configure.ac
+4
-1
No files found.
client_examples/Makefile.am
View file @
714bd045
...
@@ -4,8 +4,12 @@ LDADD = ../libvncclient/libvncclient.a @WSOCKLIB@
...
@@ -4,8 +4,12 @@ LDADD = ../libvncclient/libvncclient.a @WSOCKLIB@
if
WITH_FFMPEG
if
WITH_FFMPEG
FFMPEG_HOME
=
@with_ffmpeg@
FFMPEG_HOME
=
@with_ffmpeg@
if
HAVE_MP3LAME
MP3LAME_LIB
=
-lmp3lame
endif
vnc2mpg_CFLAGS
=
-I
$(FFMPEG_HOME)
/libavformat
-I
$(FFMPEG_HOME)
/libavcodec
vnc2mpg_CFLAGS
=
-I
$(FFMPEG_HOME)
/libavformat
-I
$(FFMPEG_HOME)
/libavcodec
vnc2mpg_LDADD
=
$(LDADD)
$(FFMPEG_HOME)
/libavformat/libavformat.a
$(FFMPEG_HOME)
/libavcodec/libavcodec.a
-lmp3lame
-lm
vnc2mpg_LDADD
=
$(LDADD)
$(FFMPEG_HOME)
/libavformat/libavformat.a
$(FFMPEG_HOME)
/libavcodec/libavcodec.a
$(MP3LAME_LIB)
-lm
FFMPEG_CLIENT
=
vnc2mpg
FFMPEG_CLIENT
=
vnc2mpg
endif
endif
...
...
configure.ac
View file @
714bd045
...
@@ -34,7 +34,10 @@ AC_ARG_WITH(ffmpeg,
...
@@ -34,7 +34,10 @@ AC_ARG_WITH(ffmpeg,
[ --with-ffmpeg=dir set ffmpeg home directory],,)
[ --with-ffmpeg=dir set ffmpeg home directory],,)
AC_SUBST(with_ffmpeg)
AC_SUBST(with_ffmpeg)
AM_CONDITIONAL(WITH_FFMPEG, test ! -z "$with_ffmpeg")
AM_CONDITIONAL(WITH_FFMPEG, test ! -z "$with_ffmpeg")
if test ! -z "$with_ffmpeg"; then
AC_CHECK_LIB(mp3lame, lame_init, HAVE_MP3LAME="true", HAVE_MP3LAME="false" )
fi
AM_CONDITIONAL(HAVE_MP3LAME, test "$HAVE_MP3LAME" = "true")
# Seem to need this dummy here to induce the 'checking for egrep... grep -E', etc.
# Seem to need this dummy here to induce the 'checking for egrep... grep -E', etc.
# before it seemed to be inside the with_jpeg conditional.
# before it seemed to be inside the with_jpeg conditional.
...
...
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