diff options
| author | Simon Josefsson <simon@josefsson.org> | 2008-04-17 14:27:58 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2008-04-17 14:27:58 +0200 |
| commit | de8dd7de3eae264c17645c5aede752e47ad95217 (patch) | |
| tree | 4a9bf97e2348fcc0d0d6b30c30b0e564a32262cc | |
| parent | 01a64fe6798a4ba82df9accf67c7c8f657abd9f5 (diff) | |
| parent | b70070b6b11327e7967c83ad77e9d35fa2db05a9 (diff) | |
| download | gnutls-de8dd7de3eae264c17645c5aede752e47ad95217.tar.gz | |
Merge branch 'master' of ssh://jas@git.sv.gnu.org/srv/git/gnutls
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | guile/src/Makefile.am | 8 |
2 files changed, 18 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 83eaf1fc53..fd70eb1ecf 100644 --- a/configure.in +++ b/configure.in @@ -149,7 +149,7 @@ if test $ac_cv_c_compiler_gnu != no; then # AM_CFLAGS="${AM_CFLAGS} -g -W -Wall -Wcast-align -Wpointer-arith -Wchar-subscripts -Wformat-security -Wno-format-y2k -Wmissing-braces -Winline -Wstrict-prototypes -Wshadow -Wno-unused-parameter -Wimplicit -fno-common -Wno-sign-compare -Wbad-function-cast -Wendif-labels -Wmissing-declarations -Wno-missing-format-attribute -Wmissing-prototypes -Wnested-externs -Wpointer-arith -pedantic -Wlong-long -Wcast-qual -Wcast-align -Winline -Wredundant-decls -Wstrict-prototypes -Wwrite-strings -Wparentheses -Wsequence-point -Wpacked -Waggregate-return -Wfloat-equal -Wmultichar -Wunknown-pragmas -Wtrigraphs -Wswitch -Wreturn-type -Wmain -Wchar-subscripts -Wcomment -Wno-missing-noreturn" fi - AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign]) + AC_MSG_CHECKING([whether gcc supports -Wno-pointer-sign]) _gcc_cflags_save=$CFLAGS CFLAGS="${CFLAGS} -Wno-pointer-sign" AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no) @@ -158,6 +158,16 @@ if test $ac_cv_c_compiler_gnu != no; then CFLAGS=$_gcc_cflags_save; fi + AC_MSG_CHECKING([whether gcc supports -fgnu89-inline]) + _gcc_cflags_save="$CFLAGS" + CFLAGS="${CFLAGS} -fgnu89-inline" + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), + _gcc_gnu89_inline=yes, _gcc_gnu89_inline=no) + AC_MSG_RESULT($_gcc_gnu89_inline) + AM_CONDITIONAL([HAVE_GCC_GNU89_INLINE_OPTION], + [test "x$_gcc_gnu89_inline" = "xyes"]) + CFLAGS=$_gcc_cflags_save; + AC_MSG_CHECKING([if gcc/ld supports -Wl,--output-def]) if test "$enable_shared" = no; then output_def=no diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am index f50b5c233d..9bcaf63264 100644 --- a/guile/src/Makefile.am +++ b/guile/src/Makefile.am @@ -68,10 +68,16 @@ if HAVE_GCC # after `-Ws-p'. AM_CFLAGS += -Wno-strict-prototypes +# The `-fgnu89-inline' option appeared in GCC 4.1.3. +if HAVE_GCC_GNU89_INLINE_OPTION + # Guile and GMP currently rely on GNU inline semantics, not C99 inline. AM_CFLAGS += -fgnu89-inline -endif +endif HAVE_GCC_GNU89_INLINE_OPTION + +endif HAVE_GCC + enums.h: $(srcdir)/make-enum-header.scm $(GUILE_FOR_BUILD) $^ > $@ |