rename CONFIGURE_FILES to CONFIGURE_AC_FILES for clarity

also rename some similar vars/functions for the same reason

1 files changed, 40 insertions, 40 deletions

diff --git a/scripts/xdt-autogen.in.in b/scripts/xdt-autogen.in.in
index 02fc512..818b2ac 100644
--- a/scripts/xdt-autogen.in.in
+++ b/scripts/xdt-autogen.in.in
@@ -75,14 +75,14 @@ parse_configure_subdirs()
 
 ##
 ## Helper function to lookup configure.{in,ac} files recursively.
-## Sets $CONFIGURE_FILES to the list of configure files found.
+## Sets $CONFIGURE_AC_FILES to the list of files found.
 ##
-lookup_configure_files()
+lookup_configure_ac_files()
 {
   if test -f "$1/configure.ac"; then
-    configure_file="$1/configure.ac";
+    configure_ac_file="$1/configure.ac";
   elif test -f "$1/configure.in"; then
-    configure_file="$1/configure.in";
+    configure_ac_file="$1/configure.in";
   else
     cat >&2 <<EOF
 xdt-autogen: Directory "$1" does not look like a package
@@ -92,31 +92,31 @@ EOF
     exit 1
   fi
 
-  if test x"$CONFIGURE_FILES" = x""; then
-    CONFIGURE_FILES="$configure_file";
+  if test x"$CONFIGURE_AC_FILES" = x""; then
+    CONFIGURE_AC_FILES="$configure_ac_file";
   else
-    CONFIGURE_FILES="$CONFIGURE_FILES $configure_file";
+    CONFIGURE_AC_FILES="$CONFIGURE_AC_FILES $configure_ac_file";
   fi
 
-  subdirs=`parse_configure_subdirs ${configure_file}`
+  subdirs=`parse_configure_subdirs ${configure_ac_file}`
   for subdir in $subdirs; do
-    lookup_configure_files "$1/$subdir";
+    lookup_configure_ac_files "$1/$subdir";
   done
 }
 
 lookup_configure_ac_in_files()
 {
-  configure_file=""
+  configure_ac_in_file=""
 
   if test -f "$1/configure.ac.in"; then
-    configure_file="$1/configure.ac.in";
+    configure_ac_in_file="$1/configure.ac.in";
   elif test -f "$1/configure.in.in"; then
-    configure_file="$1/configure.in.in";
+    configure_ac_in_file="$1/configure.in.in";
   fi
 
-  test "x$configure_file" != "x" && echo -n "$configure_file "
+  test "x$configure_ac_in_file" != "x" && echo -n "$configure_ac_in_file "
 
-  subdirs=`parse_configure_subdirs ${configure_file}`
+  subdirs=`parse_configure_subdirs ${configure_ac_in_file}`
   for subdir in $subdirs; do
     lookup_configure_ac_in_files "$1/$subdir";
   done
@@ -217,8 +217,8 @@ MASTER_DIR=`pwd`; test -z "${MASTER_DIR}" && MASTER_DIR="."
 ## First we do some substitutions to generate configure.{ac,in} if necessary
 ##
 CONFIGURE_AC_IN_FILES=`lookup_configure_ac_in_files "$MASTER_DIR"`
-for conf_ac_in in $CONFIGURE_AC_IN_FILES; do
-  conf_ac="`echo $conf_ac_in | sed -e 's:\.in$::'`"
+for configure_ac_in_file in $CONFIGURE_AC_IN_FILES; do
+  configure_ac_file="`echo $configure_ac_in_file | sed -e 's:\.in$::'`"
 
   # first generate a revision id
   if test -d .git/svn; then
@@ -237,13 +237,13 @@ for conf_ac_in in $CONFIGURE_AC_IN_FILES; do
   fi
 
   # find out what languages we support
-  conf_dir=`dirname $conf_ac`
+  conf_dir=`dirname $configure_ac_file`
   linguas=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $1 }'`
 
   # and do the substitution
   sed -e "s/@REVISION@/${revision}/g" \
       -e "s/@LINGUAS@/${linguas}/g" \
-      < "$conf_ac_in" > "$conf_ac"
+      < "$configure_ac_in_file" > "$configure_ac_file"
 
 done
 
@@ -251,8 +251,8 @@ done
 ##
 ## Search for the configure.{ac,in} files
 ##
