dynamic linking

FossilOrigin-Name: fb76bfb278b3ba6d0caf0c4a67f739c020c778623239db0efe950ae8311ca34f

src/ac/Makefile

@@ -1,25 +1,21 @@
-
-include ../ACConfig.mak
 include ../Macros.mak
-
-ifndef CC
-        CC=gcc
-endif
-#SYSARCH := $(shell uname -m)
-ifndef ARCH
-	ARCH = $(shell $(CC) -dumpmachine)
-endif
-
-LDFLAGS+=-g -D_REENTRANT -L/usr/local/lib -L../lib/$(ARCH) 
-CFLAGS += -Wall -g -O0 -D_REENTRANT -DIPV6 -I/usr/local/include -I../ -DSYS_ARCH=\"${ARCH}\"
+include ../Config.mak
+include ../ACConfig.mak
+-include ../Config.local.mak
 
 
-LIBS+=-lcapwap
-LIBS+=-lcapwap80211
-LIBS+=-lcipwap
-LIBS+=-lcisco
-LIBS+=-lfortinet
-LIBS+=-lzyxel
+LIBARCHDIR=../../lib/$(ARCH)
+
+LDFLAGS+=-g -D_REENTRANT -L/usr/local/lib -L$(LIBARCHDIR) 
+CFLAGS += -W -g -O0 -D_REENTRANT -DIPV6 -I/usr/local/include -I../ -DSYS_ARCH=\"${ARCH}\"
+
+
+#LIBS+=-lcapwap
+#LIBS+=-lcapwap80211
+#LIBS+=-lcipwap
+#LIBS+=-lcisco
+#LIBS+=-lfortinet
+#LIBS+=-lzyxel
 LIBS+=-lcw
 LIBS+=-lrt
 LIBS+=-lpthread
@@ -52,7 +48,7 @@ CFLAGS += -DWITH_IPV6
 
 RM = /bin/rm -f 
 
-AC_MODULES = mod_cipwap.o
+#AC_MODULES = mod_cipwap.o
 
 
 # list of generated object files for AC. 
@@ -78,12 +74,13 @@ AC_NAME = actube
 all: $(AC_NAME) 
 
 %.o:%.c
-	@echo "  CC "$<
+	@echo "  $(CC) "$<
 	@$(CC) -c $(CFLAGS) $< -o $@
 
 
 $(AC_NAME): $(AC_OBJS) 
-	$(CC) $(AC_OBJS) ../mod/modload_ac.o -o $(AC_NAME) $(LDFLAGS) $(LIBS)
+#	$(CC) $(AC_OBJS) ../mod/modload_ac.o -o $(AC_NAME) $(LDFLAGS) $(LIBS)
+	$(CC) $(AC_OBJS) -o $(AC_NAME) $(LDFLAGS) $(LIBS) 
 
 
 clean: 

src/ac/ac_main.c

@@ -99,10 +99,6 @@ int main(int argc, char *argv[])
 
 
 
-	cw_mod_add_dynamic("../../lib/actube/capwap.so"	);
-
-	exit(0);
-
 	
 	
 	
@@ -128,6 +124,10 @@ int main(int argc, char *argv[])
 	   developers is turned on ;) */
 	DBGX("Attention! %s", "DBG X is ON!");
 
+	cw_mod_add_dynamic("../../lib/actube","capwap");
+
+	exit(0);
+
 
 test_sets();
 exit(0);

src/ac/conf.c

@@ -574,7 +574,7 @@ static int conf_read_mods(cfg_t *cfg){
 	
 	for (i=0; i < n; i++){
 		char *modname = cfg_getnstr(cfg, CFG_ENTRY_MODS, i);
-		conf_mods[i] = modload_ac(modname);
+		conf_mods[i] = NULL; //modload_ac(modname);
 		if (!conf_mods[i]){
 			cw_log(LOG_ERR,"Can't load mod: %s",modname);
 			return 0;