From db7863f422260758d9e0fc5e3bf71fae0e8aabb4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 3 Jul 2013 06:17:43 -0400 Subject: [PATCH] Auto-commit of generated files. --- autogen/config.in | 73 ------------------- autogen/configure | 176 ++-------------------------------------------- 2 files changed, 7 insertions(+), 242 deletions(-) diff --git a/autogen/config.in b/autogen/config.in index 94185b160ca..89ad415f3b0 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -90,9 +90,6 @@ along with GNU Emacs. If not, see . */ /* Name of the default sound device. */ #undef DEFAULT_SOUND_DEVICE -/* Character that separates a device in a file name. */ -#undef DEVICE_SEP - /* Define to 1 for DGUX with . */ #undef DGUX @@ -281,9 +278,6 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if the ACL type ACL_TYPE_EXTENDED exists. */ #undef HAVE_ACL_TYPE_EXTENDED -/* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */ -#undef HAVE_AIX_SMT_EXP - /* Define to 1 if you have 'alloca' after including , a header that may be supplied by this distribution. */ #undef HAVE_ALLOCA @@ -412,12 +406,6 @@ along with GNU Emacs. If not, see . */ don't. */ #undef HAVE_DECL___SYS_SIGLIST -/* Define to 1 if you have the header file. */ -#undef HAVE_DES_H - -/* Define to 1 if dynamic ptys are supported. */ -#undef HAVE_DEV_PTMX - /* Define to 1 if you have the `difftime' function. */ #undef HAVE_DIFFTIME @@ -559,13 +547,6 @@ along with GNU Emacs. If not, see . */ /* Define if using GnuTLS. */ #undef HAVE_GNUTLS -/* Define if using GnuTLS certificate verification callbacks. */ -#undef HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY - -/* Define to 1 if you have the `gnutls_certificate_set_verify_function' - function. */ -#undef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION - /* Define to 1 if you have the gpm library (-lgpm). */ #undef HAVE_GPM @@ -635,15 +616,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the jpeg library (-ljpeg). */ #undef HAVE_JPEG -/* Define to 1 if you have the header file. */ -#undef HAVE_KERBEROSIV_DES_H - /* Define to 1 if you have the header file. */ #undef HAVE_KERBEROSIV_KRB_H -/* Define to 1 if you have the header file. */ -#undef HAVE_KERBEROS_DES_H - /* Define to 1 if you have the header file. */ #undef HAVE_KERBEROS_KRB_H @@ -662,18 +637,6 @@ along with GNU Emacs. If not, see . */ /* Define if you have and nl_langinfo(CODESET). */ #undef HAVE_LANGINFO_CODESET -/* Define to 1 if you have the `com_err' library (-lcom_err). */ -#undef HAVE_LIBCOM_ERR - -/* Define to 1 if you have the `crypto' library (-lcrypto). */ -#undef HAVE_LIBCRYPTO - -/* Define to 1 if you have the `des' library (-ldes). */ -#undef HAVE_LIBDES - -/* Define to 1 if you have the `des425' library (-ldes425). */ -#undef HAVE_LIBDES425 - /* Define to 1 if you have the `dgc' library (-ldgc). */ #undef HAVE_LIBDGC @@ -683,21 +646,6 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the header file. */ #undef HAVE_LIBGEN_H -/* Define to 1 if you have the hesiod library (-lhesiod). */ -#undef HAVE_LIBHESIOD - -/* Define to 1 if you have the `k5crypto' library (-lk5crypto). */ -#undef HAVE_LIBK5CRYPTO - -/* Define to 1 if you have the `krb' library (-lkrb). */ -#undef HAVE_LIBKRB - -/* Define to 1 if you have the `krb4' library (-lkrb4). */ -#undef HAVE_LIBKRB4 - -/* Define to 1 if you have the `krb5' library (-lkrb5). */ -#undef HAVE_LIBKRB5 - /* Define to 1 if you have the `kstat' library (-lkstat). */ #undef HAVE_LIBKSTAT @@ -722,9 +670,6 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `pthreads' library (-lpthreads). */ #undef HAVE_LIBPTHREADS -/* Define to 1 if you have the resolv library (-lresolv). */ -#undef HAVE_LIBRESOLV - /* Define to 1 if using SELinux. */ #undef HAVE_LIBSELINUX @@ -737,9 +682,6 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `Xmu' library (-lXmu). */ #undef HAVE_LIBXMU -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_VERSION_H - /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R @@ -802,9 +744,6 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP -/* Define to 1 if you have the header file. */ -#undef HAVE_MMSYSTEM_H - /* Define to 1 if you have the `nanotime' function. */ #undef HAVE_NANOTIME @@ -939,9 +878,6 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the header file. */ #undef HAVE_SOUNDCARD_H -/* Define to 1 if `speed_t' is declared by . */ -#undef HAVE_SPEED_T - /* Define to 1 if you have the `statacl' function. */ #undef HAVE_STATACL @@ -1128,9 +1064,6 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `utimensat' function. */ #undef HAVE_UTIMENSAT -/* Define to 1 if you have the `utimes' function. */ -#undef HAVE_UTIMES - /* Define to 1 if you have the header file. */ #undef HAVE_UTIME_H @@ -1561,9 +1494,6 @@ along with GNU Emacs. If not, see . */ /* Define if the system is compatible with System III. */ #undef USG -/* Define if the system is compatible with System V. */ -#undef USG5 - /* Define if the system is compatible with System V Release 4. */ #undef USG5_4 @@ -1797,9 +1727,6 @@ along with GNU Emacs. If not, see . */ /* Define to enable asynchronous subprocesses. */ #undef subprocesses -/* Define to any substitute for sys_siglist. */ -#undef sys_siglist - /* Define as a marker that can be attached to declarations that might not be used. This helps to reduce warnings, such as from GCC -Wunused-parameter. */ diff --git a/autogen/configure b/autogen/configure index 4feb8ace937..463c5905a12 100755 --- a/autogen/configure +++ b/autogen/configure @@ -3352,7 +3352,6 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -as_fn_append ac_header_list " linux/version.h" as_fn_append ac_header_list " sys/systeminfo.h" as_fn_append ac_header_list " coff.h" as_fn_append ac_header_list " pty.h" @@ -8991,7 +8990,7 @@ fi if test "${with_sound}" != "no"; then # Sound support for GNU/Linux, the free BSDs, and MinGW. - for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h mmsystem.h + for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " @@ -9212,8 +9211,6 @@ done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if personality LINUX32 can be set" >&5 $as_echo_n "checking if personality LINUX32 can be set... " >&6; } @@ -9318,11 +9315,6 @@ cat >>confdefs.h <<_ACEOF #define HAVE_DECL___SYS_SIGLIST $ac_have_decl _ACEOF - if test $ac_cv_have_decl___sys_siglist = yes; then - -$as_echo "#define sys_siglist __sys_siglist" >>confdefs.h - - fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } @@ -9366,37 +9358,6 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5 -$as_echo_n "checking for speed_t... " >&6; } -if test "${emacs_cv_speed_t+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -speed_t x = 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - emacs_cv_speed_t=yes -else - emacs_cv_speed_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_speed_t" >&5 -$as_echo "$emacs_cv_speed_t" >&6; } -if test $emacs_cv_speed_t = yes; then - -$as_echo "#define HAVE_SPEED_T 1" >>confdefs.h - -fi - @@ -11960,7 +11921,6 @@ fi HAVE_GNUTLS=no -HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=no if test "${with_gnutls}" = "yes" ; then succeeded=no @@ -12019,33 +11979,12 @@ $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h fi - OLD_CFLAGS=$CFLAGS - OLD_LIBS=$LIBS - CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" - LIBS="$LIBGNUTLS_LIBS $LIBS" - for ac_func in gnutls_certificate_set_verify_function -do : - ac_fn_c_check_func "$LINENO" "gnutls_certificate_set_verify_function" "ac_cv_func_gnutls_certificate_set_verify_function" -if test "x$ac_cv_func_gnutls_certificate_set_verify_function" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION 1 -_ACEOF - HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=yes -fi -done - - - if test "${HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY}" = "yes"; then - -$as_echo "#define HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY 1" >>confdefs.h - - fi - # Windows loads GnuTLS dynamically if test "${opsys}" = "mingw32"; then - CFLAGS=$OLD_CFLAGS - LIBS=$OLD_LIBS LIBGNUTLS_LIBS= + else + CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" + LIBS="$LIBGNUTLS_LIBS $LIBS" fi fi @@ -14720,7 +14659,7 @@ for ac_func in gethostname \ getrusage get_current_dir_name \ lrand48 \ select getpagesize setlocale \ -utimes getrlimit setrlimit shutdown getaddrinfo \ +getrlimit setrlimit shutdown getaddrinfo \ strsignal setitimer \ sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \ gai_strerror mkstemp getline getdelim sync \ @@ -15293,9 +15232,6 @@ fi if test x"$hesiod" = xyes; then - -$as_echo "#define HAVE_LIBHESIOD 1" >>confdefs.h - LIBHESIOD=-lhesiod fi fi @@ -15303,9 +15239,6 @@ fi # Do we need libresolv (due to res_init or Hesiod)? if test "$resolv" = yes && test $opsys != darwin; then - -$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h - LIBRESOLV=-lresolv else LIBRESOLV= @@ -15365,9 +15298,6 @@ fi if test $have_com_err = yes; then COM_ERRLIB=-lcom_err LIBS="$COM_ERRLIB $LIBS" - -$as_echo "#define HAVE_LIBCOM_ERR 1" >>confdefs.h - fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lcrypto" >&5 $as_echo_n "checking for mit_des_cbc_encrypt in -lcrypto... " >&6; } @@ -15414,9 +15344,6 @@ fi if test $have_crypto = yes; then CRYPTOLIB=-lcrypto LIBS="$CRYPTOLIB $LIBS" - -$as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h - fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lk5crypto" >&5 $as_echo_n "checking for mit_des_cbc_encrypt in -lk5crypto... " >&6; } @@ -15463,9 +15390,6 @@ fi if test $have_k5crypto = yes; then CRYPTOLIB=-lk5crypto LIBS="$CRYPTOLIB $LIBS" - -$as_echo "#define HAVE_LIBK5CRYPTO 1" >>confdefs.h - fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_init_context in -lkrb5" >&5 $as_echo_n "checking for krb5_init_context in -lkrb5... " >&6; } @@ -15512,9 +15436,6 @@ fi if test $have_krb5=yes; then KRB5LIB=-lkrb5 LIBS="$KRB5LIB $LIBS" - -$as_echo "#define HAVE_LIBKRB5 1" >>confdefs.h - fi if test "${with_kerberos5}" = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes425" >&5 @@ -15562,9 +15483,6 @@ fi if test $have_des425 = yes; then DESLIB=-ldes425 LIBS="$DESLIB $LIBS" - -$as_echo "#define HAVE_LIBDES425 1" >>confdefs.h - else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes" >&5 $as_echo_n "checking for des_cbc_encrypt in -ldes... " >&6; } @@ -15611,9 +15529,6 @@ fi if test $have_des = yes; then DESLIB=-ldes LIBS="$DESLIB $LIBS" - -$as_echo "#define HAVE_LIBDES 1" >>confdefs.h - fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb4" >&5 @@ -15661,9 +15576,6 @@ fi if test $have_krb4 = yes; then KRB4LIB=-lkrb4 LIBS="$KRB4LIB $LIBS" - -$as_echo "#define HAVE_LIBKRB4 1" >>confdefs.h - else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb" >&5 $as_echo_n "checking for krb_get_cred in -lkrb... " >&6; } @@ -15710,9 +15622,6 @@ fi if test $have_krb = yes; then KRB4LIB=-lkrb LIBS="$KRB4LIB $LIBS" - -$as_echo "#define HAVE_LIBKRB 1" >>confdefs.h - fi fi fi @@ -15751,44 +15660,6 @@ fi done else - for ac_header in des.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "des.h" "ac_cv_header_des_h" "$ac_includes_default" -if test "x$ac_cv_header_des_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DES_H 1 -_ACEOF - -else - for ac_header in kerberosIV/des.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/des.h" "ac_cv_header_kerberosIV_des_h" "$ac_includes_default" -if test "x$ac_cv_header_kerberosIV_des_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_KERBEROSIV_DES_H 1 -_ACEOF - -else - for ac_header in kerberos/des.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "kerberos/des.h" "ac_cv_header_kerberos_des_h" "$ac_includes_default" -if test "x$ac_cv_header_kerberos_des_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_KERBEROS_DES_H 1 -_ACEOF - -fi - -done - -fi - -done - -fi - -done - for ac_header in krb.h do : ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default" @@ -15958,25 +15829,6 @@ $as_echo "#define HAVE_INET_SOCKETS 1" >>confdefs.h fi -if test -f /usr/lpp/X11/bin/smt.exp; then - -$as_echo "#define HAVE_AIX_SMT_EXP 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system supports dynamic ptys" >&5 -$as_echo_n "checking whether system supports dynamic ptys... " >&6; } -if test -d /dev/pts && ls -d /dev/ptmx > /dev/null 2>&1 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_DEV_PTMX 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - case $canonical in *-solaris2.4 | *-solaris2.4.*) : ${ac_cv_func_vfork_works=no};; @@ -16409,12 +16261,9 @@ $as_echo "#define USER_FULL_NAME pw->pw_gecos" >>confdefs.h $as_echo "#define DIRECTORY_SEP '/'" >>confdefs.h - if test "${opsys}" = "mingw32"; then - $as_echo "#define DEVICE_SEP ':'" >>confdefs.h - -$as_echo "#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)" >>confdefs.h +$as_echo "#define IS_DEVICE_SEP(_c_) ((_c_) == ':')" >>confdefs.h @@ -16466,7 +16315,7 @@ esac emacs_broken_SIGIO=no case $opsys in - hpux* | irix6-5 | openbsd | sol2* | unixware ) + hpux* | irix6-5 | openbsd | sol2* | unixware | gnu-kfreebsd ) emacs_broken_SIGIO=yes ;; @@ -16898,13 +16747,10 @@ esac - case $opsys in aix4-2) $as_echo "#define USG /**/" >>confdefs.h - $as_echo "#define USG5 /**/" >>confdefs.h - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16953,8 +16799,6 @@ $as_echo "#define GNU_LINUX /**/" >>confdefs.h hpux*) $as_echo "#define USG /**/" >>confdefs.h - $as_echo "#define USG5 /**/" >>confdefs.h - $as_echo "#define HPUX /**/" >>confdefs.h @@ -16963,8 +16807,6 @@ $as_echo "#define HPUX /**/" >>confdefs.h irix6-5) $as_echo "#define USG /**/" >>confdefs.h - $as_echo "#define USG5 /**/" >>confdefs.h - $as_echo "#define USG5_4 /**/" >>confdefs.h @@ -16988,8 +16830,6 @@ $as_echo "#define EMACSDEBUG 1" >>confdefs.h sol2*) $as_echo "#define USG /**/" >>confdefs.h - $as_echo "#define USG5 /**/" >>confdefs.h - $as_echo "#define USG5_4 /**/" >>confdefs.h @@ -17000,8 +16840,6 @@ $as_echo "#define SOLARIS2 /**/" >>confdefs.h unixware) $as_echo "#define USG /**/" >>confdefs.h - $as_echo "#define USG5 /**/" >>confdefs.h - $as_echo "#define USG5_4 /**/" >>confdefs.h ;; -- 2.39.2