From: Mark Eichin <eichin@mit.edu>
Date: Tue, 14 Jun 1994 19:19:38 +0000 (+0000)
Subject: clean up recursion step to handle srcdir correctly
X-Git-Tag: krb5-1.0-beta4~81
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0fe6cd6371b5648b7f47d2994ba01c967fef0e63;p=krb5.git

clean up recursion step to handle srcdir correctly

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3773 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index ae3f85e91..7aa14ebe6 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -34,6 +34,22 @@ AC_REQUIRE([AC__CONFIG_AUX])
 changequote(<<<,>>>)dnl
 SUBDIRS="$1"
 if [ -z "${norecursion}" ] ; then
+	recurse_args=
+	recur_state=
+	for recur_arg in ${configure_args} ; do
+		if test -n "${recur_state}" ; then
+			case "${recur_arg}" in
+			  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+			    recur_state="skip"
+			    ;;
+			  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+			    ;;
+			*) recurse_args="${recurse_args} ${recur_arg}" ;;
+			esac
+		else
+			recur_state=
+		fi
+	done
 	for configdir in $1 ; do
 
 		if [ -d ${srcdir}/${configdir} ] ; then
@@ -81,10 +97,7 @@ if [ -z "${norecursion}" ] ; then
 
 ### The recursion line is here.
 			if [ ! -z "${recprog}" ] ; then
-#				if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \
-#					${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
-#					${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${removing} ${redirect} ; then
-				if eval ${config_shell} ${recprog} "<<<$>>>@" ; then
+				if eval ${config_shell} ${recprog} "${recurse_args}" ${srcdiroption}; then
 					true
 				else
 					echo Configure in `pwd` failed, exiting. 1>&2