Sync 20260129

Makefile.am

@@ -16,15 +16,11 @@ AM_CFLAGS = $(WARNFLAGS)
 ircd_ratbox_SOURCES = main.c
 bin_PROGRAMS = ircd-ratbox
 
-if MINGW
-EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*'
-endif
-
 if !STATIC_MODULES
 
 SUBDIRS = @LTDL_SUBDIR@ libratbox src modules tools doc help bandb ssld resolver
 
-ircd_ratbox_LDADD = libratbox/src/libratbox.la src/libcore.la $(LIBLTDL) @LIBJEMALLOC@ @LIBTCMALLOC@
+ircd_ratbox_LDADD =  src/libcore.la libratbox/src/libratbox.la $(LIBLTDL) @LIBJEMALLOC@ @LIBTCMALLOC@
 ircd_ratbox_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
 
 else

Makefile.in

@@ -118,9 +118,9 @@ PROGRAMS = $(bin_PROGRAMS)
 am_ircd_ratbox_OBJECTS = main.$(OBJEXT)
 ircd_ratbox_OBJECTS = $(am_ircd_ratbox_OBJECTS)
 am__DEPENDENCIES_1 =
-@STATIC_MODULES_FALSE@ircd_ratbox_DEPENDENCIES =  \
+@STATIC_MODULES_FALSE@ircd_ratbox_DEPENDENCIES = src/libcore.la \
 @STATIC_MODULES_FALSE@	libratbox/src/libratbox.la \
-@STATIC_MODULES_FALSE@	src/libcore.la $(am__DEPENDENCIES_1)
+@STATIC_MODULES_FALSE@	$(am__DEPENDENCIES_1)
 @STATIC_MODULES_TRUE@ircd_ratbox_DEPENDENCIES =  \
 @STATIC_MODULES_TRUE@	libratbox/src/libratbox.la \
 @STATIC_MODULES_TRUE@	modules/libmodules.la src/libcore.la \
@@ -220,7 +220,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/install-mod.sh.in \
 	$(top_srcdir)/libltdl/config/depcomp \
 	$(top_srcdir)/libltdl/config/install-sh \
 	$(top_srcdir)/libltdl/config/ltmain.sh \
-	$(top_srcdir)/libltdl/config/missing ChangeLog INSTALL compile \
+	$(top_srcdir)/libltdl/config/missing INSTALL compile \
 	config.guess config.sub depcomp install-sh \
 	libltdl/config/compile libltdl/config/config.guess \
 	libltdl/config/config.sub libltdl/config/depcomp \
@@ -385,6 +385,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@
+ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -448,10 +449,9 @@ coredir = @moduledir@
 servicesdir = @moduledir@/autoload
 AM_CFLAGS = $(WARNFLAGS)
 ircd_ratbox_SOURCES = main.c
-@MINGW_TRUE@EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*'
 @STATIC_MODULES_FALSE@SUBDIRS = @LTDL_SUBDIR@ libratbox src modules tools doc help bandb ssld resolver
 @STATIC_MODULES_TRUE@SUBDIRS = @LTDL_SUBDIR@ libratbox modules src tools doc help bandb ssld resolver
-@STATIC_MODULES_FALSE@ircd_ratbox_LDADD = libratbox/src/libratbox.la src/libcore.la $(LIBLTDL) @LIBJEMALLOC@ @LIBTCMALLOC@
+@STATIC_MODULES_FALSE@ircd_ratbox_LDADD = src/libcore.la libratbox/src/libratbox.la $(LIBLTDL) @LIBJEMALLOC@ @LIBTCMALLOC@
 @STATIC_MODULES_TRUE@ircd_ratbox_LDADD = libratbox/src/libratbox.la modules/libmodules.la src/libcore.la modules/static_modules.o $(LIBLTDL) $(DLOPEN) @LIBJEMALLOC@ @LIBTCMALLOC@
 @STATIC_MODULES_FALSE@ircd_ratbox_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
 all: all-recursive

bandb/Makefile.in

@@ -340,6 +340,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@
+ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -396,7 +397,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
 AUTOMAKE_OPTIONS = foreign subdir-objects
 @BUILD_SQLITE_TRUE@SUBDIRS = sqlite3
 @BUILD_SQLITE_TRUE@@sqlite3_CFLAGS@ = "-Isqlite3"

bandb/sqlite3/Makefile.in

@@ -293,6 +293,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@
+ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@

configure

@@ -2,6 +2,9 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for ircd-ratbox devel.
 #
+#
+#
+#
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
@@ -682,8 +685,6 @@ WITH_JEMALLOC_FALSE
 WITH_JEMALLOC_TRUE
 LIBJEMALLOC
 ALLOCA
-MINGW_FALSE
-MINGW_TRUE
 LTDL_SUBDIR
 LTDLOPEN
 LT_CONFIG_H
@@ -1650,6 +1651,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
+
 _ACEOF
   exit
 fi
