rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[configure] fix Savannah bug #35644. 

* builds/unix/configure.raw: Check `-ansi' flag works even if gcc
is used.  Bionic libc headers for Android lose the consistency
when they are parsed with __STDC_VERSION__ older than 199901L or
__STRICT_ANSI__.
This commit is contained in:
suzuki toshiya 2012-03-21 15:42:14 +09:00
parent 37b5c92f83
commit f0b194141d
2 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2012-03-20 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
[configure] fix Savannah bug #35644.
* builds/unix/configure.raw: Check `-ansi' flag works even if gcc
is used. Bionic libc headers for Android lose the consistency
when they are parsed with __STDC_VERSION__ older than 199901L or
__STRICT_ANSI__.
2012-03-20 Werner Lemberg <wl@gnu.org>
[bdf] Improvement to Savannah bug #35656.

64
builds/unix/configure.raw
View File

@ -67,28 +67,6 @@ AC_SUBST(EXEEXT_BUILD)
# get compiler flags right
if test "x$GCC" = xyes; then
XX_CFLAGS="-Wall"
XX_ANSIFLAGS="-pedantic -ansi"
else
case "$host" in
*-dec-osf*)
CFLAGS=
XX_CFLAGS="-std1 -g3"
XX_ANSIFLAGS=
;;
*)
XX_CFLAGS=
XX_ANSIFLAGS=
;;
esac
fi
AC_SUBST([XX_CFLAGS])
AC_SUBST([XX_ANSIFLAGS])
# auxiliary programs
AC_CHECK_PROG([RMF], [rm], [rm -f])
@ -222,6 +200,48 @@ AC_SUBST([FTSYS_SRC])
AC_CHECK_FUNCS([memcpy memmove])
# get compiler flags right
# we try to make the compiler work for C89-strict source.
# even if C compiler is GCC and C89 flags are available,
# some system headers (e.g. Android Bionic libc) is broken
# in C89 mode. we have to check the compilation finishes
# successfully.
#
if test "x$GCC" = xyes; then
XX_CFLAGS="-Wall"
XX_ANSIFLAGS=""
for a in -pedantic -ansi
do
AC_MSG_CHECKING([gcc compiler flag ${a} to assure ANSI C works correctly])
orig_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${XX_ANSIFLAGS} ${a}"
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([#include <stdio.h>],[{puts("");return 0;}])
],[
AC_MSG_RESULT([ok, add it to XX_ANSIFLAGS])
XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}"
],[
AC_MSG_RESULT([no])
])
CFLAGS="${orig_CFLAGS}"
done
else
case "$host" in
*-dec-osf*)
CFLAGS=
XX_CFLAGS="-std1 -g3"
XX_ANSIFLAGS=
;;
*)
XX_CFLAGS=
XX_ANSIFLAGS=
;;
esac
fi
AC_SUBST([XX_CFLAGS])
AC_SUBST([XX_ANSIFLAGS])
# check for system zlib
# don't quote AS_HELP_STRING!