1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
* Fix underlinking issues caused by missing libm and libogg linking
https://bugs.gentoo.org/513012
* Fix spurious test failure caused by incomplete POTFILES.in
https://bugs.gentoo.org/631236
* In addition, fix nonidiomatic AC_ARG_ENABLE option handling.
--- a/configure.ac
+++ b/configure.ac
@@ -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;
+dnl Check for libm for ceil()
+AC_SEARCH_LIBS([ceil], [m], [], [
+ AC_MSG_ERROR([unable to find the ceil() function])
+])
+
+
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 +93,9 @@
AC_CHECK_LIB(vorbisfile, main,,
[enable_vorbis=no; disable_vorbis_reason="(missing vorbisfile library)"])
fi;
+if test "$enable_vorbis" = "yes"; then
+ PKG_CHECK_MODULES([OGG], [ogg])
+fi;
AM_CONDITIONAL(ENABLE_MP3, test "$enable_mp3" = "yes")
AM_CONDITIONAL(ENABLE_VORBIS, test "$enable_vorbis" = "yes")
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,3 +22,4 @@
src/vorbis_edit.c
src/vorbis_edit_field.c
src/vorbis_file.c
+src/vcedit.c
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,8 @@
vorbis_sources = vorbis_file.c vorbis_file.h vorbis_edit.c \
vorbis_edit.h vorbis_edit_field.c vorbis_edit_field.h vcedit.c \
vcedit.h
-vorbis_cflags = -DENABLE_VORBIS
+vorbis_cflags = $(OGG_CFLAGS) -DENABLE_VORBIS
+vorbis_libs = $(OGG_LIBS)
else
vorbis_sources =
vorbis_cflags =
@@ -39,7 +40,7 @@
${vorbis_cflags} -DDATADIR='"$(datadir)/${PACKAGE_NAME}"'
tagtool_LDFLAGS = -export-dynamic
-tagtool_LDADD = $(GTK_LIBS)
+tagtool_LDADD = $(GTK_LIBS) ${vorbis_libs}
tagtool_SOURCES = file_list.c file_list.h file_util.c file_util.h \
edit_tab.c edit_tab.h elist.c elist.h main.c math_util.c \
|
