Fix LTDL conditional, remove some unnecessary and/or ugly configure tests

[solanum.git] / ircd / modules.c

diff --git a/ircd/modules.c b/ircd/modules.c
index 35cf39340cde6f969a97eda3a5e6aa0da33ce3b2..ada22c121a0c489fb26ea5478d0071b74bf7a6ce 100644 (file)
--- a/ircd/modules.c
+++ b/ircd/modules.c
@@ -40,8 +40,6 @@
 #include "match.h"
 
 
-#ifndef STATIC_MODULES
-
 #include <ltdl.h>
 
 struct module **modlist = NULL;
@@ -233,7 +231,7 @@ load_all_modules(int warn)
        while ((ldirent = readdir(system_module_dir)) != NULL)
        {
                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) 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++)
        {
                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)
                {
                        ilog(L_MAIN,
                             "Error loading core module %s%s: terminating ircd",
-                            core_module_table[i], SHARED_SUFFIX);
+                            core_module_table[i], ".la");
                        exit(0);
                }
        }
@@ -757,19 +755,3 @@ increase_modlist(void)
        modlist = new_modlist;
        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 */