diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 29 |
2 files changed, 12 insertions, 24 deletions
@@ -1,3 +1,10 @@ +2006-03-11 Tim-Philipp Müller <tim at centricular dot net> + + * configure.ac: + Only compile the taglib plugin if a C++ compiler is + present. Use GST_DEFAULT_ELEMENTS macro from common/ + for all the defaults stuff. + 2006-03-11 Christophe Fergeau <teuf@gnome.org> Reviewed by: Tim-Philipp Müller <tim at centricular dot net> diff --git a/configure.ac b/configure.ac index 5f509387..e17b1292 100644 --- a/configure.ac +++ b/configure.ac @@ -96,30 +96,7 @@ fi dnl Check for FIONREAD ioctl declaration : GST_CHECK_FIONREAD() -DEFAULT_AUDIOSINK="autoaudiosink" -DEFAULT_VIDEOSINK="autovideosink" -DEFAULT_AUDIOSRC="alsasrc" -DEFAULT_VIDEOSRC="v4lsrc" -DEFAULT_VISUALIZER="goom" -case "$host" in - *-sun-* | *pc-solaris* ) - DEFAULT_AUDIOSRC="sunaudiosrc" - ;; - *-darwin* ) - DEFAULT_AUDIOSRC="osxaudiosrc" - ;; -esac - -AC_SUBST(DEFAULT_AUDIOSINK) -AC_DEFINE_UNQUOTED(DEFAULT_AUDIOSINK,"$DEFAULT_AUDIOSINK",[Default audio sink]) -AC_SUBST(DEFAULT_AUDIOSRC) -AC_DEFINE_UNQUOTED(DEFAULT_AUDIOSRC,"$DEFAULT_AUDIOSRC",[Default audio source]) -AC_SUBST(DEFAULT_VIDEOSINK) -AC_DEFINE_UNQUOTED(DEFAULT_VIDEOSINK,"$DEFAULT_VIDEOSINK",[Default video sink]) -AC_SUBST(DEFAULT_VIDEOSRC) -AC_DEFINE_UNQUOTED(DEFAULT_VIDEOSRC,"$DEFAULT_VIDEOSRC",[Default video source]) -AC_SUBST(DEFAULT_VISUALIZER) -AC_DEFINE_UNQUOTED(DEFAULT_VISUALIZER,"$DEFAULT_VISUALIZER",[Default visualizer]) +GST_DEFAULT_ELEMENTS dnl ############################################ dnl # Super Duper options for plug-in building # @@ -658,6 +635,10 @@ GST_CHECK_FEATURE(TAGLIB, [taglib ID3v2 tag writer], taglib, [ PKG_CHECK_MODULES(TAGLIB, taglib >= 1.4, HAVE_TAGLIB="yes", HAVE_TAGLIB="no") AC_SUBST(TAGLIB_CFLAGS) AC_SUBST(TAGLIB_LIBS) + if test "x$HAVE_CXX" != "xyes"; then + USE_TAGLIB=false + AC_MSG_NOTICE([Not building taglib plugin: no C++ compiler found]) + fi ]) |