# HG changeset patch
# User yaz
# Date 1179723124 25200
# Node ID 9b8400ca5ee8972a350fd7c77b3d4a228cc00180
# Parent  028b7ca16d300fd58d5d35a8792f69a17e4ce9e8
[svn] - add a check for gcc version. now -fgnu89-inline is added only if gcc is 4.2.0 or more.

diff -r 028b7ca16d30 -r 9b8400ca5ee8 ChangeLog
--- a/ChangeLog	Sun May 20 14:12:57 2007 -0700
+++ b/ChangeLog	Sun May 20 21:52:04 2007 -0700
@@ -1,3 +1,11 @@
+2007-05-20 21:12:57 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [2256]
+  - fix crash if Exclude does not exist.
+  
+  trunk/src/adplug/adplug-xmms.cc |   20 ++++++++++----------
+  1 file changed, 10 insertions(+), 10 deletions(-)
+
+
 2007-05-20 19:05:48 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [2254]
   - get rid of all warnings gcc 4.2.0 emits with my build configuration.
diff -r 028b7ca16d30 -r 9b8400ca5ee8 configure.ac
--- a/configure.ac	Sun May 20 14:12:57 2007 -0700
+++ b/configure.ac	Sun May 20 21:52:04 2007 -0700
@@ -36,6 +36,41 @@
 AC_ISC_POSIX
 AC_C_BIGENDIAN
 
+
+dnl Locate a program and check that its version is acceptable.
+dnl AC_PROG_CHECK_VER(var, namelist, version-switch,
+dnl 		      [version-extract-regexp], version-glob [, do-if-fail])
+AC_DEFUN([AC_CHECK_PROG_VER],
+[AC_CHECK_PROGS([$1], [$2])
+if test -z "[$]$1"; then
+  ac_verc_fail=yes
+else
+  # Found it, now check the version.
+  AC_MSG_CHECKING([version of [$]$1])
+changequote(<<,>>)dnl
+  ac_prog_version=`<<$>>$1 $3 2>&1 ifelse(<<$4>>,,,
+                   <<| sed -n 's/^.*patsubst(<<$4>>,/,\/).*$/\1/p'>>)`
+  case $ac_prog_version in
+    '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+    <<$5>>)
+changequote([,])dnl
+       ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+    *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
+  esac
+  AC_MSG_RESULT([$ac_prog_version])
+fi
+ifelse([$6],,,
+[if test $ac_verc_fail = yes; then
+  $6
+fi])
+])
+
+GCC42_CFLAGS="-fgnu89-inline"
+AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
+  [version \([egcygnustpi-]*[0-9.]*\)], [4.[2-9]* ],
+  GCC42_CFLAGS="")
+
 dnl Check for assembler
 
 AM_PROG_AS
@@ -1320,6 +1355,7 @@
 AC_SUBST(OUTPUT_PLUGINS)
 AC_SUBST(VISUALIZATION_PLUGINS)
 AC_SUBST(CONTAINER_PLUGINS)
+AC_SUBST(GCC42_CFLAGS)
 
 AC_CONFIG_FILES([
 	mk/rules.mk
diff -r 028b7ca16d30 -r 9b8400ca5ee8 mk/rules.mk.in
--- a/mk/rules.mk.in	Sun May 20 14:12:57 2007 -0700
+++ b/mk/rules.mk.in	Sun May 20 21:52:04 2007 -0700
@@ -361,3 +361,4 @@
 IMLIB2_LIBS ?= @IMLIB2_LIBS@
 SIMD_CFLAGS ?= @SIMD_CFLAGS@
 FILEWRITER_LIBS ?= @FILEWRITER_LIBS@
+GCC42_CFLAGS ?= @GCC42_CFLAGS@
diff -r 028b7ca16d30 -r 9b8400ca5ee8 src/lastfm/Makefile
--- a/src/lastfm/Makefile	Sun May 20 14:12:57 2007 -0700
+++ b/src/lastfm/Makefile	Sun May 20 21:52:04 2007 -0700
@@ -13,7 +13,7 @@
 
 CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../intl -I../..
 
-CFLAGS += -Wall  -pedantic -std=c99 -fgnu89-inline
+CFLAGS += -Wall  -pedantic -std=c99 $(GCC42_CFLAGS)
 #CFLAGS += -Wpointer-arith -Wimplicit -Wnested-externs -Wcast-align \
 #-Wcast-qual -Wstrict-prototypes -Wmissing-prototypes \
 #-Wmissing-declarations -W -Wno-unused -Wshadow -Wmissing-noreturn \
diff -r 028b7ca16d30 -r 9b8400ca5ee8 src/wma/Makefile
--- a/src/wma/Makefile	Sun May 20 14:12:57 2007 -0700
+++ b/src/wma/Makefile	Sun May 20 21:52:04 2007 -0700
@@ -15,6 +15,6 @@
 
 LIBDEP = ./libffwma/libffwma.a
 
-CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../.. -I./libffwma -std=c99 -fgnu89-inline
+CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../.. -I./libffwma -std=c99 $(GCC42_CFLAGS)
 
 include ../../mk/objective.mk