don't use automake-1.8

git-svn-id: https://svn.musicpd.org/mpd/trunk@154 09075e82-0dd4-0310-85a5-a0d7c8717e4f

3 files changed, 9 insertions, 5 deletions

diff --git a/autogen.sh b/autogen.sh
index 5125c8044..0a32e5eec 100755
--- a/autogen.sh
+++ b/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
diff --git a/src/libid3tag/config.h.in b/src/libid3tag/config.h.in
index b4f0f8997..ba35b4be9 100644
--- a/src/libid3tag/config.h.in
+++ b/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
diff --git a/src/libmad/config.h.in b/src/libmad/config.h.in
index 2cdd33497..ec79167a8 100644
--- a/src/libmad/config.h.in
+++ b/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