fix opensips not starting if module compiled from its folder

	OpenSIPS was not starting if a module was compiled from
its folder because the compilation flags were different from the
flags in core. This was caused by the flag indicating used radius
library which was only present in core.
	To fix this issue, radius library autodetection was moved
into aaa_radius Makefile.

Makefile

@@ -31,14 +31,6 @@
 #  2007-09-28  added db_berkeley (wiquan)
 #
 
-#FREERADIUS=1
-# freeradius libs check (must be done in toplevel makefile)
-ifeq ($(RADIUSCLIENT),)
-RADIUSCLIENT=$(shell if [ -n "`ldconfig -p | grep radcli`" ]; then echo "RADCLI"; \
-		 elif [ -n "`ldconfig -p | grep freeradius`" ]; then echo "FREERADIUS"; \
-		  elif [ -n "`ldconfig -p | grep radiusclient-ng`" ];then echo "RADIUSCLIENT"; fi)
-endif
-
 #SQLITE_BIND=1
 NICER?=1
 auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc
@@ -716,11 +708,6 @@ doxygen:
 	echo "PROJECT_NUMBER=$(NAME)-$(RELEASE)" )| doxygen -
 	-@echo "Doxygen documentation created"
 
-
-.PHONY: print radius_lib
-print_radius_lib:
-	@echo $(RADIUSCLIENT)
-
 comp_menuconfig:
 	$(MAKE) -C menuconfig
 menuconfig: comp_menuconfig

Makefile.defs

@@ -608,21 +608,6 @@ ifneq ($(VERSIONTYPE),)
 	DEFS+= -DVERSIONTYPE='"$(VERSIONTYPE)"' -DTHISREVISION='"$(THISREVISION)"'
 endif
 
-ifneq ($(RADIUSCLIENT), RADCLI)
-ifneq ($(RADIUSCLIENT), FREERADIUS)
-ifeq ($(RADIUSCLIENT), RADIUSCLIENT)
-	DEFS+= -DRADIUSCLIENT
-	RADIUS_LIB= -lradiusclient-ng
-endif
-else
-	DEFS+= -DFREERADIUS
-	RADIUS_LIB= -lfreeradius-client
-endif
-else
-	DEFS+= -DRADCLI
-	RADIUS_LIB= -lradcli
-endif
-
 ifneq ($(SQLITE_BIND),)
 	DEFS+= -DSQLITE_BIND
 endif

modules/aaa_radius/Makefile

@@ -10,6 +10,34 @@ NAME=aaa_radius.so
 
 ETC_DIR?=../../etc/
 
+# Find the radius library we shall use
+#
+ifeq ($(RADIUSCLIENT),)
+RADIUSCLIENT=$(shell if [ -n "`ldconfig -p | grep radcli`" ]; then echo "RADCLI"; \
+	elif [ -n "`ldconfig -p | grep freeradius`" ]; then echo "FREERADIUS"; \
+	elif [ -n "`ldconfig -p | grep radiusclient-ng`" ];then echo "RADIUSCLIENT"; fi)
+endif
+
+
+ifneq ($(RADIUSCLIENT), RADCLI)
+ifneq ($(RADIUSCLIENT), FREERADIUS)
+ifeq ($(RADIUSCLIENT), RADIUSCLIENT)
+	DEFS+= -DRADIUSCLIENT
+	RADIUS_LIB= -lradiusclient-ng
+endif
+else
+	DEFS+= -DFREERADIUS
+	RADIUS_LIB= -lfreeradius-client
+endif
+else
+	RADIUS_LIB= -lradiusclient-ng
+	DEFS+= -DRADCLI
+	RADIUS_LIB= -lradcli
+endif
+
+
+
+
 # Comment the next two line and uncomment the following two if you want
 # to enable Radius support
 DEFS+= -I$(LOCALBASE)/include

version.h

@@ -171,34 +171,13 @@
 #define NOSMP_STR ""
 #endif
 
-#ifdef FREERADIUS
-#define FREERADIUS_STR " FREERADIUS "
-#else
-#define FREERADIUS_STR ""
-#endif
-
-#ifdef RADIUSCLIENT
-#define RADIUSCLIENT_STR " RADIUSCLIENT "
-#else
-#define RADIUSCLIENT_STR ""
-#endif
-
-#ifdef RADCLI
-#define RADCLI_STR " RADCLI "
-#else
-#define RADCLI_STR ""
-#endif
-
-
 #define OPENSIPS_COMPILE_FLAGS \
 	STATS_STR EXTRA_DEBUG_STR \
 	DISABLE_NAGLE_STR USE_MCAST_STR NO_DEBUG_STR NO_LOG_STR \
 	SHM_MMAP_STR PKG_MALLOC_STR VQ_MALLOC_STR QM_MALLOC_STR F_MALLOC_STR \
 	HP_MALLOC_STR USE_SHM_MEM_STR DBG_MALLOC_STR \
 	DEBUG_DMALLOC_STR QM_JOIN_FREE_STR FAST_LOCK_STR NOSMP_STR \
-	USE_PTHREAD_MUTEX_STR USE_POSIX_SEM_STR USE_SYSV_SEM_STR DBG_LOCK_STR \
-	FREERADIUS_STR RADIUSCLIENT_STR RADCLI_STR
-
+	USE_PTHREAD_MUTEX_STR USE_POSIX_SEM_STR USE_SYSV_SEM_STR DBG_LOCK_STR
 
 
 #endif