-CONFIGURE_FILES=""
-lookup_configure_files "$MASTER_DIR"
+CONFIGURE_AC_FILES=""
+lookup_configure_ac_files "$MASTER_DIR"
 
 
 ##
@@ -277,8 +277,8 @@ fi
 ## cleanup autogenerated files
 ##
 if test x"$1" = x"clean"; then
-  for configure_file in $CONFIGURE_FILES; do
-    directory=`dirname ${configure_file}`
+  for configure_ac_file in $CONFIGURE_AC_FILES; do
+    directory=`dirname ${configure_ac_file}`
     
     echo "Running ${MAKE} distclean in ${directory}..."
     (cd ${directory} ; ${MAKE} distclean) >/dev/null 2>&1
@@ -295,7 +295,7 @@ if test x"$1" = x"clean"; then
      rm -f intltool-* gtk-doc.make)
 
     # determine the output files used in this package directory
-    output_files=`tr '\\n\\t\\\\' '   ' < ${configure_file} | sed -ne 's|.*AC_OUTPUT(\[\{0,1\}\([[:alnum:]_@/\. -]\{1,\}\).*|\1|p'`;
+    output_files=`tr '\\n\\t\\\\' '   ' < ${configure_ac_file} | sed -ne 's|.*AC_OUTPUT(\[\{0,1\}\([[:alnum:]_@/\. -]\{1,\}\).*|\1|p'`;
     for output_file in $output_files; do
       if test x`basename $output_file` = x"Makefile"; then
         rm -f "${directory}/${output_file}.in";
@@ -305,7 +305,7 @@ if test x"$1" = x"clean"; then
     done
 
     # determine translations used in this package directory
-#    translations=`tr '\\n\\\\' '  ' < ${configure_file} | sed -ne 's/.*XDT_I18N(\[\{0,1\}\([a-zA-Z_@ ]\{1,\}\).*/\1/p'`;
+#    translations=`tr '\\n\\\\' '  ' < ${configure_ac_file} | sed -ne 's/.*XDT_I18N(\[\{0,1\}\([a-zA-Z_@ ]\{1,\}\).*/\1/p'`;
 #    for translation in $translations; do
 #      rm -f "${directory}/po/${translation}.gmo";
 #    done
@@ -340,8 +340,8 @@ EOF
 ## Check for intltoolize
 ##
 test -z "${XDT_PROG_INTLTOOLIZE}" && XDT_PROG_INTLTOOLIZE="intltoolize"
