After configuring for only certain modules, we should only build

	the configured modules.  The other modules should be ignored.

	Patch from Andey Kotrekhov

diff --git a/Make.inc.in b/Make.inc.in
index 9b16bdf..d2e2ebd 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -64,3 +64,4 @@ RADIUSD_MAJOR_VERSION = @RADIUSD_MAJOR_VERSION@
 RADIUSD_MINOR_VERSION  = @RADIUSD_MINOR_VERSION@
 RADIUSD_VERSION                = @RADIUSD_VERSION@
 
+MODULES                        = @MODULES@

diff --git a/configure b/configure
index ff5a641..a5e4d52 100755 (executable)
--- a/configure
+++ b/configure
@@ -560,7 +560,7 @@ fi
 
 
 
-# From configure.in Revision: 1.144 
+# From configure.in Revision: 1.145 
 RADIUSD_MAJOR_VERSION=0
 RADIUSD_MINOR_VERSION=6
 RADIUSD_VERSION="${RADIUSD_MAJOR_VERSION}.${RADIUSD_MINOR_VERSION}"
@@ -4343,6 +4343,8 @@ else
   done
 fi
 
+MODULES=`echo $mysubdirs | sed 's%src/modules/%%g'`
+
 subdirs="libltdl $mysubdirs"
 
 
@@ -4350,6 +4352,7 @@ subdirs="libltdl $mysubdirs"
 
 
 
+
 USE_SHARED_LIBS=$enable_shared
 
 USE_STATIC_LIBS=$enable_static
@@ -4547,6 +4550,7 @@ s%@ODBC_INCLUDE@%$ODBC_INCLUDE%g
 s%@LIBLTDL@%$LIBLTDL%g
 s%@INCLTDL@%$INCLTDL%g
 s%@top_builddir@%$top_builddir%g
+s%@MODULES@%$MODULES%g
 s%@INSTALLSTRIP@%$INSTALLSTRIP%g
 s%@USE_SHARED_LIBS@%$USE_SHARED_LIBS%g
 s%@USE_STATIC_LIBS@%$USE_STATIC_LIBS%g

diff --git a/configure.in b/configure.in
index b16596e..932d4c5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -727,11 +727,14 @@ else
   done
 fi
 
+MODULES=`echo $mysubdirs | sed 's%src/modules/%%g'`
+
 dnl #
 dnl #  Don't change the variable name here.  Autoconf goes bonkers
 dnl #  if you do.
 dnl #
 AC_CONFIG_SUBDIRS($mysubdirs)
+AC_SUBST(MODULES)
 
 dnl #############################################################
 dnl #

diff --git a/src/modules/Makefile b/src/modules/Makefile
index c59dc1b..fccda9d 100644 (file)
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -36,7 +36,7 @@ distclean:
 
 common:
        @[ -d lib/ ] || mkdir lib
-       @for mod in rlm_*; do \
+       @for mod in $(MODULES); do \
                what=$(WHAT_TO_MAKE); \
                [ "$$what" = "all" ] && what="$(TARGET_LIBS)"; \
                echo "Making $$what in $$mod..."; \