diff --git a/aclocal.m4 b/aclocal.m4 index b2aec7a..dadc38d 100644 --- 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 13d7123..bb3a9b5 100755 --- 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 e1e75a5..f98479f 100644 --- 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)