Check for subdirs should run over $MODULES list

diff --git a/configure b/configure
index c7236c7..9097bd1 100755 (executable)
--- a/configure
+++ b/configure
@@ -18486,18 +18486,6 @@ $as_echo "top_builddir=$top_builddir" >&6; }
 
 
 
-mysubdirs=""
-if test "x$EXPERIMENTAL" = "xyes"; then
-  bar=`ls -1 "${srcdir}"/src/modules/rlm_*/configure | sed 's%/configure%%'`
-    mysubdirs=`echo $mysubdirs $bar`
-else
-        for bar in `cat "${srcdir}"/src/modules/stable`; do
-    if test -f "${srcdir}"/src/modules/$bar/configure; then
-      mysubdirs="$mysubdirs src/modules/$bar"
-    fi
-  done
-fi
-
 if test "x$EXPERIMENTAL" = "xyes"; then
   for foo in `ls -1 "${srcdir}"/src/modules | grep rlm_`; do
     MODULES="$MODULES $foo"
@@ -18508,6 +18496,13 @@ else
    done
 fi
 
+mysubdirs=""
+for bar in $MODULES; do
+  if test -f "${srcdir}"/src/modules/$bar/configure; then
+    mysubdirs="$mysubdirs src/modules/$bar"
+  fi
+done
+
 
 
 subdirs="$subdirs $mysubdirs"

diff --git a/configure.in b/configure.in
index 0cbebd7..92fc9d3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1238,22 +1238,6 @@ dnl # is being included by a module.
 dnl #############################################################
 AH_BOTTOM([#include <freeradius-devel/automask.h>])
 
-mysubdirs=""
-if test "x$EXPERIMENTAL" = "xyes"; then
-  bar=`ls -1 "${srcdir}"/src/modules/rlm_*/configure | sed 's%/configure%%'`
-  dnl # get rid of LF's.
-  mysubdirs=`echo $mysubdirs $bar`
-else
-  dnl #
-  dnl # Find 'configure' in ONLY the stable modules
-  dnl #
-  for bar in `cat "${srcdir}"/src/modules/stable`; do
-    if test -f "${srcdir}"/src/modules/$bar/configure; then
-      mysubdirs="$mysubdirs src/modules/$bar"
-    fi
-  done
-fi
-
 dnl ############################################################
 dnl # make modules by list
 dnl #############################################################
@@ -1270,6 +1254,17 @@ else
    done
 fi
 
+dnl ############################################################
+dnl # Add autoconf subdirs, based on the module list we
+dnl # previously created.
+dnl #############################################################
+mysubdirs=""
+for bar in $MODULES; do
+  if test -f "${srcdir}"/src/modules/$bar/configure; then
+    mysubdirs="$mysubdirs src/modules/$bar"
+  fi
+done
+
 dnl #
 dnl #  Don't change the variable name here.  Autoconf goes bonkers
 dnl #  if you do.