diff options
| author | Glenn Morris | 2011-04-25 06:18:22 -0400 |
|---|---|---|
| committer | Glenn Morris | 2011-04-25 06:18:22 -0400 |
| commit | e7d4e61f1ef1493a479e20db4d26f00f0116ec2a (patch) | |
| tree | b47e5470da5645ac86ce540997c3967e71aebae7 | |
| parent | 825cd63ca98121d602b4a8dcffa55d29841224a0 (diff) | |
| download | emacs-e7d4e61f1ef1493a479e20db4d26f00f0116ec2a.tar.gz emacs-e7d4e61f1ef1493a479e20db4d26f00f0116ec2a.zip | |
Auto-commit of generated files.
| -rw-r--r-- | autogen/config.in | 7 | ||||
| -rwxr-xr-x | autogen/configure | 22 |
2 files changed, 29 insertions, 0 deletions
diff --git a/autogen/config.in b/autogen/config.in index f2ea751e2f8..a105f958ead 100644 --- a/autogen/config.in +++ b/autogen/config.in | |||
| @@ -279,6 +279,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 279 | /* Define if using GnuTLS. */ | 279 | /* Define if using GnuTLS. */ |
| 280 | #undef HAVE_GNUTLS | 280 | #undef HAVE_GNUTLS |
| 281 | 281 | ||
| 282 | /* Define if using GnuTLS certificate verification callbacks. */ | ||
| 283 | #undef HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY | ||
| 284 | |||
| 285 | /* Define to 1 if you have the `gnutls_certificate_set_verify_function' | ||
| 286 | function. */ | ||
| 287 | #undef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION | ||
| 288 | |||
| 282 | /* Define to 1 if you have the gpm library (-lgpm). */ | 289 | /* Define to 1 if you have the gpm library (-lgpm). */ |
| 283 | #undef HAVE_GPM | 290 | #undef HAVE_GPM |
| 284 | 291 | ||
diff --git a/autogen/configure b/autogen/configure index f433171636b..7068c284163 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -10813,6 +10813,7 @@ fi | |||
| 10813 | 10813 | ||
| 10814 | 10814 | ||
| 10815 | HAVE_GNUTLS=no | 10815 | HAVE_GNUTLS=no |
| 10816 | HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=no | ||
| 10816 | if test "${with_gnutls}" = "yes" ; then | 10817 | if test "${with_gnutls}" = "yes" ; then |
| 10817 | 10818 | ||
| 10818 | succeeded=no | 10819 | succeeded=no |
| @@ -10913,10 +10914,31 @@ $as_echo "no" >&6; } | |||
| 10913 | $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h | 10914 | $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h |
| 10914 | 10915 | ||
| 10915 | fi | 10916 | fi |
| 10917 | |||
| 10918 | CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" | ||
| 10919 | LIBS="$LIBGNUTLS_LIBS $LIBS" | ||
| 10920 | for ac_func in gnutls_certificate_set_verify_function | ||
| 10921 | do : | ||
| 10922 | ac_fn_c_check_func "$LINENO" "gnutls_certificate_set_verify_function" "ac_cv_func_gnutls_certificate_set_verify_function" | ||
| 10923 | if test "x$ac_cv_func_gnutls_certificate_set_verify_function" = x""yes; then : | ||
| 10924 | cat >>confdefs.h <<_ACEOF | ||
| 10925 | #define HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION 1 | ||
| 10926 | _ACEOF | ||
| 10927 | HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=yes | ||
| 10928 | fi | ||
| 10929 | done | ||
| 10930 | |||
| 10931 | |||
| 10932 | if test "${HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY}" = "yes"; then | ||
| 10933 | |||
| 10934 | $as_echo "#define HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY 1" >>confdefs.h | ||
| 10935 | |||
| 10936 | fi | ||
| 10916 | fi | 10937 | fi |
| 10917 | 10938 | ||
| 10918 | 10939 | ||
| 10919 | 10940 | ||
| 10941 | |||
| 10920 | HAVE_XAW3D=no | 10942 | HAVE_XAW3D=no |
| 10921 | LUCID_LIBW= | 10943 | LUCID_LIBW= |
| 10922 | if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then | 10944 | if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then |