don't use automake-1.8

autogen.sh

@@ -25,7 +25,7 @@ echo "This may take a while ..."
 # Regenerate configuration files
 libtoolize -f -c
 
-for i in -1.8 -1.7 -1.6 ''; do
+for i in -1.7 -1.6 ''; do
 	if [ -z $ACLOCAL ]; then
 		which aclocal$i
 		if [ "$?" = "0" ]; then

src/libid3tag/config.h.in

@@ -72,6 +72,8 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 #undef inline
+#endif

src/libmad/config.h.in

@@ -121,9 +121,11 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 #undef inline
+#endif
 
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t