9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

general: remove last vestiges of static modules support (this hasn't ever actually worked...)

Browse source
This commit is contained in:
William Pitcock 2016-01-06 01:28:20 -06:00
parent 46fded53d4
commit 2a19fc3f57
18 changed files with 9 additions and 1033 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.in
View file

@ -286,10 +286,8 @@ LTLIBOBJS = @LTLIBOBJS@
LT_CONFIG_H = @LT_CONFIG_H@ LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@ LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@ LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEDEPEND = @MAKEDEPEND@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@ MANIFEST_TOOL = @MANIFEST_TOOL@
MKDEP = @MKDEP@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
MODULES_LIBS = @MODULES_LIBS@ MODULES_LIBS = @MODULES_LIBS@
MODULE_DIR = @MODULE_DIR@ MODULE_DIR = @MODULE_DIR@
@ -332,7 +330,6 @@ SQLITE_OBJ = @SQLITE_OBJ@
SSL_INCLUDES = @SSL_INCLUDES@ SSL_INCLUDES = @SSL_INCLUDES@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
STDOUT = @STDOUT@
STRIP = @STRIP@ STRIP = @STRIP@
TOUCH = @TOUCH@ TOUCH = @TOUCH@
VERSION = @VERSION@ VERSION = @VERSION@

3
bandb/Makefile.in
View file

@ -249,10 +249,8 @@ LTLIBOBJS = @LTLIBOBJS@
LT_CONFIG_H = @LT_CONFIG_H@ LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@ LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@ LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEDEPEND = @MAKEDEPEND@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@ MANIFEST_TOOL = @MANIFEST_TOOL@
MKDEP = @MKDEP@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
MODULES_LIBS = @MODULES_LIBS@ MODULES_LIBS = @MODULES_LIBS@
MODULE_DIR = @MODULE_DIR@ MODULE_DIR = @MODULE_DIR@
@ -295,7 +293,6 @@ SQLITE_OBJ = @SQLITE_OBJ@
SSL_INCLUDES = @SSL_INCLUDES@ SSL_INCLUDES = @SSL_INCLUDES@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
STDOUT = @STDOUT@
STRIP = @STRIP@ STRIP = @STRIP@
TOUCH = @TOUCH@ TOUCH = @TOUCH@
VERSION = @VERSION@ VERSION = @VERSION@

656
configure vendored
View file

@ -688,9 +688,6 @@ LN
MV MV
CP CP
RM RM
STDOUT
MAKEDEPEND
MKDEP
BUILD_LTDL_FALSE BUILD_LTDL_FALSE
BUILD_LTDL_TRUE BUILD_LTDL_TRUE
LTDLOPEN LTDLOPEN
@ -14183,186 +14180,14 @@ CFLAGS="$OLD_CFLAGS"
subdirs="$subdirs libratbox" subdirs="$subdirs libratbox"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -s for Solaris, AIX, HPUX or Darwin" >&5
$as_echo_n "checking uname -s for Solaris, AIX, HPUX or Darwin... " >&6; }
OSNAME=`uname -s`
case "$OSNAME" in
HP-UX*)
if test "$HPUX" != yes -a "$ac_cv_c_compiler_gnu" = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming old HPUX with its own cc" >&5
$as_echo "assuming old HPUX with its own cc" >&6; }
IRC_CFLAGS="$IRC_CFLAGS +e"
HPUX=yes
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: already using newer HPUX" >&5
$as_echo "already using newer HPUX" >&6; }
fi
;;
SunOS*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: SunOS or Solaris" >&5
$as_echo "SunOS or Solaris" >&6; }
$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
SUN=yes
;;
AIX*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX - Sorry you poor bastard..really we are" >&5
$as_echo "AIX - Sorry you poor bastard..really we are" >&6; }
IRC_CFLAGS="$IRC_CFLAGS -Wl,-brtl -Wl,-G"
;;
Darwin*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
$as_echo "Darwin" >&6; }
AppleGCC=yes
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
;;
esac
if test "$ac_cv_c_compiler_gnu" = yes; then if test "$ac_cv_c_compiler_gnu" = yes; then
IRC_CFLAGS="$IRC_CFLAGS -O0 -Wall -std=gnu99" IRC_CFLAGS="$IRC_CFLAGS -O0 -Wall -std=gnu99"
fi fi
if test "$ac_cv_prog_cc_g" = yes; then if test "$ac_cv_prog_cc_g" = yes; then
if test "$Tru" = yes; then
IRC_CFLAGS="$IRC_CFLAGS -g3"
else
IRC_CFLAGS="$IRC_CFLAGS -g" IRC_CFLAGS="$IRC_CFLAGS -g"
fi
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports the SVR4 SGS interfaces" >&5
$as_echo_n "checking if $CC supports the SVR4 SGS interfaces... " >&6; }
if test "$SGS" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "mkdep", so it can be a program name with args.
set dummy mkdep; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MKDEP+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MKDEP in
[\\/]* | ?:[\\/]*)
ac_cv_path_MKDEP="$MKDEP" # 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
test -z "$as_dir" && as_dir=.
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_MKDEP="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$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
MKDEP=$ac_cv_path_MKDEP
if test -n "$MKDEP"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDEP" >&5
$as_echo "$MKDEP" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "makedepend", so it can be a program name with args.
set dummy makedepend; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MAKEDEPEND+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAKEDEPEND in
[\\/]* | ?:[\\/]*)
ac_cv_path_MAKEDEPEND="$MAKEDEPEND" # 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
test -z "$as_dir" && as_dir=.
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_MAKEDEPEND="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$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
MAKEDEPEND=$ac_cv_path_MAKEDEPEND
if test -n "$MAKEDEPEND"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEDEPEND" >&5
$as_echo "$MAKEDEPEND" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to generate dependency info" >&5
$as_echo_n "checking how to generate dependency info... " >&6; }
STDOUT="> .depend"
if test "$ac_cv_c_compiler_gnu" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gcc -MM" >&5
$as_echo "gcc -MM" >&6; }
MKDEP="$CC -MM"
elif test ! -z "$MKDEP"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: mkdep" >&5
$as_echo "mkdep" >&6; }
if test -z "$Tru"; then
STDOUT=""
else
STDOUT=" 2> /dev/null"
fi
elif test "$SunWorkShop" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC -xM" >&5
$as_echo "$CC -xM" >&6; }
MKDEP="$CC -xM"
STDOUT="> .depend 2> /dev/null"
elif test ! -z "$MAKEDEPEND"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: makedepend" >&5
$as_echo "makedepend" >&6; }
MKDEP="$MAKEDEPEND -f-"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: nothing suitable.. forget it!" >&5
$as_echo "nothing suitable.. forget it!" >&6; }
MKDEP=":"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/null" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/null" >&5
$as_echo_n "checking for /dev/null... " >&6; } $as_echo_n "checking for /dev/null... " >&6; }
if test -c /dev/null ; then if test -c /dev/null ; then
@ -18023,300 +17848,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF _ACEOF
shared_modules="yes"
if test "$shared_modules" = yes; then
if test "$CC" = tcc -a "$TenDRA" = "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: disabling shared modules: Tiny C Compiler can't create PIC" >&5
$as_echo "$as_me: WARNING: disabling shared modules: Tiny C Compiler can't create PIC" >&2;}
shared_modules="no"
fi
fi
if test "$shared_modules" = yes; then
DYNLINK_C=dynlink.c
for ac_header in dlfcn.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
if test "x$ac_cv_header_dlfcn_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DLFCN_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shl_load" >&5
$as_echo_n "checking for library containing shl_load... " >&6; }
if ${ac_cv_search_shl_load+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char shl_load ();
int
main ()
{
return shl_load ();
;
return 0;
}
_ACEOF
for ac_lib in '' dld; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_shl_load=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_shl_load+:} false; then :
break
fi
done
if ${ac_cv_search_shl_load+:} false; then :
else
ac_cv_search_shl_load=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shl_load" >&5
$as_echo "$ac_cv_search_shl_load" >&6; }
ac_res=$ac_cv_search_shl_load
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
SUFFIX=".sl"
MOD_TARGET=hpux_shared
SEDOBJ="s/\.o/.sl/g"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
$as_echo_n "checking for library containing dlopen... " >&6; }
if ${ac_cv_search_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char dlopen ();
int
main ()
{
return dlopen ();
;
return 0;
}
_ACEOF
for ac_lib in '' dl c_r; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_dlopen=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_dlopen+:} false; then :
break
fi
done
if ${ac_cv_search_dlopen+:} false; then :
else
ac_cv_search_dlopen=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
$as_echo "$ac_cv_search_dlopen" >&6; }
ac_res=$ac_cv_search_dlopen
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
SUFFIX=".so"
MOD_TARGET=shared_modules
SEDOBJ="s/\.o/.so/g"
if test "$AppleGCC" = yes; then
for ac_header in mach-o/dyld.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
if test "x$ac_cv_header_mach_o_dyld_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MACH_O_DYLD_H 1
_ACEOF
fi
done
fi
ac_fn_c_check_func "$LINENO" "dlsym" "ac_cv_func_dlsym"
if test "x$ac_cv_func_dlsym" = xyes; then :
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dlsym is not available, shared modules disabled" >&5
$as_echo "$as_me: WARNING: dlsym is not available, shared modules disabled" >&2;}
shared_modules=no
fi
for ac_func in dlfunc
do :
ac_fn_c_check_func "$LINENO" "dlfunc" "ac_cv_func_dlfunc"
if test "x$ac_cv_func_dlfunc" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DLFUNC 1
_ACEOF
fi
done
else
shared_modules=no
fi
fi
fi
cat >>confdefs.h <<_ACEOF
#define SHARED_SUFFIX "$SUFFIX"
_ACEOF
if test "$shared_modules" = yes; then
# The GNU linker requires the -export-dynamic option to make
# all symbols visible in the dynamic symbol table.
hold_ldflags=$LDFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the ld -export-dynamic flag" >&5
$as_echo_n "checking for the ld -export-dynamic flag... " >&6; }
LDFLAGS="${LDFLAGS} -Wl,-export-dynamic -Werror"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
int i;
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
found=yes
else
found=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$hold_ldflags
if expr "`uname -s`" : ^IRIX >/dev/null 2>&1; then
found="no, IRIX ld uses -B,dynamic"
LDFLAGS="${LDFLAGS} -Wl,-B,dynamic"
fi
if expr "`uname -s`" : ^AIX >/dev/null 2>&1; then
found="no, AIX ld uses -G -brtl"
LDFLAGS="${LDFLAGS} -Wl,-G,-brtl"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found" >&5
$as_echo "$found" >&6; }
if test "$found" = yes; then
LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler option to produce PIC" >&5
$as_echo_n "checking for compiler option to produce PIC... " >&6; }
if test "$SGS" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: SVR4 SGS interfaces: -KPIC -DPIC -G" >&5
$as_echo "SVR4 SGS interfaces: -KPIC -DPIC -G" >&6; }
PICFLAGS="-KPIC -DPIC -G"
fi
if test "$AppleGCC" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin Mach-O bundles: -fno-common -bundle -flat_namespace -undefined suppress" >&5
$as_echo "Darwin Mach-O bundles: -fno-common -bundle -flat_namespace -undefined suppress" >&6; }
PICFLAGS="-fno-common -bundle -flat_namespace -undefined suppress"
fi
if test "$HPUX" = "yes" -a "$CC" != gcc; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: HP-UX cc: +z -r -q -n" >&5
$as_echo "HP-UX cc: +z -r -q -n" >&6; }
PICFLAGS="+z -r -q -n -c"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if +ESfic is required on this platform" >&5
$as_echo_n "checking if +ESfic is required on this platform... " >&6; }
if expr "`$CC +ESfic 2>&1`" : ".*neither supported.*" >/dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
PICFLAGS="$PICFLAGS +ESfic"
fi
LDFLAGS="${LDFLAGS} -Wl,-E"
fi
if test "$Tru" = yes -a "$CC" != gcc; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Tru64: -shared -expect_unresolved '*'" >&5
$as_echo "Tru64: -shared -expect_unresolved '*'" >&6; }
PICFLAGS="-shared -expect_unresolved '*' "
LDFLAGS="-call_shared"
fi
if test -z "$PICFLAGS"; then
if test "$ac_cv_c_compiler_gnu" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gcc: -fPIC -DPIC -shared" >&5
$as_echo "gcc: -fPIC -DPIC -shared" >&6; }
PICFLAGS="-fPIC -DPIC -shared"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
shared_modules=no
fi
fi
fi
# rpath, for finding libratbox.so at run time # rpath, for finding libratbox.so at run time
hold_ldflags=$LDFLAGS hold_ldflags=$LDFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the ld -rpath flag" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the ld -rpath flag" >&5
@ -19383,187 +18914,6 @@ IRC_CFLAGS="$CFLAGS"
fi fi
if test "$shared_modules" = no; then
DYNLINK_C=""
MOD_TARGET="libmodules.a"
MODULES_LIBS="../modules/libmodules.a"
SEDOBJ=""
$as_echo "#define STATIC_MODULES 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: shared module support has been disabled!" >&5
$as_echo "$as_me: WARNING: shared module support has been disabled!" >&2;}
fi
if test "$shared_modules" = yes; then
ac_fn_c_check_func "$LINENO" "nlist" "ac_cv_func_nlist"
if test "x$ac_cv_func_nlist" = xyes; then :
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nlist in -ldl" >&5
$as_echo_n "checking for nlist in -ldl... " >&6; }
if ${ac_cv_lib_dl_nlist+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char nlist ();
int
main ()
{
return nlist ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dl_nlist=yes
else
ac_cv_lib_dl_nlist=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_nlist" >&5
$as_echo "$ac_cv_lib_dl_nlist" >&6; }
if test "x$ac_cv_lib_dl_nlist" = xyes; then :
nlist_lib="-ldl"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nlist in -lelf" >&5
$as_echo_n "checking for nlist in -lelf... " >&6; }
if ${ac_cv_lib_elf_nlist+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lelf $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char nlist ();
int
main ()
{
return nlist ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_elf_nlist=yes
else
ac_cv_lib_elf_nlist=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_nlist" >&5
$as_echo "$ac_cv_lib_elf_nlist" >&6; }
if test "x$ac_cv_lib_elf_nlist" = xyes; then :
nlist_lib="-lelf"
fi
fi
fi
ac_fn_c_check_header_mongrel "$LINENO" "libelf/nlist.h" "ac_cv_header_libelf_nlist_h" "$ac_includes_default"
if test "x$ac_cv_header_libelf_nlist_h" = xyes; then :
nlist_h="libelf/nlist.h"
fi
ac_fn_c_check_header_mongrel "$LINENO" "elf/nlist.h" "ac_cv_header_elf_nlist_h" "$ac_includes_default"
if test "x$ac_cv_header_elf_nlist_h" = xyes; then :
nlist_h="elf/nlist.h"
fi
ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default"
if test "x$ac_cv_header_nlist_h" = xyes; then :
nlist_h="nlist.h"
fi
if test x"$nlist_h" = "x"; then
cat >>confdefs.h <<_ACEOF
#define SYMBOL_PREFIX ""
_ACEOF
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra underscores prepended to symbol names" >&5
$as_echo_n "checking for extra underscores prepended to symbol names... " >&6; }
if ${symbol_underscores+:} false; then :
$as_echo_n "(cached) " >&6
else
cat << EOF > conftest.c
#include <$nlist_h>
#include <stdio.h>
#include <stdlib.h>
void _modinit(void);
int main(int argc, char *argv[]) {
int i;
struct nlist nl[5];
/* fill the names in this way, so it'll work almost everywhere */
nl[0].n_name = "_modinit";
nl[1].n_name = "__modinit";
nl[2].n_name = "___modinit";
nl[3].n_name = "____modinit";
nl[0].n_value = nl[1].n_value = nl[2].n_value = nl[3].n_value = nl[4].n_name = NULL;
if(argc < 2 || (nlist(argv[1], nl)) == -1) exit(-1);
for(i = 0; i < 4; i++) {
if(nl[i].n_value != NULL)
{
int j;
for(j = 0; j < i; j++)
printf("_");
exit(i);
}
}
exit(-1);
}
void _modinit(void) { return; }
EOF
$CC $CPPFLAGS $IRC_CFLAGS -o conftest conftest.c $nlist_lib >/dev/null 2>&1
symbol_underscores=`./conftest conftest`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $symbol_underscores" >&5
$as_echo "$symbol_underscores" >&6; }
$RM -f conftest conftest.c
fi
cat >>confdefs.h <<_ACEOF
#define SYMBOL_PREFIX "${symbol_underscores}"
_ACEOF
fi
fi
IRC_CFLAGS="$IRC_CFLAGS $CWARNS" IRC_CFLAGS="$IRC_CFLAGS $CWARNS"
@ -22163,12 +21513,6 @@ else
openssl="no" openssl="no"
fi fi
if test "$shared_modules" = yes; then
modules=shared
else
modules=static
fi
echo " echo "
Configuration of ${BRANDING_NAME}-${BRANDING_VERSION}: Configuration of ${BRANDING_NAME}-${BRANDING_VERSION}:
Install directory : $prefix Install directory : $prefix

