diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/demuxers/Makefile.am | 2 | ||||
| -rw-r--r-- | src/input/Makefile.am | 4 | ||||
| -rw-r--r-- | src/input/libdvdnav/Makefile.am | 2 | ||||
| -rw-r--r-- | src/input/libdvdread/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xine-utils/Makefile.am | 2 |
7 files changed, 11 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index b10fb5c34..198305b05 100644 --- a/configure.ac +++ b/configure.ac @@ -693,9 +693,8 @@ 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="") + ANSI_FLAGS="-ansi" + AC_SUBST(ANSI_FLAGS) fi dnl Flags not supported by all *cc* variants @@ -712,7 +711,7 @@ enable_armv4l="no" case "$host_or_hostalias" in i386-*-freebsd*) - 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" + 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" 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]) @@ -739,7 +738,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_ansi $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_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" diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index f4971cd82..f813bae2a 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = $(OGG_CFLAGS) +AM_CFLAGS = $(OGG_CFLAGS) @ANSI_FLAGS@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 58927b48d..23a8403c8 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -37,8 +37,8 @@ DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ link_dvdnav = libdvdnav/libdvdnav.la libdvdread/libdvdread.la endif -AM_CFLAGS = $(DVD_CFLAGS) -DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(DVD_CFLAGS) +AM_CFLAGS = $(DVD_CFLAGS) @ANSI_FLAGS@ +DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(DVD_CFLAGS) @ANSI_FLAGS@ lib_LTLIBRARIES = \ xineplug_inp_file.la \ diff --git a/src/input/libdvdnav/Makefile.am b/src/input/libdvdnav/Makefile.am index d5cabf2dc..25fffce5d 100644 --- a/src/input/libdvdnav/Makefile.am +++ b/src/input/libdvdnav/Makefile.am @@ -1,7 +1,7 @@ DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ -I$(top_srcdir)/src/input/libdvdread/ -AM_CFLAGS = $(DVD_CFLAGS) +AM_CFLAGS = $(DVD_CFLAGS) @ANSI_FLAGS@ noinst_LTLIBRARIES = libdvdnav.la diff --git a/src/input/libdvdread/Makefile.am b/src/input/libdvdread/Makefile.am index 0970438c1..43223b4d7 100644 --- a/src/input/libdvdread/Makefile.am +++ b/src/input/libdvdread/Makefile.am @@ -1,6 +1,6 @@ DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -AM_CFLAGS = $(DVD_CFLAGS) +AM_CFLAGS = $(DVD_CFLAGS) @ANSI_FLAGS@ noinst_LTLIBRARIES = libdvdread.la diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index cd10b0823..634cb47ed 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in ## -AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) +AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) @ANSI_FLAGS@ lib_LTLIBRARIES = libxine.la diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 1cca7b514..856ffc8f4 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -10,7 +10,7 @@ if PPC_ARCH pppc_files = ppcasm_string.S endif -AM_CFLAGS = $(THREAD_CFLAGS) +AM_CFLAGS = $(THREAD_CFLAGS) @ANSI_FLAGS@ libxineutils_la_SOURCES = $(pppc_files) \ cpu_accel.c \ |