find installed modules

[[Imported from SVN: r5185]]

bin/dune-autogen

@@ -49,12 +49,16 @@ for OPT in "$@"; do
 			  cat "$OPT/m4/"*.m4 >> dune-all.m4
             fi
             if test \( -d "$OPT/am" \) -a ! \( -h "$OPT/am" \) ; then
+              echo "Found am directory $OPT/am"
               am_dir="$OPT/am"
             fi
             if test -d "$OPT/share/aclocal"; then
-              ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $OPT/share/aclocal"
+#              ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $OPT/share/aclocal"
+              echo "... merging $OPT/share/aclocal into dune-all.m4"
+			  cat "$OPT/share/aclocal/"*.m4 >> dune-all.m4
             fi
             if test -d "$OPT/share/dune-common/am"; then
+              echo "Found am directory $OPT/share/dune-common/am"
               am_dir="$OPT/share/dune-common/am"
             fi
 			      PATH=$OPT/bin:$PATH

bin/dunecontrol

@@ -250,16 +250,14 @@ run_default_autogen () {
   if test -x autogen.sh; then
     for m in $FOUND_MODULES; do
       path=$(eval "echo \$PATH_$m")
-      if test -d $path/m4; then
-        M4_PATH="$path $M4_PATH"
-      fi
+      MODULE_PATHS="$MODULE_PATHS$path "
     done
     if test -f autogen.sh; then
       eval echo "WARNING: \$NAME_$module contains obsolete autogen.sh," >&2
 	  echo "         dune-autogen is used instead." >&2
     fi
 #    eval ./autogen.sh "$M4_PATH" "$PARAMS" || exit 1
-    eval "$COMMAND_DIR/dune-autogen" "$M4_PATH" "$PARAMS" || exit 1
+    eval "$COMMAND_DIR/dune-autogen" "$MODULE_PATHS" "$PARAMS" || exit 1
   fi
 }