aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am12
-rw-r--r--configure.ac13
2 files changed, 2 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am
index 29294d87..0aec7ae4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,7 @@ if IS_GLIBC
CFLAGS += -D_GNU_SOURCE
endif
-# Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly
-# different flags.
+# Set flags for gcc.
if IS_GCC
CFLAGS += -std=gnu99 -O2
if IS_DEBUG
@@ -32,17 +31,10 @@ CFLAGS += -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align
-CFLAGS += -Wdeclaration-after-statement
+CFLAGS += -Wdeclaration-after-statement -Wno-pointer-sign
CPPFLAGS += -DDEBUG
endif
-if IS_GCC4
CPPFLAGS += -iquote.
-if IS_DEBUG
-CFLAGS += -Wno-pointer-sign
-endif
-else
-CPPFLAGS += -I. -I-
-endif
endif
# Set flags for Solaris.
diff --git a/configure.ac b/configure.ac
index 0dd1151c..cd3ab5a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,19 +44,6 @@ fi
# Is this gcc?
AM_CONDITIONAL(IS_GCC, test "x$GCC" = xyes)
-AC_MSG_CHECKING(for gcc that whines about -I)
-AC_EGREP_CPP(
- yes,
- [
- #if __GNUC__ > 3
- yes
- #endif
- ],
- found_gcc4=yes,
- found_gcc4=no
-)
-AM_CONDITIONAL(IS_GCC4, test "x$found_gcc4" = xyes)
-AC_MSG_RESULT($found_gcc4)
# Is this Sun CC?
AC_EGREP_CPP(