From 65d0e5af3d1d5d9b2f92fffe2931212063499632 Mon Sep 17 00:00:00 2001
From: Brian Cameron <brian.cameron@sun.com>
Date: Wed, 21 May 2003 18:16:28 +0000
Subject: [PATCH] Corrected the configure.ac so it actually works.  Updated
 some c files so that they build on Solaris.  This mostly in...

Original commit message from CVS:
Corrected the configure.ac so it actually works.  Updated some c files
so that they build on Solaris.  This mostly involved supporting ISO
style variable-argument macros.
---
 configure.ac       | 24 ++++++++++++++----------
 gst/goom/filters.c |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index b9c0bb0bc2..ba930d4940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,17 +41,21 @@ AM_PROG_AS
 AS="${CC}"
 
 dnl decide on error flags
-AS_COMPILER_FLAG(-Wall,GST_ERROR="$GST_ERROR -Wall",GST_ERROR="$GST_ERROR")
-if test "x$GST_CVS"="xyes"; then
-  AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR")
+AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
 
-  # Only set these optimization flags if gcc is being used.
-  #
-  GST_FUNROLL_CFLAGS="$GST_FUNROLL_CFLAGS -funroll-all-loops"
-  GST_FINLINE_CFLAGS="$GST_FINLINE_CFLAGS -finline-functions"
-  GST_FFASTMATH_CFLAGS="$GST_FFASTMATH_CFLAGS -ffast-math"
-  GST_FSCHEDULE_CFLAGS="$GST_FSCHEDULE_CFLAGS -fschedule-insns2"
-  GST_FNOEXCEPTIONS_CFLAGS="$GST_FNOEXCEPTIONS_CFLAGS -fno-exceptions"
+if test "x$GST_WALL" = "xyes"; then
+   GST_ERROR="$GST_ERROR -Wall"
+
+   if test "x$GST_CVS" = "xyes"; then
+     AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR")
+   fi
+
+   dnl set gcc-style optimization flags if using the gnu compiler.
+   GST_FUNROLL_CFLAGS="$GST_FUNROLL_CFLAGS -funroll-all-loops"
+   GST_FINLINE_CFLAGS="$GST_FINLINE_CFLAGS -finline-functions"
+   GST_FFASTMATH_CFLAGS="$GST_FFASTMATH_CFLAGS -ffast-math"
+   GST_FSCHEDULE_CFLAGS="$GST_FSCHEDULE_CFLAGS -fschedule-insns2"
+   GST_FNOEXCEPTIONS_CFLAGS="$GST_FNOEXCEPTIONS_CFLAGS -fno-exceptions"
 fi
 
 dnl determine c++ compiler
diff --git a/gst/goom/filters.c b/gst/goom/filters.c
index 06dd68ea44..8fdabc180b 100644
--- a/gst/goom/filters.c
+++ b/gst/goom/filters.c
@@ -84,7 +84,7 @@ inline int ShiftRight (int x, const unsigned char s)
   px et py indique la nouvelle position (en sqrtperte ieme de pixel)
   (valeur * 16)
 */
-inline void calculatePXandPY (int x, int y, int *px, int *py)
+void calculatePXandPY (int x, int y, int *px, int *py)
 {
     if (theMode == WATER_MODE)
     {