Better linking of sub-modules, and added support for static

	linking of SQL sub-modules

diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index c00b7b2..42abefd 100644 (file)
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -29,16 +29,20 @@ ifneq ($(USE_SHARED_LIBS),yes)
 #
 #  For static linking...
 #
-MODULES += rlm_eap_md5  rlm_eap_leap rlm_eap_tls rlm_eap_ttls rlm_eap_sim
-MODULES += rlm_eap_peap rlm_eap_mschapv2 rlm_eap_gtc
+SUB_MODULES += rlm_eap_md5 rlm_eap_leap rlm_eap_tls rlm_eap_ttls rlm_eap_sim
+SUB_MODULES += rlm_eap_peap rlm_eap_mschapv2 rlm_eap_gtc
+SUB_MODULES += rlm_sql_db2 rlm_sql_freetds rlm_sql_iodbc rlm_sql_mysql
+SUB_MODULES += rlm_sql_oracle rlm_sql_postgresql rlm_sql_sybase rlm_sql_unixodbc
 ifneq ($(OPENSSL_LIBS),)
 LIBS += -L$(OPENSSL_LIBS) -L../modules/rlm_eap/libeap -leap -lcrypto -lssl -lcrypto -lssl 
 endif
 #
 MODULE_LIBS    += $(shell for x in $(MODULES);do test -f ../modules/$$x/$$x.la && echo -dlpreopen ../modules/$$x/$$x.la;done)
-MODULE_LIBS    += $(shell for x in $(MODULES);do test -f ../modules/*/types/$$x/$$x.la && echo -dlpreopen ../modules/*/types/$$x/$$x.la;done)
+MODULE_LIBS    += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/types/$$x/$$x.la && echo -dlpreopen ../modules/*/types/$$x/$$x.la;done)
+MODULE_LIBS    += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/drivers/$$x/$$x.la && echo -dlpreopen ../modules/*/types/$$x/$$x.la;done)
 MODULE_OBJS    += $(shell for x in $(MODULES);do test -f ../modules/$$x/$$x.la && echo ../modules/$$x/$$x.la;done)
-MODULE_OBJS    += $(shell for x in $(MODULES);do test -f ../modules/*/types/$$x/$$x.la && echo ../modules/*/types/$$x/$$x.la;done)
+MODULE_OBJS    += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/types/$$x/$$x.la && echo ../modules/*/types/$$x/$$x.la;done)
+MODULE_OBJS    += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/types/$$x/$$x.la && echo ../modules/*/drivers/$$x/$$x.la;done)
 endif
 
 LIBS           += -lradius $(SNMP_LIBS)