diff options
| author |   David Seifert <soap@gentoo.org> | 2016-01-12 21:33:56 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2016-01-12 21:34:47 +0100 |
| commit | 810797abda4b5663e5f5dcc1f9a5c0b83b3697af (patch) | |
| tree | 870adb3a4d8c35592a948ee1a1190adbaefb43c0 /media-sound/tagtool/files | |
| parent | media-sound/timemachine: Modernize to EAPI=6, fix #508132 (diff) | |
| download | gentoo-810797abda4b5663e5f5dcc1f9a5c0b83b3697af.tar.gz gentoo-810797abda4b5663e5f5dcc1f9a5c0b83b3697af.tar.bz2 gentoo-810797abda4b5663e5f5dcc1f9a5c0b83b3697af.zip | |
media-sound/tagtool: Fixed AC_ARG_ENABLE in configure.ac for use_enable
Package-Manager: portage-2.2.26
Diffstat (limited to 'media-sound/tagtool/files')
| -rw-r--r-- | media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch b/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch index 14c4bba1eb15..9569ad2fbaf5 100644 --- a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch +++ b/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch @@ -1,9 +1,40 @@ Fix underlinking issues caused by missing libm and libogg linking Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=513012 +In addition, fix nonidiomatic AC_ARG_ENABLE option handling. + --- tagtool-0.12.3/configure.ac +++ tagtool-0.12.3/configure.ac -@@ -50,6 +50,12 @@ +@@ -13,20 +13,16 @@ + + + dnl Command line options +-AC_ARG_ENABLE(mp3, +- AC_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)]), +- [enable_mp3=no; disable_mp3_reason="(disabled)"], +- [enable_mp3=yes]) +- +-AC_ARG_ENABLE(vorbis, +- AC_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)]), +- [enable_vorbis=no; disable_vorbis_reason="(disabled)"], +- [enable_vorbis=yes]) ++AC_ARG_ENABLE([mp3], ++ AS_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)])) + +-if test "$enable_mp3" = "no" && test "$enable_vorbis" = "no"; then +- AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.]) +-fi; ++AC_ARG_ENABLE([vorbis], ++ AS_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)])) + ++dnl Test for no flags being enabled ++AS_IF([test "x$enable_mp3" != "xyes" && test "x$enable_vorbis" != "xyes" ], [ ++ AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.]) ++]) + + dnl Checks for programs. + AC_PROG_CC +@@ -50,6 +46,12 @@ fi; @@ -16,7 +47,7 @@ Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=513012 dnl Check for gtk and related libraries PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.12.0 gtk+-2.0 >= 2.8.0 -@@ -91,6 +97,9 @@ +@@ -91,6 +93,9 @@ AC_CHECK_LIB(vorbisfile, main,, [enable_vorbis=no; disable_vorbis_reason="(missing vorbisfile library)"]) fi; |