summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index dde27dd0f..b10fb5c34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -693,6 +693,9 @@ if test "$GCC" = yes; then
f_al="-malign-loops=4")
AC_TRY_CFLAGS("-falign-jumps=4", f_aj="-falign-jumps=4",
f_aj="-malign-jumps=4")
+ AC_TRY_CFLAGS("-ansi", f_ansi="-ansi", f_ansi="")
+ AC_TRY_CFLAGS("-pedantic",f_ped="-pedantic", f_ped="")
+ AC_TRY_CFLAGS("-pedantic-errors",f_ped_err="-pedantic-errors",f_ped_err="")
fi
dnl Flags not supported by all *cc* variants
@@ -709,7 +712,7 @@ enable_armv4l="no"
case "$host_or_hostalias" in
i386-*-freebsd*)
- CFLAGS="$CFLAGS -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
+ CFLAGS="$CFLAGS -pipe -fomit-frame-pointer $f_ansi $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS"
AC_DEFINE(__i386__,1,[Define this if you're running x86 architecture])
AC_DEFINE_UNQUOTED(ARCH_X86,,[Define this if you're running x86 architecture])
@@ -736,7 +739,7 @@ case "$host_or_hostalias" in
AC_TRY_CFLAGS("$sarchopt=athlon", k7cpu="athlon", k7cpu="i686")
dnl add x86 specific gcc CFLAGS
- CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
+ CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $f_ansi $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
DEBUG_CFLAGS="$DEBUG_CFLAGS"
@@ -1312,7 +1315,7 @@ dnl some levels of variable expansion to get final install paths
final_libdir="`eval eval eval eval echo $libdir`"
final_bindir="`eval eval eval eval echo $bindir`"
-if test -r /etc/ld.so.conf && ! grep -x "$final_libdir/?" /etc/ld.so.conf >/dev/null ; then
+if test -r /etc/ld.so.conf && ! grep -x "$final_libdir" /etc/ld.so.conf >/dev/null ; then
if test "$final_libdir" != "/lib" -a "$final_libdir" != "/usr/lib" ; then
if ! echo $LD_LIBRARY_PATH | grep -E "(:|^)$final_libdir(/?:|/?$)" >/dev/null ; then
echo