Ticket #25391: zzz_conf.patch

File zzz_conf.patch, 7.4 KB (added by Vaush, 18 months ago)

Python3 patch - 2 of 2

  • aclocal.m4

    diff --git a/aclocal.m4 b/aclocal.m4
    index 9a9cc55..df7895b 100644
    a b  
    1 # generated automatically by aclocal 1.15 -*- Autoconf -*-
     1# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
    22
    3 # Copyright (C) 1996-2014 Free Software Foundation, Inc.
     3# Copyright (C) 1996-2017 Free Software Foundation, Inc.
    44
    55# This file is free software; the Free Software Foundation
    66# gives unlimited permission to copy and/or distribute it,
     
    1212# PARTICULAR PURPOSE.
    1313
    1414m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
    15 dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
    16 dnl serial 11 (pkg-config-0.29)
    17 dnl
     15# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
     16# serial 11 (pkg-config-0.29.1)
     17
    1818dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
    1919dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
    2020dnl
    dnl 
    5555dnl See the "Since" comment for each macro you use to see what version
    5656dnl of the macros you require.
    5757m4_defun([PKG_PREREQ],
    58 [m4_define([PKG_MACROS_VERSION], [0.29])
     58[m4_define([PKG_MACROS_VERSION], [0.29.1])
    5959m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
    6060    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
    6161])dnl PKG_PREREQ
    AS_VAR_COPY([$1], [pkg_cv_][$1]) 
    288288AS_VAR_IF([$1], [""], [$5], [$4])dnl
    289289])dnl PKG_CHECK_VAR
    290290
     291dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
     292dnl   [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
     293dnl   [DESCRIPTION], [DEFAULT])
     294dnl ------------------------------------------
     295dnl
     296dnl Prepare a "--with-" configure option using the lowercase
     297dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
     298dnl PKG_CHECK_MODULES in a single macro.
     299AC_DEFUN([PKG_WITH_MODULES],
     300[
     301m4_pushdef([with_arg], m4_tolower([$1]))
     302
     303m4_pushdef([description],
     304           [m4_default([$5], [build with ]with_arg[ support])])
     305
     306m4_pushdef([def_arg], [m4_default([$6], [auto])])
     307m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
     308m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
     309
     310m4_case(def_arg,
     311            [yes],[m4_pushdef([with_without], [--without-]with_arg)],
     312            [m4_pushdef([with_without],[--with-]with_arg)])
     313
     314AC_ARG_WITH(with_arg,
     315     AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
     316    [AS_TR_SH([with_]with_arg)=def_arg])
     317
     318AS_CASE([$AS_TR_SH([with_]with_arg)],
     319            [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
     320            [auto],[PKG_CHECK_MODULES([$1],[$2],
     321                                        [m4_n([def_action_if_found]) $3],
     322                                        [m4_n([def_action_if_not_found]) $4])])
     323
     324m4_popdef([with_arg])
     325m4_popdef([description])
     326m4_popdef([def_arg])
     327
     328])dnl PKG_WITH_MODULES
     329
     330dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
     331dnl   [DESCRIPTION], [DEFAULT])
     332dnl -----------------------------------------------
     333dnl
     334dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
     335dnl check._[VARIABLE-PREFIX] is exported as make variable.
     336AC_DEFUN([PKG_HAVE_WITH_MODULES],
     337[
     338PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
     339
     340AM_CONDITIONAL([HAVE_][$1],
     341               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
     342])dnl PKG_HAVE_WITH_MODULES
     343
     344dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
     345dnl   [DESCRIPTION], [DEFAULT])
     346dnl ------------------------------------------------------
     347dnl
     348dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
     349dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
     350dnl and preprocessor variable.
     351AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
     352[
     353PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
     354
     355AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
     356        [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
     357])dnl PKG_HAVE_DEFINE_WITH_MODULES
     358
  • configure

    diff --git a/configure b/configure
    index 8fb95fd..ab4d12d 100755
    a b $as_echo "#define STDC_HEADERS 1" >>confdefs.h 
    77667766
    77677767fi
    77687768
    7769 for ac_header in asm/types.h conio.h direct.h dlfcn.h errno.h \
     7769for ac_header in asm/types.h conio.h crypt.h direct.h dlfcn.h errno.h \
    77707770fcntl.h grp.h \
    77717771ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \
    77727772sched.h shadow.h signal.h stropts.h termios.h \
    _ACEOF 
    95769576
    95779577fi
    95789578        # Dynamic linking for HP-UX
     9579{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
     9580$as_echo_n "checking for crypt in -lcrypt... " >&6; }
     9581if ${ac_cv_lib_crypt_crypt+:} false; then :
     9582  $as_echo_n "(cached) " >&6
     9583else
     9584  ac_check_lib_save_LIBS=$LIBS
     9585LIBS="-lcrypt  $LIBS"
     9586cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     9587/* end confdefs.h.  */
     9588
     9589/* Override any GCC internal prototype to avoid an error.
     9590   Use char because int might match the return type of a GCC
     9591   builtin and then its argument prototype would still apply.  */
     9592#ifdef __cplusplus
     9593extern "C"
     9594#endif
     9595char crypt ();
     9596int
     9597main ()
     9598{
     9599return crypt ();
     9600  ;
     9601  return 0;
     9602}
     9603_ACEOF
     9604if ac_fn_c_try_link "$LINENO"; then :
     9605  ac_cv_lib_crypt_crypt=yes
     9606else
     9607  ac_cv_lib_crypt_crypt=no
     9608fi
     9609rm -f core conftest.err conftest.$ac_objext \
     9610    conftest$ac_exeext conftest.$ac_ext
     9611LIBS=$ac_check_lib_save_LIBS
     9612fi
     9613{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
     9614$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
     9615if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
     9616  cat >>confdefs.h <<_ACEOF
     9617#define HAVE_LIBCRYPT 1
     9618_ACEOF
     9619
     9620  LIBS="-lcrypt $LIBS"
     9621
     9622fi
     9623        # crypt() on Linux
    95799624
    95809625# only check for sem_init if thread support is requested
    95819626if test "$with_threads" = "yes" -o -z "$with_threads"; then
    fi 
    1123511280
    1123611281# checks for library functions
    1123711282for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
    11238  clock confstr ctermid dup3 execv faccessat fchmod fchmodat fchown fchownat \
    11239  fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
     11283 clock confstr crypt_r ctermid dup3 execv faccessat fchmod fchmodat fchown \
     11284 fchownat fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
    1124011285 futimens futimes gai_strerror getentropy \
    1124111286 getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
    1124211287 getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
    cat >>confdefs.h <<_ACEOF 
    1316313208_ACEOF
    1316413209
    1316513210
     13211fi
     13212
     13213# Issue #21085: In Cygwin, siginfo_t does not have si_band field.
     13214ac_fn_c_check_member "$LINENO" "siginfo_t" "si_band" "ac_cv_member_siginfo_t_si_band" "#include <signal.h>
     13215"
     13216if test "x$ac_cv_member_siginfo_t_si_band" = xyes; then :
     13217
     13218cat >>confdefs.h <<_ACEOF
     13219#define HAVE_SIGINFO_T_SI_BAND 1
     13220_ACEOF
     13221
     13222
    1316613223fi
    1316713224
    1316813225
  • pyconfig.h.in

    diff --git a/pyconfig.h.in b/pyconfig.h.in
    index c758915..760b157 100644
    a b  
    140140/* Define to 1 if you have the `copysign' function. */
    141141#undef HAVE_COPYSIGN
    142142
     143/* Define to 1 if you have the <crypt.h> header file. */
     144#undef HAVE_CRYPT_H
     145
     146/* Define to 1 if you have the `crypt_r' function. */
     147#undef HAVE_CRYPT_R
     148
    143149/* Define to 1 if you have the `ctermid' function. */
    144150#undef HAVE_CTERMID
    145151
     
    523529/* Define to 1 if you have the `lgamma' function. */
    524530#undef HAVE_LGAMMA
    525531
     532/* Define to 1 if you have the `crypt' library (-lcrypt). */
     533#undef HAVE_LIBCRYPT
     534
    526535/* Define to 1 if you have the `dl' library (-ldl). */
    527536#undef HAVE_LIBDL
    528537