--- libnice-0.0.13.orig/configure.ac	2010-07-20 17:56:56.000000000 -0400
+++ libnice-0.0.13/configure.ac	2010-09-21 20:10:59.960332261 -0400
@@ -59,10 +59,29 @@
 AC_CHECK_HEADERS([arpa/inet.h net/in.h ifaddrs.h], \
 		      [AC_DEFINE(HAVE_GETIFADDRS, [1], \
 		       [Whether getifaddrs() is available on the system])])
+
+dnl GCC-specific options
+if test x"$GCC" = "xyes"; then
+	LIBNICE_CFLAGS="-std=gnu99
+	-fno-strict-aliasing \
+	-Wall \
+	-Wextra \
+	-Wundef \
+	-Wnested-externs \
+	-Wwrite-strings \
+	-Wpointer-arith \
+	-Wbad-function-cast \
+	-Wmissing-declarations \
+	-Wmissing-prototypes \
+	-Wstrict-prototypes \
+	-Wredundant-decls \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers"
+# -Wold-style-definition -Winline -Wunreachable-code
+fi
 
-LIBNICE_CFLAGS="-Wall"
 dnl if asked for, add -Werror if supported
-if test "x$LIBNICE_RELEASE" != "xyes"; then
+if test "x$GCC" = "xyes" -a "x$LIBNICE_RELEASE" != "xyes"; then
   LIBNICE_CFLAGS="$LIBNICE_CFLAGS -Werror"
 fi
 
--- libnice-0.0.13.orig/stun/tools/Makefile.am	2009-08-14 18:46:12.000000000 -0400
+++ libnice-0.0.13/stun/tools/Makefile.am	2010-09-21 19:55:27.473601046 -0400
@@ -8,7 +8,7 @@
 #
 
 include $(top_srcdir)/common.mk
-AM_CFLAGS = -std=gnu99 $(ERROR_CFLAGS)
+AM_CFLAGS = $(ERROR_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir) 
 
 bin_PROGRAMS = stunbdc stund
--- libnice-0.0.13.orig/stun/Makefile.am	2009-08-14 18:46:12.000000000 -0400
+++ libnice-0.0.13/stun/Makefile.am	2010-09-21 12:26:22.892182282 -0400
@@ -10,7 +10,7 @@
 
 include $(top_srcdir)/common.mk
 
-AM_CFLAGS = -std=gnu99 -DG_LOG_DOMAIN=\"libnice-stun\" $(ERROR_CFLAGS)
+AM_CFLAGS = -DG_LOG_DOMAIN=\"libnice-stun\" $(ERROR_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libstun.la
--- libnice-0.0.13.orig/common.mk	2010-03-18 17:02:53.000000000 -0400
+++ libnice-0.0.13/common.mk	2010-09-20 23:16:37.184774695 -0400
@@ -1,20 +1,6 @@
 
 ERROR_CFLAGS = \
-	$(LIBNICE_CFLAGS) \
-	-fno-strict-aliasing \
-	-Wextra \
-	-Wundef \
-	-Wnested-externs \
-	-Wwrite-strings \
-	-Wpointer-arith \
-	-Wbad-function-cast \
-	-Wmissing-declarations \
-	-Wmissing-prototypes \
-	-Wstrict-prototypes \
-	-Wredundant-decls \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers
-# -Wold-style-definition -Winline -Wunreachable-code
+	$(LIBNICE_CFLAGS)
 
 CLEANFILES = *.gcno *.gcda