diff options
| author | dscho <dscho> | 2005-06-06 19:48:38 +0000 |
|---|---|---|
| committer | dscho <dscho> | 2005-06-06 19:48:38 +0000 |
| commit | 714bd045e7dc5bbd77773d63a2e7fec4bd54a7cd (patch) | |
| tree | d331f1c8d262a0ac4cf5017431aa228a73b75b85 | |
| parent | 89148d774ffe8f31f733683997974f50a522deb5 (diff) | |
| download | libtdevnc-714bd045e7dc5bbd77773d63a2e7fec4bd54a7cd.tar.gz libtdevnc-714bd045e7dc5bbd77773d63a2e7fec4bd54a7cd.zip | |
link to libmp3lame only if exists
| -rw-r--r-- | client_examples/Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/client_examples/Makefile.am b/client_examples/Makefile.am index 1a6cdc5..7951d0e 100644 --- a/client_examples/Makefile.am +++ b/client_examples/Makefile.am @@ -4,8 +4,12 @@ LDADD = ../libvncclient/libvncclient.a @WSOCKLIB@ if WITH_FFMPEG FFMPEG_HOME=@with_ffmpeg@ +if HAVE_MP3LAME +MP3LAME_LIB=-lmp3lame +endif + 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 endif diff --git a/configure.ac b/configure.ac index 5f7a1b4..7f19072 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,10 @@ AC_ARG_WITH(ffmpeg, [ --with-ffmpeg=dir set ffmpeg home directory],,) AC_SUBST(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. # before it seemed to be inside the with_jpeg conditional. |