Changeset 117670 for trunk/base

Timestamp:

Mar 7, 2014, 9:49:31 PM (10 years ago)

Author:

cal@…

Message:

aclocal.m4: ignore --no-recursion if the subpackages are missing or unconfigured

File:

• trunk/base/aclocal.m4 (modified) (2 diffs)

trunk/base/aclocal.m4

@@ -112 +112 @@
         ac_dir=$2
 
-        if test "$no_recursion" != yes; then
-                mp_popdir=$(pwd)
-                if ! test -d "$ac_dir"; then
-                        mp_tarball_vendordir="$(dirname "$mp_tarball")"
-                        AS_MKDIR_P(["$mp_tarball_vendordir"])
-                        AC_MSG_NOTICE([=== extracting $mp_tarball])
-                        (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
-                fi
-                if ! test -d "$ac_dir"; then
-                        AC_MSG_ERROR([tarball $mp_tarball did not extract to $ac_dir])
-                fi
-        
+        mp_popdir=$(pwd)
+        if ! test -d "$ac_dir"; then
+                mp_tarball_vendordir="$(dirname "$mp_tarball")"
+                AS_MKDIR_P(["$mp_tarball_vendordir"])
+                AC_MSG_NOTICE([=== extracting $mp_tarball])
+                (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
+        fi
+        if ! test -d "$ac_dir"; then
+                AC_MSG_ERROR([tarball $mp_tarball did not extract to $ac_dir])
+        fi
+
+        AS_MKDIR_P(["$ac_dir"])
+        _AC_SRCDIRS(["$ac_dir"])
+        cd "$ac_dir"
+
+        if test "$no_recursion" != yes -o ! -f "$ac_srcdir/config.status"; then
                 AC_MSG_NOTICE([=== configuring in $ac_dir ($mp_popdir/$ac_dir)])
-                AS_MKDIR_P(["$ac_dir"])
-                _AC_SRCDIRS(["$ac_dir"])
-                cd "$ac_dir"
                 if test -f "$ac_srcdir/configure"; then
                         mp_sub_configure_args=
@@ -280 +281 @@
                 fi
                 AC_MSG_NOTICE([=== finished configuring in $ac_dir ($mp_popdir/$ac_dir)])
-
-                cd "$mp_popdir"
-        fi
+        fi
+        cd "$mp_popdir"
 ])