Mercurial > audlegacy-plugins
changeset 1058:75f713176b2f trunk
[svn] - make build of cdaudio-ng configurable.
| author | yaz |
|---|---|
| date | Wed, 23 May 2007 06:08:35 -0700 |
| parents | ddb79127d9cf |
| children | f305ebcc8136 |
| files | ChangeLog configure.ac mk/rules.mk.in src/cdaudio-ng/Makefile |
| diffstat | 4 files changed, 30 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 23 03:48:56 2007 -0700 +++ b/ChangeLog Wed May 23 06:08:35 2007 -0700 @@ -1,3 +1,11 @@ +2007-05-23 10:48:56 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> + revision [2280] + - add support for reading id3v2 TXXX replaygain tag. patch by Eugene Zagidullin. + + trunk/src/madplug/replaygain.c | 75 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 75 insertions(+) + + 2007-05-22 15:26:53 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> revision [2278] - FILEWRITER_LIBS had been left blank if bash 3.0 was used for configure, since this version doesn't accept '+='.
--- a/configure.ac Wed May 23 03:48:56 2007 -0700 +++ b/configure.ac Wed May 23 06:08:35 2007 -0700 @@ -1054,7 +1054,24 @@ fi dnl CD-Audio New Generation -PKG_CHECK_MODULES(CDIO, [libcdio >= 0.78.2]) + +AC_ARG_ENABLE(cdaudio-ng, + [ --enable-cdaudio_ng enable cdaudio-ng input plugin (default=disabled) ], + [enable_cdaudio_ng=$enableval], + [enable_cdaudio_ng=no] +) + +if test "$enable_cdaudio_ng" = "yes"; then + PKG_CHECK_MODULES(CDIO, [libcdio >= 0.78.2], + [INPUT_PLUGINS="$INPUT_PLUGINS cdaudnio-ng" + CDIO_LIBS=`pkg-config --libs libcdio` + CDIO_CFLAGS=`pkg-config --cflags libcdio` + AC_SUBST(CDIO_LIBS) + AC_SUBST(CDIO_CFLAGS)], + [AC_MSG_WARN([*** Cannot find libcdio 0.78.2 or newer, cdaudio-ng will not be built ***])] +) +fi + AM_CONDITIONAL(HAVE_CDROM, test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes") AM_CONDITIONAL(HAVE_LINUX_JOYSTICK,test "${ac_cv_header_linux_joystick_h}" = "yes") @@ -1400,6 +1417,7 @@ echo " -> dummy backend: $enable_amidiplug_dummy" echo " MIDI to WAVE converter (timidity): $enable_timidity" echo " CD Digital Audio (cdda): yes" +echo " New CD Digital Audio (cdaudio-ng): $enable_cdaudio_ng" echo " Microsoft WAV (wav): yes" echo " + sndfile extensions: $enable_sndfile" echo " Tone Generator: yes"
--- a/mk/rules.mk.in Wed May 23 03:48:56 2007 -0700 +++ b/mk/rules.mk.in Wed May 23 06:08:35 2007 -0700 @@ -362,3 +362,5 @@ SIMD_CFLAGS ?= @SIMD_CFLAGS@ FILEWRITER_LIBS ?= @FILEWRITER_LIBS@ GCC42_CFLAGS ?= @GCC42_CFLAGS@ +CDIO_LIBS ?= @CDIO_LIBS@ +CDIO_CFLAGS ?= @CDIO_CFLAGS@
--- a/src/cdaudio-ng/Makefile Wed May 23 03:48:56 2007 -0700 +++ b/src/cdaudio-ng/Makefile Wed May 23 06:08:35 2007 -0700 @@ -10,6 +10,6 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CDIO_LIBS) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CDIO_CFLAGS) -I../../intl -I../.. include ../../mk/objective.mk