Detect a potential infinite loop in ./configure in AC_DEFINE_DIR.

Fixes the changes made to AC_DEFINE_DIR in
c74836dc4a5bde1e0bf38da58053bf5f28da8ff5.

diff --git a/aclocal.m4 b/aclocal.m4
index b2aec7a9b2ef28f4b3f315d832685a9c527cc5fe..dadc38d90f305b2e6e9c0a811982c207be29b86c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -4,9 +4,14 @@ AC_DEFUN([AC_DEFINE_DIR], [
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
   last_ac_define_dir=`eval echo [$]$2`
   ac_define_dir=`eval echo [$]last_ac_define_dir`
+  ac_define_dir_counter=0
   while test "x[$]last_ac_define_dir" != "x[$]ac_define_dir"; do
     last_ac_define_dir="[$]ac_define_dir"
     ac_define_dir=`eval echo [$]last_ac_define_dir`
+    AS_VAR_ARITH([ac_define_dir_counter], [$ac_define_dir_counter + 1])
+    AS_VAR_IF([ac_define_dir_counter], [128],
+       [AC_MSG_ERROR([detected recusive directory expansion when expanding $1=[$]$2: [$]ac_define_dir])
+       break])
   done
   $1="$ac_define_dir"
   AC_SUBST($1)

diff --git a/configure b/configure
index 13d712333c2ae3f39d6f141295ee90e4135aff4a..bb3a9b5f620d88776ea510da279ba3229609ae16 100755 (executable)
--- a/configure
+++ b/configure
@@ -5401,9 +5401,15 @@ pkglibdir='${libdir}/${PACKAGE_TARNAME}'
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
   last_ac_define_dir=`eval echo $pkglocalstatedir`
   ac_define_dir=`eval echo $last_ac_define_dir`
+  ac_define_dir_counter=0
   while test "x$last_ac_define_dir" != "x$ac_define_dir"; do
     last_ac_define_dir="$ac_define_dir"
     ac_define_dir=`eval echo $last_ac_define_dir`
+    as_fn_arith $ac_define_dir_counter + 1 && ac_define_dir_counter=$as_val
+    if test "x$ac_define_dir_counter" = x128; then :
+  as_fn_error $? "detected recusive directory expansion when expanding PKGLOCALSTATEDIR=$pkglocalstatedir: $ac_define_dir" "$LINENO" 5
+       break
+fi
   done
   PKGLOCALSTATEDIR="$ac_define_dir"
 
@@ -5419,9 +5425,15 @@ _ACEOF
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
   last_ac_define_dir=`eval echo $pkglibexecdir`
   ac_define_dir=`eval echo $last_ac_define_dir`
+  ac_define_dir_counter=0
   while test "x$last_ac_define_dir" != "x$ac_define_dir"; do
     last_ac_define_dir="$ac_define_dir"
     ac_define_dir=`eval echo $last_ac_define_dir`
+    as_fn_arith $ac_define_dir_counter + 1 && ac_define_dir_counter=$as_val
+    if test "x$ac_define_dir_counter" = x128; then :
+  as_fn_error $? "detected recusive directory expansion when expanding PKGLIBEXECDIR=$pkglibexecdir: $ac_define_dir" "$LINENO" 5
+       break
+fi
   done
   PKGLIBEXECDIR="$ac_define_dir"
 
@@ -7288,9 +7300,15 @@ fi
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
   last_ac_define_dir=`eval echo $sysconfdir`
   ac_define_dir=`eval echo $last_ac_define_dir`
+  ac_define_dir_counter=0
   while test "x$last_ac_define_dir" != "x$ac_define_dir"; do
     last_ac_define_dir="$ac_define_dir"
     ac_define_dir=`eval echo $last_ac_define_dir`
+    as_fn_arith $ac_define_dir_counter + 1 && ac_define_dir_counter=$as_val
+    if test "x$ac_define_dir_counter" = x128; then :
+  as_fn_error $? "detected recusive directory expansion when expanding ETC_DIR=$sysconfdir: $ac_define_dir" "$LINENO" 5
+       break
+fi
   done
   ETC_DIR="$ac_define_dir"
 
@@ -7325,9 +7343,15 @@ fi
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
   last_ac_define_dir=`eval echo $logdir`
   ac_define_dir=`eval echo $last_ac_define_dir`
+  ac_define_dir_counter=0
   while test "x$last_ac_define_dir" != "x$ac_define_dir"; do
     last_ac_define_dir="$ac_define_dir"
     ac_define_dir=`eval echo $last_ac_define_dir`
+    as_fn_arith $ac_define_dir_counter + 1 && ac_define_dir_counter=$as_val
+    if test "x$ac_define_dir_counter" = x128; then :
+  as_fn_error $? "detected recusive directory expansion when expanding LOG_DIR=$logdir: $ac_define_dir" "$LINENO" 5
+       break
+fi
   done
   LOG_DIR="$ac_define_dir"
 
@@ -7371,9 +7395,15 @@ fi
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
   last_ac_define_dir=`eval echo $helpdir`
   ac_define_dir=`eval echo $last_ac_define_dir`
+  ac_define_dir_counter=0
   while test "x$last_ac_define_dir" != "x$ac_define_dir"; do
     last_ac_define_dir="$ac_define_dir"
     ac_define_dir=`eval echo $last_ac_define_dir`
+    as_fn_arith $ac_define_dir_counter + 1 && ac_define_dir_counter=$as_val
+    if test "x$ac_define_dir_counter" = x128; then :
+  as_fn_error $? "detected recusive directory expansion when expanding HELP_DIR=$helpdir: $ac_define_dir" "$LINENO" 5
+       break
+fi
   done
   HELP_DIR="$ac_define_dir"
 
@@ -7418,9 +7448,15 @@ fi
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
   last_ac_define_dir=`eval echo $moduledir`
   ac_define_dir=`eval echo $last_ac_define_dir`
+  ac_define_dir_counter=0
   while test "x$last_ac_define_dir" != "x$ac_define_dir"; do
     last_ac_define_dir="$ac_define_dir"
     ac_define_dir=`eval echo $last_ac_define_dir`
+    as_fn_arith $ac_define_dir_counter + 1 && ac_define_dir_counter=$as_val
+    if test "x$ac_define_dir_counter" = x128; then :
+  as_fn_error $? "detected recusive directory expansion when expanding MODULE_DIR=$moduledir: $ac_define_dir" "$LINENO" 5
+       break
+fi
   done
   MODULE_DIR="$ac_define_dir"
 
@@ -7465,9 +7501,15 @@ fi
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
   last_ac_define_dir=`eval echo $pkgrundir`
   ac_define_dir=`eval echo $last_ac_define_dir`
+  ac_define_dir_counter=0
   while test "x$last_ac_define_dir" != "x$ac_define_dir"; do
     last_ac_define_dir="$ac_define_dir"
     ac_define_dir=`eval echo $last_ac_define_dir`
+    as_fn_arith $ac_define_dir_counter + 1 && ac_define_dir_counter=$as_val
+    if test "x$ac_define_dir_counter" = x128; then :
+  as_fn_error $? "detected recusive directory expansion when expanding PKGRUNDIR=$pkgrundir: $ac_define_dir" "$LINENO" 5
+       break
+fi
   done
   PKGRUNDIR="$ac_define_dir"
 

diff --git a/libratbox/acinclude.m4 b/libratbox/acinclude.m4
index e1e75a5c042f88d34d099b153179d4e494165bd2..f98479ff4c7d4328116b954e1b1f0f7d5759d3ee 100644 (file)
--- a/libratbox/acinclude.m4
+++ b/libratbox/acinclude.m4
@@ -4,9 +4,14 @@ AC_DEFUN([AC_DEFINE_DIR], [
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
   last_ac_define_dir=`eval echo [$]$2`
   ac_define_dir=`eval echo [$]last_ac_define_dir`
+  ac_define_dir_counter=0
   while test "x[$]last_ac_define_dir" != "x[$]ac_define_dir"; do
     last_ac_define_dir="[$]ac_define_dir"
     ac_define_dir=`eval echo [$]last_ac_define_dir`
+    AS_VAR_ARITH([ac_define_dir_counter], [$ac_define_dir_counter + 1])
+    AS_VAR_IF([ac_define_dir_counter], [128],
+       [AC_MSG_ERROR([detected recusive directory expansion when expanding $1=[$]$2: [$]ac_define_dir])
+       break])
   done
   $1="$ac_define_dir"
   AC_SUBST($1)