From: Tim-Philipp Müller Date: Sat, 11 Mar 2006 17:08:31 +0000 (+0000) Subject: configure.ac: Only compile the taglib plugin if a C++ compiler is present. Use GST_DE... X-Git-Tag: 1.19.3~507^2~21676 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87da9d51153dab1d3034a865a2554e4e075f4ccc;p=platform%2Fupstream%2Fgstreamer.git configure.ac: Only compile the taglib plugin if a C++ compiler is present. Use GST_DEFAULT_ELEMENTS macro from common... Original commit message from CVS: * 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. --- diff --git a/ChangeLog b/ChangeLog index 8f992bd..cafc940 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-03-11 Tim-Philipp Müller + + * 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 Reviewed by: Tim-Philipp Müller diff --git a/configure.ac b/configure.ac index 5f50938..e17b129 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 ])