From 19294e4b388571ba45162b3704f8aacd38e72158 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 16 Sep 2004 22:44:40 +0000
Subject: fix two gcc 2.95 incompatibilities

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@207 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 configure.ac        | 7 ++++---
 polyp/dumpmodules.c | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 07b2b96c..8b5a72ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,8 +40,6 @@ AC_SUBST(INCLTDL)
 AC_SUBST(LIBLTDL)
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
-AC_PROG_LEX
-AC_PROG_YACC
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -108,7 +106,10 @@ AM_CONDITIONAL([HAVE_GLIB12], [test "x$HAVE_GLIB12" = x1])
 
 # If using GCC specifiy some additional parameters
 if test "x$GCC" = "xyes" ; then
-   CFLAGS="$CFLAGS -pipe -W -Wall -Wno-unused-parameter -pedantic -std=c99"
+   CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"
+
+   AC_LANG_CONFTEST([int main()])
+   $CC -std=c99 -Wno-unused-parameter -E conftest.c -o - > /dev/null 2>&1 && CFLAGS="$CFLAGS -std=c99 -Wno-unused-parameter"
 fi
 
 # LYNX documentation generation
diff --git a/polyp/dumpmodules.c b/polyp/dumpmodules.c
index 9ed89692..ae42d36e 100644
--- a/polyp/dumpmodules.c
+++ b/polyp/dumpmodules.c
@@ -40,8 +40,8 @@ static void short_info(const char *name, const char *path, struct pa_modinfo *i)
 }
 
 static void long_info(const char *name, const char *path, struct pa_modinfo *i) {
-    assert(name && i);
     static int nl = 0;
+    assert(name && i);
     
     if (nl)
         printf("\n");
-- 
cgit