[117670] trunk/base/aclocal.m4

[cal at macports.org]

Revision: 117670
          https://trac.macports.org/changeset/117670
Author:   cal at macports.org
Date:     2014-03-07 13:49:31 -0800 (Fri, 07 Mar 2014)
Log Message:
-----------
aclocal.m4: ignore --no-recursion if the subpackages are missing or unconfigured

Modified Paths:
--------------
    trunk/base/aclocal.m4

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2014-03-07 20:37:11 UTC (rev 117669)
+++ trunk/base/aclocal.m4	2014-03-07 21:49:31 UTC (rev 117670)
@@ -111,22 +111,23 @@
 	mp_tarball="$1"
 	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=
 			mp_sub_configure_keys=
@@ -279,9 +280,8 @@
 			AC_MSG_ERROR([no configure script found in $ac_dir])
 		fi
 		AC_MSG_NOTICE([=== finished configuring in $ac_dir ($mp_popdir/$ac_dir)])
-
-		cd "$mp_popdir"
 	fi
+	cd "$mp_popdir"
 ])
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140307/f0e5bb5b/attachment-0001.html>