285
configure.ac
View file

@ -24,7 +24,7 @@ LTDL_INIT
build_ltdl=$with_included_ltdl build_ltdl=$with_included_ltdl
AM_CONDITIONAL([BUILD_LTDL], [test x"$build_ltdl" = x"yes"]) AM_CONDITIONAL([BUILD_LTDL], [test x"$build_ltdl" = x"yes"])
AC_PROG_CC_C99([], [AC_MSG_ERROR(elemental-ircd requires a C99 capable compiler)]) AC_PROG_CC_C99([], [AC_MSG_ERROR(charybdis requires a C99 capable compiler)])
AC_GNU_SOURCE AC_GNU_SOURCE
@ -38,99 +38,15 @@ CFLAGS="$OLD_CFLAGS"
AC_CONFIG_SUBDIRS(libratbox) AC_CONFIG_SUBDIRS(libratbox)
dnl Check for various compilers. -jmallett
dnl But if $CC turns out to be gcc, sure as hell it's, well, gcc. -joshk
AC_MSG_CHECKING([uname -s for Solaris, AIX, HPUX or Darwin])
OSNAME=`uname -s`
case "$OSNAME" in
HP-UX*)
dnl only do this if we haven't already detected the newer one
dnl and we're not already using gcc
if test "$HPUX" != yes -a "$ac_cv_c_compiler_gnu" = no; then
AC_MSG_RESULT(assuming old HPUX with its own cc)
IRC_CFLAGS="$IRC_CFLAGS +e"
HPUX=yes
else
AC_MSG_RESULT(already using newer HPUX)
fi
;;
SunOS*)
AC_MSG_RESULT(SunOS or Solaris)
AC_DEFINE(__EXTENSIONS__, 1, [This is needed to use strtok_r on Solaris.])
SUN=yes
;;
AIX*)
AC_MSG_RESULT(AIX - Sorry you poor bastard..really we are)
IRC_CFLAGS="$IRC_CFLAGS -Wl,-brtl -Wl,-G"
;;
Darwin*)
AC_MSG_RESULT(Darwin)
AppleGCC=yes
;;
*)
AC_MSG_RESULT(no)
;;
esac
if test "$ac_cv_c_compiler_gnu" = yes; then if test "$ac_cv_c_compiler_gnu" = yes; then
IRC_CFLAGS="$IRC_CFLAGS -O0 -Wall -std=gnu99" IRC_CFLAGS="$IRC_CFLAGS -O0 -Wall -std=gnu99"
fi fi
dnl If we support -g, use it! dnl If we support -g, use it!
if test "$ac_cv_prog_cc_g" = yes; then if test "$ac_cv_prog_cc_g" = yes; then
dnl Tru64 needs -g3 for -O2
if test "$Tru" = yes; then
IRC_CFLAGS="$IRC_CFLAGS -g3"
else
IRC_CFLAGS="$IRC_CFLAGS -g" IRC_CFLAGS="$IRC_CFLAGS -g"
fi
fi fi
dnl SVR4 SGS based on what we know about the compiler -jmallett
AC_MSG_CHECKING(if $CC supports the SVR4 SGS interfaces)
if test "$SGS" = "yes"; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
dnl We prefer gcc -MM because it's a lot less bloated
AC_PATH_PROG(MKDEP, mkdep)
AC_PATH_PROG(MAKEDEPEND, makedepend)
AC_MSG_CHECKING(how to generate dependency info)
STDOUT="> .depend"
if test "$ac_cv_c_compiler_gnu" = yes; then
AC_MSG_RESULT(gcc -MM)
MKDEP="$CC -MM"
elif test ! -z "$MKDEP"; then
AC_MSG_RESULT(mkdep)
dnl Tru64's mkdep is very loud
if test -z "$Tru"; then
STDOUT=""
else
STDOUT=" 2> /dev/null"
fi
elif test "$SunWorkShop" = yes; then
AC_MSG_RESULT($CC -xM)
MKDEP="$CC -xM"
STDOUT="> .depend 2> /dev/null"
elif test ! -z "$MAKEDEPEND"; then
AC_MSG_RESULT(makedepend)
MKDEP="$MAKEDEPEND -f-"
else
AC_MSG_RESULT([nothing suitable.. forget it!])
MKDEP=":"
fi
AC_SUBST(MKDEP)
AC_SUBST(STDOUT)
dnl check for /dev/null so we can use it to hold evil fd's dnl check for /dev/null so we can use it to hold evil fd's
AC_MSG_CHECKING([for /dev/null]) AC_MSG_CHECKING([for /dev/null])
if test -c /dev/null ; then if test -c /dev/null ; then
@ -938,130 +854,6 @@ AC_HELP_STRING([--with-topiclen=NUMBER],[Set the max topic length to NUMBER (def
AC_DEFINE_UNQUOTED(TOPICLEN, ${TOPICLEN}, [Maximum topic length (<=390)]) AC_DEFINE_UNQUOTED(TOPICLEN, ${TOPICLEN}, [Maximum topic length (<=390)])
AC_DEFINE_UNQUOTED(NICKLEN, (${NICKLEN}+1), [Nickname length]) AC_DEFINE_UNQUOTED(NICKLEN, (${NICKLEN}+1), [Nickname length])
shared_modules="yes"
dnl Some first-stage sanity checks.
if test "$shared_modules" = yes; then
dnl TenDRA's cc is called tcc too.
if test "$CC" = tcc -a "$TenDRA" = "no"; then
AC_MSG_WARN([disabling shared modules: Tiny C Compiler can't create PIC])
shared_modules="no"
fi
fi
dnl Second stage: check for functions and headers.
if test "$shared_modules" = yes; then
DYNLINK_C=dynlink.c
AC_CHECK_HEADERS(dlfcn.h)
AC_SEARCH_LIBS(shl_load, dld,
[
AC_DEFINE(HAVE_SHL_LOAD, 1, [Define if the shl_load function is available.])
SUFFIX=".sl"
MOD_TARGET=hpux_shared
SEDOBJ="s/\.o/.sl/g"
],
dnl !shl_load:
[
dnl standard dlopen
AC_SEARCH_LIBS(dlopen, [dl c_r],
[
AC_DEFINE(HAVE_DLOPEN, 1, [Define if the dlopen function is available.])
SUFFIX=".so"
MOD_TARGET=shared_modules
SEDOBJ="s/\.o/.so/g"
if test "$AppleGCC" = yes; then
AC_CHECK_HEADERS([mach-o/dyld.h])
fi
AC_CHECK_FUNC(dlsym, ,
[
AC_MSG_WARN([dlsym is not available, shared modules disabled])
shared_modules=no
])
AC_CHECK_FUNCS(dlfunc)
],
[
shared_modules=no
])
])
fi
AC_DEFINE_UNQUOTED(SHARED_SUFFIX, "$SUFFIX", [Suffix for shared libraries on this platform.])
dnl Third stage - wrangling the linker.
if test "$shared_modules" = yes; then
# The GNU linker requires the -export-dynamic option to make
# all symbols visible in the dynamic symbol table.
hold_ldflags=$LDFLAGS
AC_MSG_CHECKING(for the ld -export-dynamic flag)
LDFLAGS="${LDFLAGS} -Wl,-export-dynamic -Werror"
AC_LINK_IFELSE(AC_LANG_PROGRAM([],[int i;]), found=yes, found=no)
LDFLAGS=$hold_ldflags
if expr "`uname -s`" : ^IRIX >/dev/null 2>&1; then
found="no, IRIX ld uses -B,dynamic"
LDFLAGS="${LDFLAGS} -Wl,-B,dynamic"
fi
if expr "`uname -s`" : ^AIX >/dev/null 2>&1; then
found="no, AIX ld uses -G -brtl"
LDFLAGS="${LDFLAGS} -Wl,-G,-brtl"
fi
AC_MSG_RESULT($found)
if test "$found" = yes; then
LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
fi
AC_MSG_CHECKING(for compiler option to produce PIC)
dnl The order should be here to check for groups of compilers,
dnl then for odd compilers, then if no PICFLAGS were set up,
dnl check for GCC and set defaults, or else error. -jmallett
if test "$SGS" = "yes"; then
AC_MSG_RESULT([SVR4 SGS interfaces: -KPIC -DPIC -G])
PICFLAGS="-KPIC -DPIC -G"
fi
if test "$AppleGCC" = "yes"; then
AC_MSG_RESULT([Darwin Mach-O bundles: -fno-common -bundle -flat_namespace -undefined suppress])
PICFLAGS="-fno-common -bundle -flat_namespace -undefined suppress"
fi
dnl Please note, that on HPUX two different stages of module compilation occurs, since
dnl while compiling modules, the compiler does not allow you to give arguments
dnl to the linker. (I did not design this)
dnl So we need -c in the first stage of module compilation.
dnl In the second stage, we link the modules via ld -b.
dnl Additionally, HPUX does not like -export-dynamic, it likes -E instead.
dnl -TimeMr14C
if test "$HPUX" = "yes" -a "$CC" != gcc; then
AC_MSG_RESULT(HP-UX cc: +z -r -q -n)
PICFLAGS="+z -r -q -n -c"
AC_MSG_CHECKING([if +ESfic is required on this platform])
if expr "`$CC +ESfic 2>&1`" : ".*neither supported.*" >/dev/null; then
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
PICFLAGS="$PICFLAGS +ESfic"
fi
LDFLAGS="${LDFLAGS} -Wl,-E"
fi
if test "$Tru" = yes -a "$CC" != gcc; then
AC_MSG_RESULT([Tru64: -shared -expect_unresolved '*'])
PICFLAGS="-shared -expect_unresolved '*' "
LDFLAGS="-call_shared"
fi
if test -z "$PICFLAGS"; then
if test "$ac_cv_c_compiler_gnu" = "yes"; then
AC_MSG_RESULT(gcc: -fPIC -DPIC -shared)
PICFLAGS="-fPIC -DPIC -shared"
else
AC_MSG_RESULT(no)
shared_modules=no
fi
fi
fi
# rpath, for finding libratbox.so at run time # rpath, for finding libratbox.so at run time
hold_ldflags=$LDFLAGS hold_ldflags=$LDFLAGS
AC_MSG_CHECKING(for the ld -rpath flag) AC_MSG_CHECKING(for the ld -rpath flag)
@ -1107,75 +899,6 @@ CHARYBDIS_C_GCC_TRY_FLAGS([-Wformat -Wformat-y2k -Wno-format-security], charybdi
IRC_CFLAGS="$CFLAGS" IRC_CFLAGS="$CFLAGS"
],[]) ],[])
if test "$shared_modules" = no; then
DYNLINK_C=""
MOD_TARGET="libmodules.a"
MODULES_LIBS="../modules/libmodules.a"
SEDOBJ=""
AC_DEFINE(STATIC_MODULES, 1, [Define to 1 if dynamic modules can't be used.])
AC_MSG_WARN([shared module support has been disabled!])
fi
dnl Stage 5 - underscores in front of symbol names.
if test "$shared_modules" = yes; then
AC_CHECK_FUNC(nlist,,
AC_CHECK_LIB(dl, nlist, nlist_lib="-ldl",
AC_CHECK_LIB(elf, nlist, nlist_lib="-lelf",)
)
)
dnl We need to find out whether underscores are appended to symbol
dnl names in executable files. First, though, we need to see
dnl where nlist.h is hiding.
AC_CHECK_HEADER(libelf/nlist.h, [ nlist_h="libelf/nlist.h" ], )
AC_CHECK_HEADER(elf/nlist.h, [ nlist_h="elf/nlist.h" ], )
AC_CHECK_HEADER(nlist.h, [ nlist_h="nlist.h" ], )
if test x"$nlist_h" = "x"; then
AC_DEFINE_UNQUOTED(SYMBOL_PREFIX, "", [String containing extra underscores prepended to symbols loaded from modules.])
else
AC_MSG_CHECKING(for extra underscores prepended to symbol names)
AC_CACHE_VAL(symbol_underscores,
[
cat << EOF > conftest.c
#include <$nlist_h>
#include <stdio.h>
#include <stdlib.h>
void _modinit(void);
int main(int argc, char *argv[[]]) {
int i;
struct nlist nl[[5]];
/* fill the names in this way, so it'll work almost everywhere */
nl[[0]].n_name = "_modinit";
nl[[1]].n_name = "__modinit";
nl[[2]].n_name = "___modinit";
nl[[3]].n_name = "____modinit";
nl[[0]].n_value = nl[[1]].n_value = nl[[2]].n_value = nl[[3]].n_value = nl[[4]].n_name = NULL;
if(argc < 2 || (nlist(argv[[1]], nl)) == -1) exit(-1);
for(i = 0; i < 4; i++) {
if(nl[[i]].n_value != NULL)
{
int j;
for(j = 0; j < i; j++)
printf("_");
exit(i);
}
}
exit(-1);
}
void _modinit(void) { return; }
EOF
$CC $CPPFLAGS $IRC_CFLAGS -o conftest conftest.c $nlist_lib >/dev/null 2>&1
symbol_underscores=`./conftest conftest`
AC_MSG_RESULT($symbol_underscores)
$RM -f conftest conftest.c
])
AC_DEFINE_UNQUOTED(SYMBOL_PREFIX, "${symbol_underscores}", [String containing extra underscores prepended to symbols loaded from modules.])
fi
fi
IRC_CFLAGS="$IRC_CFLAGS $CWARNS" IRC_CFLAGS="$IRC_CFLAGS $CWARNS"
AC_SUBST(MODULES_LIBS) AC_SUBST(MODULES_LIBS)
@ -1226,12 +949,6 @@ else
openssl="no" openssl="no"
fi fi
if test "$shared_modules" = yes; then
modules=shared
else
modules=static
fi
echo " echo "
Configuration of ${BRANDING_NAME}-${BRANDING_VERSION}: Configuration of ${BRANDING_NAME}-${BRANDING_VERSION}:
Install directory : $prefix Install directory : $prefix

3
doc/Makefile.in
View file

@ -191,10 +191,8 @@ LTLIBOBJS = @LTLIBOBJS@
LT_CONFIG_H = @LT_CONFIG_H@ LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@ LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@ LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEDEPEND = @MAKEDEPEND@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@ MANIFEST_TOOL = @MANIFEST_TOOL@
MKDEP = @MKDEP@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
MODULES_LIBS = @MODULES_LIBS@ MODULES_LIBS = @MODULES_LIBS@
MODULE_DIR = @MODULE_DIR@ MODULE_DIR = @MODULE_DIR@
@ -237,7 +235,6 @@ SQLITE_OBJ = @SQLITE_OBJ@
SSL_INCLUDES = @SSL_INCLUDES@ SSL_INCLUDES = @SSL_INCLUDES@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
STDOUT = @STDOUT@
STRIP = @STRIP@ STRIP = @STRIP@
TOUCH = @TOUCH@ TOUCH = @TOUCH@
VERSION = @VERSION@ VERSION = @VERSION@

3
extensions/Makefile.in
View file

@ -468,10 +468,8 @@ LTLIBOBJS = @LTLIBOBJS@
LT_CONFIG_H = @LT_CONFIG_H@ LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@ LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@ LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEDEPEND = @MAKEDEPEND@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@ MANIFEST_TOOL = @MANIFEST_TOOL@
MKDEP = @MKDEP@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
MODULES_LIBS = @MODULES_LIBS@ MODULES_LIBS = @MODULES_LIBS@
MODULE_DIR = @MODULE_DIR@ MODULE_DIR = @MODULE_DIR@
@ -514,7 +512,6 @@ SQLITE_OBJ = @SQLITE_OBJ@
SSL_INCLUDES = @SSL_INCLUDES@ SSL_INCLUDES = @SSL_INCLUDES@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
STDOUT = @STDOUT@
STRIP = @STRIP@ STRIP = @STRIP@
TOUCH = @TOUCH@ TOUCH = @TOUCH@
VERSION = @VERSION@ VERSION = @VERSION@

3
help/Makefile.in
View file

@ -195,10 +195,8 @@ LTLIBOBJS = @LTLIBOBJS@
LT_CONFIG_H = @LT_CONFIG_H@ LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@ LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@ LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEDEPEND = @MAKEDEPEND@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@ MANIFEST_TOOL = @MANIFEST_TOOL@
MKDEP = @MKDEP@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
MODULES_LIBS = @MODULES_LIBS@ MODULES_LIBS = @MODULES_LIBS@
MODULE_DIR = @MODULE_DIR@ MODULE_DIR = @MODULE_DIR@
@ -241,7 +239,6 @@ SQLITE_OBJ = @SQLITE_OBJ@
SSL_INCLUDES = @SSL_INCLUDES@ SSL_INCLUDES = @SSL_INCLUDES@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
STDOUT = @STDOUT@
STRIP = @STRIP@ STRIP = @STRIP@
TOUCH = @TOUCH@ TOUCH = @TOUCH@
VERSION = @VERSION@ VERSION = @VERSION@

8
include/modules.h
View file

@ -80,14 +80,8 @@ struct mapi_mheader_av1
const char * mapi_module_version; /* Module's version (freeform) */ const char * mapi_module_version; /* Module's version (freeform) */
}; };
#ifndef STATIC_MODULES #define DECLARE_MODULE_AV1(name,reg,unreg,cl,hl,hfnlist, v) \
# define DECLARE_MODULE_AV1(name,reg,unreg,cl,hl,hfnlist, v) \
struct mapi_mheader_av1 _mheader = { MAPI_V1, reg, unreg, cl, hl, hfnlist, v} struct mapi_mheader_av1 _mheader = { MAPI_V1, reg, unreg, cl, hl, hfnlist, v}
#else
# define DECLARE_MODULE_AV1(name,reg,unreg,cl,hl,hfnlist, v) \
struct mapi_mheader_av1 name ## _mheader = { MAPI_V1, reg, unreg, cl, hl, hfnlist, v}
void load_static_modules(void);
#endif
/* add a path */ /* add a path */
void mod_add_path(const char *path); void mod_add_path(const char *path);

21
include/setup.h.in
View file

@ -103,12 +103,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */ /* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H #undef HAVE_DLFCN_H
/* Define to 1 if you have the `dlfunc' function. */
#undef HAVE_DLFUNC
/* Define if the dlopen function is available. */
#undef HAVE_DLOPEN
/* Define to 1 if you have the <dl.h> header file. */ /* Define to 1 if you have the <dl.h> header file. */
#undef HAVE_DL_H #undef HAVE_DL_H
@ -184,7 +178,7 @@
/* Define to 1 if you have the `select' function. */ /* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT #undef HAVE_SELECT
/* Define if the shl_load function is available. */ /* Define if you have the shl_load function. */
#undef HAVE_SHL_LOAD #undef HAVE_SHL_LOAD
/* Define to 1 if you have the `socketpair' function. */ /* Define to 1 if you have the `socketpair' function. */
@ -369,9 +363,6 @@
/* This is the type of IO loop we are using */ /* This is the type of IO loop we are using */
#undef SELECT_TYPE #undef SELECT_TYPE
/* Suffix for shared libraries on this platform. */
#undef SHARED_SUFFIX
/* The size of `int', as computed by sizeof. */ /* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT #undef SIZEOF_INT
@ -395,19 +386,12 @@
STACK_DIRECTION = 0 => direction of growth unknown */ STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION #undef STACK_DIRECTION
/* Define to 1 if dynamic modules can't be used. */
#undef STATIC_MODULES
/* Define to 1 if you have the ANSI C header files. */ /* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS #undef STDC_HEADERS
/* Define to 1 if string.h may be included along with strings.h */ /* Define to 1 if string.h may be included along with strings.h */
#undef STRING_WITH_STRINGS #undef STRING_WITH_STRINGS
/* String containing extra underscores prepended to symbols loaded from
modules. */
#undef SYMBOL_PREFIX
/* Maximum topic length (<=390) */ /* Maximum topic length (<=390) */
#undef TOPICLEN #undef TOPICLEN
@ -471,9 +455,6 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */ /* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE #undef _POSIX_SOURCE
/* This is needed to use strtok_r on Solaris. */
#undef __EXTENSIONS__
/* Define so that glibc/gnulib argp.h does not typedef error_t. */ /* Define so that glibc/gnulib argp.h does not typedef error_t. */
#undef __error_t_defined #undef __error_t_defined

3
ircd/Makefile.in
View file

@ -306,10 +306,8 @@ LTLIBOBJS = @LTLIBOBJS@
LT_CONFIG_H = @LT_CONFIG_H@ LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@ LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@ LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEDEPEND = @MAKEDEPEND@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@ MANIFEST_TOOL = @MANIFEST_TOOL@
MKDEP = @MKDEP@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
MODULES_LIBS = @MODULES_LIBS@ MODULES_LIBS = @MODULES_LIBS@
MODULE_DIR = @MODULE_DIR@ MODULE_DIR = @MODULE_DIR@
@ -352,7 +350,6 @@ SQLITE_OBJ = @SQLITE_OBJ@
SSL_INCLUDES = @SSL_INCLUDES@ SSL_INCLUDES = @SSL_INCLUDES@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
STDOUT = @STDOUT@
STRIP = @STRIP@ STRIP = @STRIP@
TOUCH = @TOUCH@ TOUCH = @TOUCH@
VERSION = @VERSION@ VERSION = @VERSION@

5
ircd/ircd.c
View file

@ -657,9 +657,8 @@ charybdis_main(int argc, char *argv[])
construct_cflags_strings(); construct_cflags_strings();
load_all_modules(1); load_all_modules(1);
#ifndef STATIC_MODULES
load_core_modules(1); load_core_modules(1);
#endif
init_auth(); /* Initialise the auth code */ init_auth(); /* Initialise the auth code */
init_resolver(); /* Needs to be setup before the io loop */ init_resolver(); /* Needs to be setup before the io loop */
privilegeset_set_new("default", "", 0); privilegeset_set_new("default", "", 0);
@ -667,11 +666,9 @@ charybdis_main(int argc, char *argv[])
if (testing_conf) if (testing_conf)
fprintf(stderr, "\nBeginning config test\n"); fprintf(stderr, "\nBeginning config test\n");
read_conf_files(YES); /* cold start init conf files */ read_conf_files(YES); /* cold start init conf files */
#ifndef STATIC_MODULES
mod_add_path(MODULE_DIR); mod_add_path(MODULE_DIR);
mod_add_path(MODULE_DIR "/autoload"); mod_add_path(MODULE_DIR "/autoload");
#endif
init_isupport(); init_isupport();

2
ircd/ircd_parser.y
View file

@ -292,7 +292,6 @@ oneitem: qstring
loadmodule: loadmodule:
LOADMODULE QSTRING LOADMODULE QSTRING
{ {
#ifndef STATIC_MODULES
char *m_bn; char *m_bn;
m_bn = rb_basename((char *) $2); m_bn = rb_basename((char *) $2);
@ -301,7 +300,6 @@ loadmodule:
load_one_module($2, 0); load_one_module($2, 0);
rb_free(m_bn); rb_free(m_bn);
#endif
} }
';' ';'
; ;

24
ircd/modules.c
View file

@ -40,8 +40,6 @@
#include "match.h" #include "match.h"
#ifndef STATIC_MODULES
#include <ltdl.h> #include <ltdl.h>
struct module **modlist = NULL; struct module **modlist = NULL;
@ -233,7 +231,7 @@ load_all_modules(int warn)
while ((ldirent = readdir(system_module_dir)) != NULL) while ((ldirent = readdir(system_module_dir)) != NULL)
{ {
len = strlen(ldirent->d_name); len = strlen(ldirent->d_name);
if((len > 3) && !strcmp(ldirent->d_name+len-3, SHARED_SUFFIX)) if((len > 3) && !strcmp(ldirent->d_name+len-3, ".la"))
{ {
(void) rb_snprintf(module_fq_name, sizeof(module_fq_name), "%s/%s", AUTOMODPATH, ldirent->d_name); (void) rb_snprintf(module_fq_name, sizeof(module_fq_name), "%s/%s", AUTOMODPATH, ldirent->d_name);
(void) load_a_module(module_fq_name, warn, 0); (void) load_a_module(module_fq_name, warn, 0);
@ -259,13 +257,13 @@ load_core_modules(int warn)
for (i = 0; core_module_table[i]; i++) for (i = 0; core_module_table[i]; i++)
{ {
rb_snprintf(module_name, sizeof(module_name), "%s/%s%s", MODPATH, rb_snprintf(module_name, sizeof(module_name), "%s/%s%s", MODPATH,
core_module_table[i], SHARED_SUFFIX); core_module_table[i], ".la");
if(load_a_module(module_name, warn, 1) == -1) if(load_a_module(module_name, warn, 1) == -1)
{ {
ilog(L_MAIN, ilog(L_MAIN,
"Error loading core module %s%s: terminating ircd", "Error loading core module %s%s: terminating ircd",
core_module_table[i], SHARED_SUFFIX); core_module_table[i], ".la");
exit(0); exit(0);
} }
} }
@ -757,19 +755,3 @@ increase_modlist(void)
modlist = new_modlist; modlist = new_modlist;
max_mods += MODS_INCREMENT; max_mods += MODS_INCREMENT;
} }
#else /* STATIC_MODULES */
/* load_all_modules()
*
* input -
* output -
* side effects - all the msgtabs are added for static modules
*/
void
load_all_modules(int warn)
{
load_static_modules();
}
#endif /* STATIC_MODULES */

8
ircd/newconf.c
View file

@ -286,7 +286,6 @@ conf_set_serverinfo_nicklen(void *data)
static void static void
conf_set_modules_module(void *data) conf_set_modules_module(void *data)
{ {
#ifndef STATIC_MODULES
char *m_bn; char *m_bn;
m_bn = rb_basename((char *) data); m_bn = rb_basename((char *) data);
@ -295,19 +294,12 @@ conf_set_modules_module(void *data)
load_one_module((char *) data, 0); load_one_module((char *) data, 0);
rb_free(m_bn); rb_free(m_bn);
#else
conf_report_error("Ignoring modules::module -- loadable module support not present.");
#endif
} }
static void static void
conf_set_modules_path(void *data) conf_set_modules_path(void *data)
{ {
#ifndef STATIC_MODULES
mod_add_path((char *) data); mod_add_path((char *) data);
#else
conf_report_error("Ignoring modules::path -- loadable module support not present.");
#endif
} }
struct mode_table struct mode_table

2
ircd/s_conf.c
View file

@ -1462,11 +1462,9 @@ clear_out_old_conf(void)
clear_s_newconf(); clear_s_newconf();
/* clean out module paths */ /* clean out module paths */
#ifndef STATIC_MODULES
mod_clear_paths(); mod_clear_paths();
mod_add_path(MODULE_DIR); mod_add_path(MODULE_DIR);
mod_add_path(MODULE_DIR "/autoload"); mod_add_path(MODULE_DIR "/autoload");
#endif
/* clean out ServerInfo */ /* clean out ServerInfo */
rb_free(ServerInfo.description); rb_free(ServerInfo.description);

3
modules/Makefile.in
View file

@ -539,10 +539,8 @@ LTLIBOBJS = @LTLIBOBJS@
LT_CONFIG_H = @LT_CONFIG_H@ LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@ LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@ LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEDEPEND = @MAKEDEPEND@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@ MANIFEST_TOOL = @MANIFEST_TOOL@
MKDEP = @MKDEP@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
MODULES_LIBS = @MODULES_LIBS@ MODULES_LIBS = @MODULES_LIBS@
MODULE_DIR = @MODULE_DIR@ MODULE_DIR = @MODULE_DIR@
@ -585,7 +583,6 @@ SQLITE_OBJ = @SQLITE_OBJ@
SSL_INCLUDES = @SSL_INCLUDES@ SSL_INCLUDES = @SSL_INCLUDES@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
STDOUT = @STDOUT@
STRIP = @STRIP@ STRIP = @STRIP@
TOUCH = @TOUCH@ TOUCH = @TOUCH@
VERSION = @VERSION@ VERSION = @VERSION@

3
ssld/Makefile.in
View file

@ -243,10 +243,8 @@ LTLIBOBJS = @LTLIBOBJS@
LT_CONFIG_H = @LT_CONFIG_H@ LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@ LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@ LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEDEPEND = @MAKEDEPEND@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@ MANIFEST_TOOL = @MANIFEST_TOOL@
MKDEP = @MKDEP@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
MODULES_LIBS = @MODULES_LIBS@ MODULES_LIBS = @MODULES_LIBS@
MODULE_DIR = @MODULE_DIR@ MODULE_DIR = @MODULE_DIR@
@ -289,7 +287,6 @@ SQLITE_OBJ = @SQLITE_OBJ@
SSL_INCLUDES = @SSL_INCLUDES@ SSL_INCLUDES = @SSL_INCLUDES@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
STDOUT = @STDOUT@
STRIP = @STRIP@ STRIP = @STRIP@
TOUCH = @TOUCH@ TOUCH = @TOUCH@
VERSION = @VERSION@ VERSION = @VERSION@

3
tools/Makefile.in
View file

@ -243,10 +243,8 @@ LTLIBOBJS = @LTLIBOBJS@
LT_CONFIG_H = @LT_CONFIG_H@ LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@ LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@ LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEDEPEND = @MAKEDEPEND@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@ MANIFEST_TOOL = @MANIFEST_TOOL@
MKDEP = @MKDEP@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
MODULES_LIBS = @MODULES_LIBS@ MODULES_LIBS = @MODULES_LIBS@
MODULE_DIR = @MODULE_DIR@ MODULE_DIR = @MODULE_DIR@
@ -289,7 +287,6 @@ SQLITE_OBJ = @SQLITE_OBJ@
SSL_INCLUDES = @SSL_INCLUDES@ SSL_INCLUDES = @SSL_INCLUDES@
SSL_LIBS = @SSL_LIBS@ SSL_LIBS = @SSL_LIBS@
SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@ SSL_SRCS_ENABLE = @SSL_SRCS_ENABLE@
STDOUT = @STDOUT@
STRIP = @STRIP@ STRIP = @STRIP@
TOUCH = @TOUCH@ TOUCH = @TOUCH@
VERSION = @VERSION@ VERSION = @VERSION@