From 97ae59b6bafd550701baef3d4c4c04f372add645 Mon Sep 17 00:00:00 2001
From: Brian Cameron <brian.cameron@sun.com>
Date: Wed, 21 May 2003 18:16:30 +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                         | 26 +++++++++++++++-----------
 gst-libs/gst/media-info/media-info.c | 11 +++++++++++
 gst-libs/gst/riff/riffutil.c         |  8 ++++++++
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index b9c0bb0..ba930d4 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")
-
-  # 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"
+AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
+
+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-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c
index e2afd51..067286c 100644
--- a/gst-libs/gst/media-info/media-info.c
+++ b/gst-libs/gst/media-info/media-info.c
@@ -22,9 +22,20 @@
 #include "media-info.h"
 
 static gboolean _gst_media_info_debug = TRUE;
+
+#ifdef G_HAVE_ISO_VARARGS
+
+#define GMI_DEBUG(...) \
+  { if (_gst_media_info_debug) { g_print ( __VA_ARGS__ ); }}
+
+#elif defined(G_HAVE_GNUC_VARARGS)
+
 #define GMI_DEBUG(format, args...) \
   { if (_gst_media_info_debug) { g_print ( format , ## args ); }}
 
+#endif
+
+
 struct GstMediaInfoPriv
 {
   GstElement *pipeline;
diff --git a/gst-libs/gst/riff/riffutil.c b/gst-libs/gst/riff/riffutil.c
index e4c134f..f754f75 100644
--- a/gst-libs/gst/riff/riffutil.c
+++ b/gst-libs/gst/riff/riffutil.c
@@ -21,8 +21,16 @@
 #include <riff.h>
 
 /*#define debug(format,args...) g_print(format,##args) */
+
+#ifdef G_HAVE_ISO_VARARGS
+
+#define debug(format,...)
+
+#elif defined(G_HAVE_GNUC_VARARGS)
+
 #define debug(format,args...)
 
+#endif
 
 gulong gst_riff_fourcc_to_id(gchar *fourcc) {
   g_return_val_if_fail(fourcc != NULL, 0);
-- 
2.7.4