-for configure_file in $CONFIGURE_FILES; do
-  if $EGREP -q "^(AC|IT)_PROG_INTLTOOL" "${configure_file}"; then
+for configure_ac_file in $CONFIGURE_AC_FILES; do
+  if $EGREP -q "^(AC|IT)_PROG_INTLTOOL" "${configure_ac_file}"; then
     (${XDT_PROG_INTLTOOLIZE} --version) </dev/null >/dev/null 2>&1 || {
       cat >&2 <<EOF
 xdt-autogen: You must have "intltool" installed on your system.
@@ -359,8 +359,8 @@ done
 ## Check for libtoolize
 ##
 test -z "${XDT_PROG_LIBTOOLIZE}" && XDT_PROG_LIBTOOLIZE="libtoolize"
-for configure_file in $CONFIGURE_FILES; do
-  if grep -q "^AC_PROG_LIBTOOL" "${configure_file}"; then
+for configure_ac_file in $CONFIGURE_AC_FILES; do
+  if grep -q "^AC_PROG_LIBTOOL" "${configure_ac_file}"; then
     (${XDT_PROG_LIBTOOLIZE} --version) </dev/null >/dev/null 2>&0 || {
       cat >&2 <<EOF
 xdt-autogen: You must have "libtool" installed on your system.
@@ -378,8 +378,8 @@ done
 ## Check for glib-gettextize
 ##
 test -z "${XDT_PROG_GLIB_GETTEXTIZE}" && XDT_PROG_GLIB_GETTEXTIZE="glib-gettextize"
-for configure_file in $CONFIGURE_FILES; do
-  directory=`dirname ${configure_file}`
+for configure_ac_file in $CONFIGURE_AC_FILES; do
+  directory=`dirname ${configure_ac_file}`
   if test -d "${directory}/po"; then
     (${XDT_PROG_GLIB_GETTEXTIZE} --version) </dev/null >/dev/null 2>&1 || {
       cat >&2 <<EOF
@@ -397,8 +397,8 @@ done
 ## Check for gtkdocize
 ##
 test -z "${XDT_PROG_GTKDOCIZE}" && XDT_PROG_GTKDOCIZE="gtkdocize"
-for configure_file in $CONFIGURE_FILES; do
-  if grep -q "^GTK_DOC_CHECK" "${configure_file}"; then
+for configure_ac_file in $CONFIGURE_AC_FILES; do
+  if grep -q "^GTK_DOC_CHECK" "${configure_ac_file}"; then
     (${XDT_PROG_GTKDOCIZE} --version) </dev/null >/dev/null 2>&1 || {
       cat >&2 <<EOF
 xdt-autogen: You must have "gtk-doc" installed. You can get if from
@@ -436,8 +436,8 @@ EOF
 ## then autoheader-2.57, then autoheader-2.53, and finally simply autoheader.
 ##
 test -z "${XDT_PROG_AUTOHEADER}" &&
-for configure_file in $CONFIGURE_FILES; do
-  if $EGREP -q "^A(M|C)_CONFIG_HEADER" "${configure_file}"; then
+for configure_ac_file in $CONFIGURE_AC_FILES; do
+  if $EGREP -q "^A(M|C)_CONFIG_HEADER" "${configure_ac_file}"; then
     for i in autoheader-2.61 autoheader-2.60 autoheader-2.59 autoheader-2.58 autoheader-2.57 autoheader-2.53 autoheader; do
       (${i} --version) </dev/null >/dev/null 2>&1 &&
       XDT_PROG_AUTOHEADER=${i} && break
@@ -498,9 +498,9 @@ done
 ##
 ## Do the real work(TM)
 ##
-for configure_file in ${CONFIGURE_FILES}; do
+for configure_ac_file in ${CONFIGURE_AC_FILES}; do
   # figure out the package dir path
-  source_dir=`dirname ${configure_file}`
+  source_dir=`dirname ${configure_ac_file}`
   echo "Preparing package directory ${source_dir}..."
 
   # set aclocal flags
@@ -525,7 +525,7 @@ for configure_file in ${CONFIGURE_FILES}; do
     fi
   fi
 
-  if $EGREP -q "^(AC|IT)_PROG_INTLTOOL" "${configure_file}"; then
+  if $EGREP -q "^(AC|IT)_PROG_INTLTOOL" "${configure_ac_file}"; then
     (echo "Running ${XDT_PROG_INTLTOOLIZE} --automake --copy --force" &&
      cd "${source_dir}" &&
      ${XDT_PROG_INTLTOOLIZE} --automake --copy --force) || exit 1
@@ -553,13 +553,13 @@ XGETTEXT_ARGS = @XGETTEXT_ARGS@
     fi
   fi
 
-  if grep -q "^AC_PROG_LIBTOOL" "${configure_file}"; then
+  if grep -q "^AC_PROG_LIBTOOL" "${configure_ac_file}"; then
     (echo "Running ${XDT_PROG_LIBTOOLIZE} --force --copy..." &&
      cd "${source_dir}" &&
      ${XDT_PROG_LIBTOOLIZE} --force --copy) || exit 1
   fi
 
-  if grep -q "^GTK_DOC_CHECK" "${configure_file}"; then
+  if grep -q "^GTK_DOC_CHECK" "${configure_ac_file}"; then
     (echo "Running ${XDT_PROG_GTKDOCIZE} --copy..." &&
      cd ${source_dir} &&
      ${XDT_PROG_GTKDOCIZE} --copy) || exit 1
@@ -569,7 +569,7 @@ XGETTEXT_ARGS = @XGETTEXT_ARGS@
    cd ${source_dir} &&
    ${XDT_PROG_ACLOCAL} ${ACLOCAL_FLAGS}) || exit 1
 
-  if $EGREP -q "^A(M|C)_CONFIG_HEADER" "${configure_file}"; then
+  if $EGREP -q "^A(M|C)_CONFIG_HEADER" "${configure_ac_file}"; then
     (echo "Running ${XDT_PROG_AUTOHEADER}..." &&
      cd ${source_dir} &&
      ${XDT_PROG_AUTOHEADER}) || exit 1