@@ -13942,54 +13944,6 @@ LIBTOOL="$LIBTOOL --silent"
 subdirs="$subdirs libratbox"
 
 
-case "$host_os" in
-*cygwin*)
-
-cat >>confdefs.h <<_ACEOF
-#define CYGWIN 1
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define WINDOWS 1
-_ACEOF
-
-     ;;
-*mingw*)
-
-cat >>confdefs.h <<_ACEOF
-#define MINGW 1
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define WINDOWS 1
-_ACEOF
-
-     ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
-
-else
-  as_fn_error $? "** MinGW and no winsock2.h.  I give up." "$LINENO" 5
-fi
-
-
-     LIBS="$LIBS -lws2_32 -liphlpapi"
-     is_mingw="yes"
-     ;;
-*)
-     ;;
-esac
-
- if test "$is_mingw" = "yes"; then
-  MINGW_TRUE=
-  MINGW_FALSE='#'
-else
-  MINGW_TRUE='#'
-  MINGW_FALSE=
-fi
-
-
 if test "$LEX" != flex; then
   LEX="$SHELL $missing_dir/missing flex"
   LEX_OUTPUT_ROOT=lex.yy
@@ -16306,10 +16260,6 @@ LT_CONFIG_H=include/setup.h
     ltdl_LTLIBOBJS=$_ltdl_ltlibobjs
 
 
-if test -z "${MINGW_TRUE}" && test -z "${MINGW_FALSE}"; then
-  as_fn_error $? "conditional \"MINGW\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 if test -z "${WITH_JEMALLOC_TRUE}" && test -z "${WITH_JEMALLOC_FALSE}"; then
   as_fn_error $? "conditional \"WITH_JEMALLOC\" was never defined.
@@ -18743,4 +18693,3 @@ echo "Modules ........................ $tmpresult"
 echo "Assert debugging ............... $assert"
 echo "ratbox-services compatibility .. $ratbox_services"
 echo
-

configure.ac

@@ -157,24 +157,6 @@ LIBTOOL="$LIBTOOL --silent"
 
 AC_CONFIG_SUBDIRS(libratbox)
 
-case "$host_os" in
-*cygwin*)
-     AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
-     AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
-     ;;
-*mingw*)
-     AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
-     AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
-     AC_CHECK_HEADER(winsock2.h, , [AC_MSG_ERROR([** MinGW and no winsock2.h.  I give up.])])
-     LIBS="$LIBS -lws2_32 -liphlpapi"
-     is_mingw="yes"
-     ;;
-*)
-     ;;
-esac
-
-AM_CONDITIONAL([MINGW], [test "$is_mingw" = "yes"])
-
 if test "$LEX" != flex; then
   LEX="$SHELL $missing_dir/missing flex"
   AC_SUBST(LEX_OUTPUT_ROOT, lex.yy)

contrib/Makefile.am

@@ -14,9 +14,9 @@ contribdir	= @moduledir@/contrib
 AM_CPPFLAGS = -I../include -I../libratbox/include $(INCLTDL)
 AM_CFLAGS=$(WARNFLAGS)
 
-if MINGW
-EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*'
-endif
+#if MINGW
+#EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*'
+#endif
 
 
 MODULE_FLAGS = $(EXTRA_FLAGS) -avoid-version

contrib/Makefile.in

@@ -245,6 +245,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@
+ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -309,7 +310,10 @@ libmodulesdir = @moduledir@
 contribdir = @moduledir@/contrib
 AM_CPPFLAGS = -I../include -I../libratbox/include $(INCLTDL)
 AM_CFLAGS = $(WARNFLAGS)
-@MINGW_TRUE@EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*'
+
+#if MINGW
+#EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*'
+#endif
 MODULE_FLAGS = $(EXTRA_FLAGS) -avoid-version
 SRCS = \
 example_module.c        \

help/Makefile.in

@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -243,6 +242,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 ac_cv_have_struct_mallinfo = @ac_cv_have_struct_mallinfo@
+ac_cv_have_struct_mallinfo2 = @ac_cv_have_struct_mallinfo2@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@

include/setup.h.in

@@ -8,9 +8,6 @@
    */
 #undef CRAY_STACKSEG_END
 
-/* This is a Cygwin system */
-#undef CYGWIN
-
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
@@ -255,9 +252,6 @@
 /* Define to the shared library suffix, say, ".dylib". */
 #undef LT_SHARED_EXT
 
-/* This is a MinGW system */
-#undef MINGW
-
 /* Prefix where modules are installed. */
 #undef MODULE_DIR
 
@@ -351,9 +345,6 @@
 /* Version number of package */
 #undef VERSION
 
-/* This is a Windows system */
-#undef WINDOWS
-
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD

libratbox/Makefile.in

@@ -235,6 +235,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 EXTRA_WARNINGS = @EXTRA_WARNINGS@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
@@ -253,6 +254,7 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -336,7 +338,6 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@