diff --git a/config.h.in b/config.h.in index 22e26d5c8..4ac55ced2 100644 --- a/config.h.in +++ b/config.h.in @@ -132,9 +132,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `isascii' function. */ -#undef HAVE_ISASCII - /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO diff --git a/configure b/configure index d4e60c1f6..9c1c4eeb9 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac e1f8bdce. +# From configure.ac 4af46aa3. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.71 for Eggdrop 1.9.5. # @@ -8218,12 +8218,6 @@ if test "x$ac_cv_func_inet_aton" = xyes then : printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h -fi -ac_fn_c_check_func "$LINENO" "isascii" "ac_cv_func_isascii" -if test "x$ac_cv_func_isascii" = xyes -then : - printf "%s\n" "#define HAVE_ISASCII 1" >>confdefs.h - fi ac_fn_c_check_func "$LINENO" "memset_s" "ac_cv_func_memset_s" if test "x$ac_cv_func_memset_s" = xyes diff --git a/src/mod/compress.mod/configure b/src/mod/compress.mod/configure index 5ffba9dc5..21927d124 100755 --- a/src/mod/compress.mod/configure +++ b/src/mod/compress.mod/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac e1f8bdce. +# From configure.ac 4af46aa3. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.71 for Eggdrop Compress Module 1.9.5. # diff --git a/src/mod/dns.mod/configure b/src/mod/dns.mod/configure index 7b706fb9b..54e38bf94 100755 --- a/src/mod/dns.mod/configure +++ b/src/mod/dns.mod/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac e1f8bdce. +# From configure.ac 4af46aa3. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.71 for Eggdrop DNS Module 1.9.5. # diff --git a/src/mod/python.mod/configure b/src/mod/python.mod/configure index 4f5e64077..def84c793 100755 --- a/src/mod/python.mod/configure +++ b/src/mod/python.mod/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac e1f8bdce. +# From configure.ac 4af46aa3. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.71 for Eggdrop Python Module 1.10.0. # @@ -623,7 +623,6 @@ ac_unique_file="python.c" ac_subst_vars='LTLIBOBJS LIBOBJS AWK -PYTHON PYTHON_VERSION PYTHON_LDFLAGS PYTHON_CFLAGS @@ -1924,7 +1923,8 @@ python_avail="false" if test "x$egg_enable_python" != "xno"; then if test "x$egg_with_python_config" = "x"; then - for ac_prog in python3-config python-config python3.12-config python3.11-config python3.10-config python3.9-config python3.8-config + # based on serial 20 https://www.gnu.org/software/autoconf-archive/ax_python.html + for ac_prog in python3-config python3.12-config python3.11-config python3.10-config python3.9-config python3.8-config python-config do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -1978,7 +1978,7 @@ done if test -d "$egg_with_python_config"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Checking for python-config binaries in $egg_with_python_config" >&5 printf "%s\n" "$as_me: Checking for python-config binaries in $egg_with_python_config" >&6;} - for ac_prog in python3-config python-config + for ac_prog in python3-config python3.12-config python3.11-config python3.10-config python3.9-config python3.8-config python-config do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2031,9 +2031,6 @@ done else if test -x "$egg_with_python_config"; then python_config_bin="$egg_with_python_config" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Specified --with-python-config=$egg_with_python_config does not exist." >&5 -printf "%s\n" "$as_me: WARNING: Specified --with-python-config=$egg_with_python_config does not exist." >&2;} fi fi fi @@ -2081,65 +2078,10 @@ fi # Check python path -# Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args. -set dummy python$PYTHON_VERSION; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PYTHON+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $PYTHON in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PYTHON=$ac_cv_path_PYTHON -if test -n "$PYTHON"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -printf "%s\n" "$PYTHON" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - if test -z "$PYTHON"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find python$PYTHON_VERSION in your system path" >&5 -printf "%s\n" "$as_me: WARNING: Cannot find python$PYTHON_VERSION in your system path" >&2;} - if ! $ax_python_devel_optional; then - as_fn_error $? "Giving up, python development not available" "$LINENO" 5 - fi - ax_python_devel_found=no - PYTHON_VERSION="" -fi +PYTHON_VERSION=`echo $PYTHON_LDFLAGS | sed 's/.*-lpython\(.*[0-9]\).*/\1/'` # Check for python version - python_ver=`$PYTHON -c "import sys; \ - print(sys.version.split ()[0])"` - for ac_prog in gawk mawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2198,7 +2140,7 @@ done # 0001001200050617. In other words, each number is zero padded to four # digits, and non digits are removed. - ax_compare_version_A=`echo "$python_ver" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ + ax_compare_version_A=`echo "$PYTHON_VERSION" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ @@ -2222,18 +2164,18 @@ x$ax_compare_version_B" | sed 's/^ *//' | sort -r | sed "s/x${ax_compare_version else ax_check_ver="no" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $PYTHON version is >= 3.8.0" >&5 -printf %s "checking $PYTHON version is >= 3.8.0... " >&6; } - if test "x$ax_check_ver" = x"no"; then - python_avail="false" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no ($python_ver)" >&5 -printf "%s\n" "no ($python_ver)" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Eggdrop requires python version 3.8.0 or higher" >&5 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking python version is >= 3.8.0" >&5 +printf %s "checking python version is >= 3.8.0... " >&6; } +if test "x$ax_check_ver" = x"no"; then + python_avail="false" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no ($PYTHON_VERSION)" >&5 +printf "%s\n" "no ($PYTHON_VERSION)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Eggdrop requires python version 3.8.0 or higher" >&5 printf "%s\n" "$as_me: WARNING: Eggdrop requires python version 3.8.0 or higher" >&2;} - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($python_ver)" >&5 -printf "%s\n" "yes ($python_ver)" >&6; } - fi +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($PYTHON_VERSION)" >&5 +printf "%s\n" "yes ($PYTHON_VERSION)" >&6; } +fi # Disable the module if test "x$python_avail" = "xfalse"; then