Merge remote-tracking branch 'upstream/develop' into webui.mod

.gitignore

@@ -39,3 +39,4 @@ config.cache
 eggdrop
 EGGMOD.stamp
 mod.xlibs
+__pycache__

AUTHORS

@@ -104,4 +104,4 @@ See also: THANKS, doc/Versions, doc/Changes
 ------------------------------------------------------------------------------
 
 Copyright (C) 1997 Robey Pointer
-Copyright (C) 1999 - 2023 Eggheads Development Team
+Copyright (C) 1999 - 2024 Eggheads Development Team

CONTENTS

@@ -82,4 +82,4 @@ Last revised: September 21, 2018
     Contains information on upgrading from a 1.6 bot to a 1.8 bot.
     _____________________________________________________________________
 
-  Copyright (C) 2003 - 2023 Eggheads Development Team
+  Copyright (C) 2003 - 2024 Eggheads Development Team

FEATURES

@@ -44,4 +44,4 @@ Eggdrop Features
 
 Copyright (C) 1997 Robey Pointer
 
-Copyright (C) 2000 - 2023 Eggheads Development Team
+Copyright (C) 2000 - 2024 Eggheads Development Team

Makefile.in

@@ -490,6 +490,7 @@ install-doc: install-start
 	cd doc/ && $(MAKE_INSTALL) install
 
 install-scripts: install-start
-	+@cd scripts/ && $(MAKE_INSTALL) install
+	+@cd scripts/ && $(MAKE_INSTALL) install; \
+	cd ../src/mod && $(MAKE_INSTALL) install-scripts
 
 #safety hash

NEWS

@@ -317,4 +317,4 @@ Eggdrop v1.9.0:
   ________________________________________________________________________
 
 Copyright (C) 1997 Robey Pointer
-Copyright (C) 1999 - 2023 Eggheads Development Team
+Copyright (C) 1999 - 2024 Eggheads Development Team

README

@@ -61,7 +61,7 @@ FTP
   The latest Eggdrop stable source code is always located at
   https://geteggdrop.com. You can also download the current stable,
   previous stable, and development snapshot via FTP at
-  ftp.eggheads.org/pub/Eggdrop/source
+  ftp://ftp.eggheads.org/pub/eggdrop/source
 
 Git Development Snapshot
 

aclocal.m4

@@ -1,6 +1,6 @@
 dnl aclocal.m4: macros autoconf uses when building configure from configure.ac
 dnl
-dnl Copyright (C) 1999 - 2023 Eggheads Development Team
+dnl Copyright (C) 1999 - 2024 Eggheads Development Team
 dnl
 dnl This program is free software; you can redistribute it and/or
 dnl modify it under the terms of the GNU General Public License
@@ -20,6 +20,9 @@ dnl
 dnl Load tcl macros
 builtin(include,m4/tcl.m4)
 
+dnl Load python macros
+builtin(include,m4/python.m4)
+
 dnl Load gnu autoconf archive macros
 builtin(include,m4/ax_create_stdint_h.m4)
 builtin(include,m4/ax_lib_socket_nsl.m4)

config.h.in

@@ -2,7 +2,7 @@
 
 /*
  * Copyright (C) 1997 Robey Pointer
- * Copyright (C) 1999 - 2023 Eggheads Development Team
+ * Copyright (C) 1999 - 2024 Eggheads Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License

configure

@@ -13,7 +13,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright (C) 1999 - 2023 Eggheads Development Team
+# Copyright (C) 1999 - 2024 Eggheads Development Team
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -659,6 +659,8 @@ EGG_CROSS_COMPILING
 MOD_UPDIR
 DEST
 EGGVERSION
+egg_with_python_config
+egg_enable_python
 SSL_LIBS
 SSL_INCLUDES
 DEBCFLGS
@@ -801,6 +803,8 @@ enable_tls
 with_sslinc
 with_ssllib
 enable_tdns
+enable_python
+with_python_config
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1458,6 +1462,9 @@ Optional Features and Packages:
   --with-sslinc=PATH      Path to OpenSSL headers
   --with-ssllib=PATH      Path to OpenSSL libraries
   --disable-tdns          disable threaded DNS core
+  --enable-python         enable Python support (autodetect)
+  --disable-python        disable Python support
+  --with-python-config=PATH      Path to python-config
 
 Some influential environment variables:
   CC          C compiler command
@@ -1543,7 +1550,7 @@ Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright (C) 1999 - 2023 Eggheads Development Team
+Copyright (C) 1999 - 2024 Eggheads Development Team
 _ACEOF
   exit
 fi
@@ -10603,6 +10610,47 @@ printf "%s\n" "#define EGG_TDNS 1" >>confdefs.h
   fi
 
 
+# Check for Python
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compile the Python module" >&5
+$as_echo_n "checking whether to compile the Python module... " >&6; }
+  # Check whether --enable-python was given.
+if test "${enable_python+set}" = set; then :
+  enableval=$enable_python; egg_enable_python="$enableval"
+fi
+
+  # Check whether --enable-python was given.
+if test "${enable_python+set}" = set; then :
+  enableval=$enable_python; egg_enable_python="$enableval"
+else
+  egg_enable_python="autodetect"
+fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $egg_enable_python" >&5
+$as_echo "$egg_enable_python" >&6; }
+
+
+
+
+# Check whether --with-python-config was given.
+if test "${with_python_config+set}" = set; then :
+  withval=$with_python_config;
+    if test "x$enable_python" != "xno"; then
+      if test -d "$withval" || test -x "$withval"; then
+        egg_with_python_config="$withval"
+      else
+        egg_with_python_config="no"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Invalid path to python-config. $withval is not a directory and not an executable." >&5
+$as_echo "$as_me: WARNING: Invalid path to python-config. $withval is not a directory and not an executable." >&2;}
+      fi
+    fi
+
+fi
+
+
+
+
 
 # Substitute Makefile variables.
 

configure.ac

@@ -1,8 +1,8 @@
 dnl configure.ac: this file is processed by autoconf to produce ./configure.
 
 AC_PREREQ([2.71])
-AC_INIT([Eggdrop],[1.9.5],[[email protected]])
-AC_COPYRIGHT([Copyright (C) 1999 - 2023 Eggheads Development Team])
+AC_INIT([Eggdrop],[1.9.5],[[email protected]],[eggdrop],[https://www.eggheads.org])
+AC_COPYRIGHT([Copyright (C) 1999 - 2024 Eggheads Development Team])
 AC_LANG([C])
 AC_REVISION([m4_esyscmd([misc/getcommit])])
 AC_CONFIG_SRCDIR(src/eggdrop.h)
@@ -14,7 +14,7 @@ AC_PRESERVE_HELP_ORDER
 dnl config.h stuff
 AH_TOP([/*
  * Copyright (C) 1997 Robey Pointer
- * Copyright (C) 1999 - 2023 Eggheads Development Team
+ * Copyright (C) 1999 - 2024 Eggheads Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -164,6 +164,10 @@ EGG_TLS_DETECT
 # Threaded DNS core
 EGG_TDNS_ENABLE
 
+# Check for Python
+EGG_PYTHON_ENABLE
+EGG_PYTHON_WITHCONFIG
+
 
 # Substitute Makefile variables.
 EGG_SUBST_EGGVERSION

doc/ABOUT

@@ -55,4 +55,4 @@ About Eggdrop
     -   Tcl -- Eggdrop cannot compile without Tcl installed on your
         shell.
 
-  Copyright (C) 1999 - 2023 Eggheads Development Team
+  Copyright (C) 1999 - 2024 Eggheads Development Team