From 32776953d6ef07150215df5ddadb6cb8012dead5 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Fri, 1 Jul 1994 06:21:16 +0000
Subject: [PATCH] fixing macrodir passing in recursion, adding argument quoting

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3934 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/util/autoconf/acgeneral.m4 | 15 +++++++++++++--
 src/util/autoconf/autoconf.sh  |  6 +++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/util/autoconf/acgeneral.m4 b/src/util/autoconf/acgeneral.m4
index 4ef6b6bca..3597524ad 100644
--- a/src/util/autoconf/acgeneral.m4
+++ b/src/util/autoconf/acgeneral.m4
@@ -83,7 +83,17 @@ dnl [#] by AC_USER@AC_HOST on AC_DATE
 dnl
 define(AC_PARSEARGS,
 [# Save the original args to write them into config.status later.
-configure_args="[$]*"
+# Do argument quoting in a sane fashion so things don't break while recursing.
+configure_args=
+for arg do
+  case $arg in
+    *\"*|*\\*|*\[$]*|*\`*)
+      arg=`echo $arg|sed -e 's/\\\\/\\\\\\\\/g;s/"/\\\\"/g;s/\\$/\\\\$/g;s/\`/\\\\\`/g'`
+      ;;
+  esac
+  configure_args="$configure_args \"$arg\""
+done
+# configure_args="[$]*"
 
 # Only options that might do something get documented.
 changequote(,)dnl
@@ -353,7 +363,8 @@ ac_configure_temp="${configure_args-[$]*}"
 # Strip out --no-create and --norecursion so they don't pile up.
 configure_args=
 for ac_arg in $ac_configure_temp; do
-  case "$ac_arg" in
+  eval ac_unquoted="$ac_arg"
+  case "$ac_unquoted" in
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c) ;;
   -norecursion | --norecursion | --norecursio | --norecursi \
diff --git a/src/util/autoconf/autoconf.sh b/src/util/autoconf/autoconf.sh
index a6d192bbc..d5f490a75 100644
--- a/src/util/autoconf/autoconf.sh
+++ b/src/util/autoconf/autoconf.sh
@@ -155,10 +155,10 @@ case $AC_TOPDIR in
 esac
 # echo "topdown=$topdown"
 
-case $macrodir in
+case $AC_MACRODIR in
   "")  macdown= ;;
-  /*)  macdown=--macrodir=$macrodir ;;
-  *)   macdown=--macrodir=../$macrodir ;;
+  /*)  macdown=--macrodir=$AC_MACRODIR ;;
+  *)   macdown=--macrodir=../$AC_MACRODIR ;;
 esac
 # echo "macdown=$macdown"
 
-- 
2.26.2