aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-09-23 06:17:40 -0400
committerGlenn Morris2013-09-23 06:17:40 -0400
commitbab4f76d9a0559d7e6691fcc56e762d4ffa93fc0 (patch)
treed06d77238e23abd7c24daff0acc196a3324c21f5
parent5492865b797b7ce33730ea7b013d43beeaf33dc3 (diff)
downloademacs-bab4f76d9a0559d7e6691fcc56e762d4ffa93fc0.tar.gz
emacs-bab4f76d9a0559d7e6691fcc56e762d4ffa93fc0.zip
Auto-commit of generated files.
-rw-r--r--autogen/config.in3
-rwxr-xr-xautogen/configure214
2 files changed, 173 insertions, 44 deletions
diff --git a/autogen/config.in b/autogen/config.in
index c45b9920d06..c68a257f31c 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1102,6 +1102,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1102/* Define to 1 if you have the <utmp.h> header file. */ 1102/* Define to 1 if you have the <utmp.h> header file. */
1103#undef HAVE_UTMP_H 1103#undef HAVE_UTMP_H
1104 1104
1105/* Define to 1 if you have the <valgrind/valgrind.h> header file. */
1106#undef HAVE_VALGRIND_VALGRIND_H
1107
1105/* Define to 1 if you have the `vfork' function. */ 1108/* Define to 1 if you have the `vfork' function. */
1106#undef HAVE_VFORK 1109#undef HAVE_VFORK
1107 1110
diff --git a/autogen/configure b/autogen/configure
index 9010a4cac5b..08577d9efef 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1407,8 +1407,8 @@ GZIP_PROG
1407INSTALL_INFO 1407INSTALL_INFO
1408LN_S_FILEONLY 1408LN_S_FILEONLY
1409GNULIB_WARN_CFLAGS 1409GNULIB_WARN_CFLAGS
1410WARN_CFLAGS
1411WERROR_CFLAGS 1410WERROR_CFLAGS
1411WARN_CFLAGS
1412RANLIB 1412RANLIB
1413ARFLAGS 1413ARFLAGS
1414AR 1414AR
@@ -7545,23 +7545,45 @@ fi
7545# Otherwise, run RUN-IF-NOT-FOUND. 7545# Otherwise, run RUN-IF-NOT-FOUND.
7546 7546
7547 7547
7548# clang is unduly picky about some things.
7549{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
7550$as_echo_n "checking whether the compiler is clang... " >&6; }
7551if test "${emacs_cv_clang+set}" = set; then :
7552 $as_echo_n "(cached) " >&6
7553else
7554 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7555/* end confdefs.h. */
7556
7557 #ifndef __clang__
7558 #error "not clang"
7559 #endif
7560
7561int
7562main ()
7563{
7564
7565 ;
7566 return 0;
7567}
7568_ACEOF
7569if ac_fn_c_try_compile "$LINENO"; then :
7570 emacs_cv_clang=yes
7571else
7572 emacs_cv_clang=no
7573fi
7574rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7575fi
7576{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_clang" >&5
7577$as_echo "$emacs_cv_clang" >&6; }
7578
7548# When compiling with GCC, prefer -isystem to -I when including system 7579# When compiling with GCC, prefer -isystem to -I when including system
7549# include files, to avoid generating useless diagnostics for the files. 7580# include files, to avoid generating useless diagnostics for the files.
7550if test "$gl_gcc_warnings" != yes; then 7581if test "$gl_gcc_warnings" != yes; then
7551 isystem='-I' 7582 isystem='-I'
7552else 7583 if test "$emacs_cv_clang" = yes
7553 isystem='-isystem ' 7584 then
7554 7585 # Turn off some warnings if supported.
7555 # This, $nw, is the list of warnings we disable. 7586 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror -Wunknown-warning-option" >&5
7556 nw=
7557
7558 case $with_x_toolkit in
7559 lucid | athena | motif)
7560 # Old toolkits mishandle 'const'.
7561 nw="$nw -Wwrite-strings"
7562 ;;
7563 *)
7564 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror -Wunknown-warning-option" >&5
7565$as_echo_n "checking whether C compiler handles -Werror -Wunknown-warning-option... " >&6; } 7587$as_echo_n "checking whether C compiler handles -Werror -Wunknown-warning-option... " >&6; }
7566if test "${gl_cv_warn_c__Werror__Wunknown_warning_option+set}" = set; then : 7588if test "${gl_cv_warn_c__Werror__Wunknown_warning_option+set}" = set; then :
7567 $as_echo_n "(cached) " >&6 7589 $as_echo_n "(cached) " >&6
@@ -7598,6 +7620,127 @@ else
7598fi 7620fi
7599 7621
7600 7622
7623{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-switch" >&5
7624$as_echo_n "checking whether C compiler handles -Wno-switch... " >&6; }
7625if test "${gl_cv_warn_c__Wno_switch+set}" = set; then :
7626 $as_echo_n "(cached) " >&6
7627else
7628
7629 gl_save_compiler_FLAGS="$CFLAGS"
7630 as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wswitch"
7631 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7632/* end confdefs.h. */
7633
7634int
7635main ()
7636{
7637
7638 ;
7639 return 0;
7640}
7641_ACEOF
7642if ac_fn_c_try_compile "$LINENO"; then :
7643 gl_cv_warn_c__Wno_switch=yes
7644else
7645 gl_cv_warn_c__Wno_switch=no
7646fi
7647rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7648 CFLAGS="$gl_save_compiler_FLAGS"
7649
7650fi
7651{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_switch" >&5
7652$as_echo "$gl_cv_warn_c__Wno_switch" >&6; }
7653if test "x$gl_cv_warn_c__Wno_switch" = x""yes; then :
7654 as_fn_append WARN_CFLAGS " -Wno-switch"
7655fi
7656
7657
7658
7659{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-tautological-constant-out-of-range-compare" >&5
7660$as_echo_n "checking whether C compiler handles -Wno-tautological-constant-out-of-range-compare... " >&6; }
7661if test "${gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare+set}" = set; then :
7662 $as_echo_n "(cached) " >&6
7663else
7664
7665 gl_save_compiler_FLAGS="$CFLAGS"
7666 as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wtautological-constant-out-of-range-compare"
7667 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7668/* end confdefs.h. */
7669
7670int
7671main ()
7672{
7673
7674 ;
7675 return 0;
7676}
7677_ACEOF
7678if ac_fn_c_try_compile "$LINENO"; then :
7679 gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare=yes
7680else
7681 gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare=no
7682fi
7683rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7684 CFLAGS="$gl_save_compiler_FLAGS"
7685
7686fi
7687{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare" >&5
7688$as_echo "$gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare" >&6; }
7689if test "x$gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare" = x""yes; then :
7690 as_fn_append WARN_CFLAGS " -Wno-tautological-constant-out-of-range-compare"
7691fi
7692
7693
7694
7695{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-pointer-sign" >&5
7696$as_echo_n "checking whether C compiler handles -Wno-pointer-sign... " >&6; }
7697if test "${gl_cv_warn_c__Wno_pointer_sign+set}" = set; then :
7698 $as_echo_n "(cached) " >&6
7699else
7700
7701 gl_save_compiler_FLAGS="$CFLAGS"
7702 as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wpointer-sign"
7703 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7704/* end confdefs.h. */
7705
7706int
7707main ()
7708{
7709
7710 ;
7711 return 0;
7712}
7713_ACEOF
7714if ac_fn_c_try_compile "$LINENO"; then :
7715 gl_cv_warn_c__Wno_pointer_sign=yes
7716else
7717 gl_cv_warn_c__Wno_pointer_sign=no
7718fi
7719rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7720 CFLAGS="$gl_save_compiler_FLAGS"
7721
7722fi
7723{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_pointer_sign" >&5
7724$as_echo "$gl_cv_warn_c__Wno_pointer_sign" >&6; }
7725if test "x$gl_cv_warn_c__Wno_pointer_sign" = x""yes; then :
7726 as_fn_append WARN_CFLAGS " -Wno-pointer-sign"
7727fi
7728
7729
7730 fi
7731else
7732 isystem='-isystem '
7733
7734 # This, $nw, is the list of warnings we disable.
7735 nw=
7736
7737 case $with_x_toolkit in
7738 lucid | athena | motif)
7739 # Old toolkits mishandle 'const'.
7740 nw="$nw -Wwrite-strings"
7741 ;;
7742 *)
7743
7601{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5 7744{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5
7602$as_echo_n "checking whether C compiler handles -Werror... " >&6; } 7745$as_echo_n "checking whether C compiler handles -Werror... " >&6; }
7603if test "${gl_cv_warn_c__Werror+set}" = set; then : 7746if test "${gl_cv_warn_c__Werror+set}" = set; then :
@@ -7669,36 +7812,6 @@ fi
7669 nw="$nw -Wtype-limits" 7812 nw="$nw -Wtype-limits"
7670 nw="$nw -Wunused-parameter" 7813 nw="$nw -Wunused-parameter"
7671 7814
7672 # clang is unduly picky about some things.
7673 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
7674$as_echo_n "checking whether the compiler is clang... " >&6; }
7675if test "${emacs_cv_clang+set}" = set; then :
7676 $as_echo_n "(cached) " >&6
7677else
7678 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7679/* end confdefs.h. */
7680
7681 #ifndef __clang__
7682 #error "not clang"
7683 #endif
7684
7685int
7686main ()
7687{
7688
7689 ;
7690 return 0;
7691}
7692_ACEOF
7693if ac_fn_c_try_compile "$LINENO"; then :
7694 emacs_cv_clang=yes
7695else
7696 emacs_cv_clang=no
7697fi
7698rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7699fi
7700{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_clang" >&5
7701$as_echo "$emacs_cv_clang" >&6; }
7702 if test $emacs_cv_clang = yes; then 7815 if test $emacs_cv_clang = yes; then
7703 nw="$nw -Wcast-align" 7816 nw="$nw -Wcast-align"
7704 fi 7817 fi
@@ -16072,6 +16185,19 @@ fi
16072 16185
16073 16186
16074 16187
16188for ac_header in valgrind/valgrind.h
16189do :
16190 ac_fn_c_check_header_mongrel "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default"
16191if test "x$ac_cv_header_valgrind_valgrind_h" = x""yes; then :
16192 cat >>confdefs.h <<_ACEOF
16193#define HAVE_VALGRIND_VALGRIND_H 1
16194_ACEOF
16195
16196fi
16197
16198done
16199
16200
16075 16201
16076 16202
16077 16203