From: Akim Demaille <akim@epita.fr>
Date: Wed, 22 Aug 2001 06:25:00 +0000 (+0000)
Subject: * lib/autoconf/general.m4 (AC_SHELL_PATH_WALK, AC_CHECK_PROG)
X-Git-Tag: AUTOCONF-2.52d~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=326fb6ba29ddd2e83775a19888bcfd2d17846092;p=thirdparty%2Fautoconf.git

* lib/autoconf/general.m4 (AC_SHELL_PATH_WALK, AC_CHECK_PROG)
(AC_CHECK_PROGS, AC_PATH_PROG, AC_PATH_PROGS, AC_CHECK_TOOL_PREFIX)
(AC_PATH_TOOL, AC_CHECK_TOOL, AC_CHECK_TOOLS): Move to...
* lib/autoconf/programs.m4: here.
* lib/autoconf/specific.m4 (_AC_PROG_ECHO, AC_PROG_MAKE_SET)
(AC_PROG_RANLIB, AC_PROG_YACC, AC_PROG_LEX, _AC_DECL_YYTEXT)
(AC_PROG_INSTALL, AC_PROG_LN_S, AC_RSH): Move to...
* lib/autoconf/programs.m4: here.
(_AC_DECL_YYTEXT): Rename as...
(_AC_PROG_LEX_YYTEXT_DECL): this.
* lib/autoconf/autoconf.m4, lib/autoconf/Makefile.am
* tests/Makefile.am, tests/suite.am: Adjust.
---

diff --git a/ChangeLog b/ChangeLog
index a9f5c5cd4..c9daf08c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2001-08-22  Akim Demaille  <akim@epita.fr>
+
+	* lib/autoconf/general.m4 (AC_SHELL_PATH_WALK, AC_CHECK_PROG)
+	(AC_CHECK_PROGS, AC_PATH_PROG, AC_PATH_PROGS, AC_CHECK_TOOL_PREFIX)
+	(AC_PATH_TOOL, AC_CHECK_TOOL, AC_CHECK_TOOLS): Move to...
+	* lib/autoconf/programs.m4: here.
+	* lib/autoconf/specific.m4 (_AC_PROG_ECHO, AC_PROG_MAKE_SET)
+	(AC_PROG_RANLIB, AC_PROG_YACC, AC_PROG_LEX, _AC_DECL_YYTEXT)
+	(AC_PROG_INSTALL, AC_PROG_LN_S, AC_RSH): Move to...
+	* lib/autoconf/programs.m4: here.
+	(_AC_DECL_YYTEXT): Rename as...
+	(_AC_PROG_LEX_YYTEXT_DECL): this.
+	* lib/autoconf/autoconf.m4, lib/autoconf/Makefile.am
+	* tests/Makefile.am, tests/suite.am: Adjust.
+
+	
 2001-08-22  Akim Demaille  <akim@epita.fr>
 
 	* lib/autoconf/general.m4 (AC_LIST_MEMBER_OF, AC_LINKER_OPTION):
diff --git a/lib/autoconf/Makefile.am b/lib/autoconf/Makefile.am
index 33c0c2f2f..e5751bcfd 100644
--- a/lib/autoconf/Makefile.am
+++ b/lib/autoconf/Makefile.am
@@ -21,7 +21,7 @@ distautoconflibdir = $(pkgdatadir)/autoconf
 distautoconflib_DATA = autoconf.m4 \
                        general.m4 oldnames.m4 specific.m4 \
 		       lang.m4 c.m4 fortran.m4 \
-                       functions.m4 headers.m4 types.m4 libs.m4
+                       functions.m4 headers.m4 types.m4 libs.m4 programs.m4
 nodistautoconflibdir = $(pkgdatadir)/autoconf
 # The order matters: we need version.m4 to build autoconf.m4f.
 nodistautoconflib_DATA = version.m4 autoconf.m4f
@@ -132,7 +132,8 @@ autoconf.m4f: $(srclibdir)/m4sugar/m4sugar.m4	\
               $(srclibdir)/autoconf/functions.m4 \
               $(srclibdir)/autoconf/headers.m4	\
               $(srclibdir)/autoconf/types.m4	\
-              $(srclibdir)/autoconf/libs.m4
+              $(srclibdir)/autoconf/libs.m4	\
+              $(srclibdir)/autoconf/programs.m4
 
 # Files that should be removed, but which Automake does not know.
 CLEANFILES = autoconf.m4f
diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in
index d99186e91..535432e76 100644
--- a/lib/autoconf/Makefile.in
+++ b/lib/autoconf/Makefile.in
@@ -67,7 +67,7 @@ PERL = @PERL@
 VERSION = @VERSION@
 
 distautoconflibdir = $(pkgdatadir)/autoconf
-distautoconflib_DATA = autoconf.m4                        general.m4 oldnames.m4 specific.m4 		       lang.m4 c.m4 fortran.m4                        functions.m4 headers.m4 types.m4 libs.m4
+distautoconflib_DATA = autoconf.m4                        general.m4 oldnames.m4 specific.m4 		       lang.m4 c.m4 fortran.m4                        functions.m4 headers.m4 types.m4 libs.m4 programs.m4
 
 nodistautoconflibdir = $(pkgdatadir)/autoconf
 # The order matters: we need version.m4 to build autoconf.m4f.
@@ -339,7 +339,8 @@ autoconf.m4f: $(srclibdir)/m4sugar/m4sugar.m4	\
               $(srclibdir)/autoconf/functions.m4 \
               $(srclibdir)/autoconf/headers.m4	\
               $(srclibdir)/autoconf/types.m4	\
-              $(srclibdir)/autoconf/libs.m4
+              $(srclibdir)/autoconf/libs.m4	\
+              $(srclibdir)/autoconf/programs.m4
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/lib/autoconf/autoconf.m4 b/lib/autoconf/autoconf.m4
index 648c1f927..4e87d9c75 100644
--- a/lib/autoconf/autoconf.m4
+++ b/lib/autoconf/autoconf.m4
@@ -53,6 +53,7 @@ changequote()changequote([, ])include(m4sugar/m4sh.m4)#      -*- Autoconf -*-
 
 m4_include([autoconf/version.m4])
 m4_include([autoconf/general.m4])
+m4_include([autoconf/programs.m4])
 m4_include([autoconf/lang.m4])
 m4_include([autoconf/c.m4])
 m4_include([autoconf/fortran.m4])
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 5f2b4deba..d0db00d54 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -628,6 +628,30 @@ AC_DEFUN([AC_PREFIX_DEFAULT],
 [m4_divert_text([DEFAULTS], [ac_default_prefix=$1])])
 
 
+# AC_PREFIX_PROGRAM(PROGRAM)
+# --------------------------
+# Guess the value for the `prefix' variable by looking for
+# the argument program along PATH and taking its parent.
+# Example: if the argument is `gcc' and we find /usr/local/gnu/bin/gcc,
+# set `prefix' to /usr/local/gnu.
+# This comes too late to find a site file based on the prefix,
+# and it might use a cached value for the path.
+# No big loss, I think, since most configures don't use this macro anyway.
+AC_DEFUN([AC_PREFIX_PROGRAM],
+[dnl Get an upper case version of $[1].
+m4_pushdef([AC_Prog], m4_toupper([$1]))dnl
+if test "x$prefix" = xNONE; then
+dnl We reimplement AC_MSG_CHECKING (mostly) to avoid the ... in the middle.
+  echo $ECHO_N "checking for prefix by $ECHO_C" >&AS_MESSAGE_FD
+  AC_PATH_PROG(m4_quote(AC_Prog), [$1])
+  if test -n "$ac_cv_path_[]AC_Prog"; then
+    prefix=`AS_DIRNAME(["$ac_cv_path_[]AC_Prog"])`
+  fi
+fi
+m4_popdef([AC_Prog])dnl
+])# AC_PREFIX_PROGRAM
+
+
 # AC_CONFIG_SRCDIR([UNIQUE-FILE-IN-SOURCE-DIR])
 # ---------------------------------------------
 # UNIQUE-FILE-IN-SOURCE-DIR is a filename unique to this package,
@@ -2271,244 +2295,6 @@ $ac_includes_default])])
 
 
 
-## ----------------------- ##
-## Checking for programs.  ##
-## ----------------------- ##
-
-
-# AC_SHELL_PATH_WALK([PATH = $PATH], BODY)
-# ----------------------------------------
-# Walk through PATH running BODY for each `ac_dir'.
-#
-# `$ac_dummy' forces splitting on constant user-supplied paths.
-# POSIX.2 word splitting is done only on the output of word
-# expansions, not every word.  This closes a longstanding sh security
-# hole.
-m4_define([AC_SHELL_PATH_WALK],
-[ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="m4_default([$1], [$PATH])"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $2
-done
-])
-
-
-# AC_CHECK_PROG(VARIABLE, PROG-TO-CHECK-FOR,
-#               [VALUE-IF-FOUND], [VALUE-IF-NOT-FOUND],
-#               [PATH], [REJECT])
-# -----------------------------------------------------
-AC_DEFUN([AC_CHECK_PROG],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=$[2]
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_prog_$1,
-[if test -n "$$1"; then
-  ac_cv_prog_$1="$$1" # Let the user override the test.
-else
-m4_ifvaln([$6],
-[  ac_prog_rejected=no])dnl
-  AC_SHELL_PATH_WALK([$5],
-[AS_EXECUTABLE_P("$ac_dir/$ac_word") || continue
-m4_ifvaln([$6],
-[if test "$ac_dir/$ac_word" = "$6"; then
-  ac_prog_rejected=yes
-  continue
-fi])dnl
-ac_cv_prog_$1="$3"
-echo "$as_me:__oline__: found $ac_dir/$ac_word" >&AS_MESSAGE_LOG_FD
-break])
-m4_ifvaln([$6],
-[if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_$1
-  shift
-  if test $[@%:@] != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set $1 to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" ${1+"$[@]"}
-    shift
-    ac_cv_prog_$1="$[@]"
-m4_if([$2], [$4],
-[  else
-    # Default is a loser.
-    AC_MSG_ERROR([$1=$6 unacceptable, but no other $4 found in dnl
-m4_default([$5], [\$PATH])])
-])dnl
-  fi
-fi])dnl
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_CHECK_PROGS will keep looking.
-m4_ifvaln([$4],
-[  test -z "$ac_cv_prog_$1" && ac_cv_prog_$1="$4"])dnl
-fi])dnl
-$1=$ac_cv_prog_$1
-if test -n "$$1"; then
-  AC_MSG_RESULT([$$1])
-else
-  AC_MSG_RESULT([no])
-fi
-AC_SUBST($1)dnl
-])# AC_CHECK_PROG
-
-
-# AC_CHECK_PROGS(VARIABLE, PROGS-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND],
-#                [PATH])
-# ------------------------------------------------------------------
-AC_DEFUN([AC_CHECK_PROGS],
-[for ac_prog in $2
-do
-  AC_CHECK_PROG([$1], [$ac_prog], [$ac_prog], , [$4])
-  test -n "$$1" && break
-done
-m4_ifvaln([$3], [test -n "$$1" || $1="$3"])])
-
-
-# AC_PATH_PROG(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
-# -----------------------------------------------------------------------
-AC_DEFUN([AC_PATH_PROG],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=$[2]
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL([ac_cv_path_$1],
-[case $$1 in
-  [[\\/]]* | ?:[[\\/]]*)
-  ac_cv_path_$1="$$1" # Let the user override the test with a path.
-  ;;
-  *)
-  AC_SHELL_PATH_WALK([$4],
-[if AS_EXECUTABLE_P("$ac_dir/$ac_word"); then
-   ac_cv_path_$1="$ac_dir/$ac_word"
-   echo "$as_me:__oline__: found $ac_dir/$ac_word" >&AS_MESSAGE_LOG_FD
-   break
-fi])
-dnl If no 3rd arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-m4_ifvaln([$3],
-[  test -z "$ac_cv_path_$1" && ac_cv_path_$1="$3"])dnl
-  ;;
-esac])dnl
-AC_SUBST([$1], [$ac_cv_path_$1])
-if test -n "$$1"; then
-  AC_MSG_RESULT([$$1])
-else
-  AC_MSG_RESULT([no])
-fi
-])# AC_PATH_PROG
-
-
-# AC_PATH_PROGS(VARIABLE, PROGS-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND],
-#               [PATH])
-# -----------------------------------------------------------------
-AC_DEFUN([AC_PATH_PROGS],
-[for ac_prog in $2
-do
-  AC_PATH_PROG([$1], [$ac_prog], , [$4])
-  test -n "$$1" && break
-done
-m4_ifvaln([$3], [test -n "$$1" || $1="$3"])dnl
-])
-
-
-
-
-## -------------------- ##
-## Checking for tools.  ##
-## -------------------- ##
-
-
-# AC_CHECK_TOOL_PREFIX
-# --------------------
-AU_DEFUN([AC_CHECK_TOOL_PREFIX])
-
-
-# AC_PATH_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
-# -----------------------------------------------------------------------
-# (Use different variables $1 and ac_pt_$1 so that cache vars don't conflict.)
-AC_DEFUN([AC_PATH_TOOL],
-[if test -n "$ac_tool_prefix"; then
-  AC_PATH_PROG([$1], [${ac_tool_prefix}$2], , [$4])
-fi
-if test -z "$ac_cv_path_$1"; then
-  ac_pt_$1=$$1
-  AC_PATH_PROG([ac_pt_$1], [$2], [$3], [$4])
-  $1=$ac_pt_$1
-else
-  $1="$ac_cv_path_$1"
-fi
-])# AC_PATH_TOOL
-
-
-# AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH])
-# ------------------------------------------------------------------------
-# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
-AC_DEFUN([AC_CHECK_TOOL],
-[if test -n "$ac_tool_prefix"; then
-  AC_CHECK_PROG([$1], [${ac_tool_prefix}$2], [${ac_tool_prefix}$2], , [$4])
-fi
-if test -z "$ac_cv_prog_$1"; then
-  ac_ct_$1=$$1
-  AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
-  $1=$ac_ct_$1
-else
-  $1="$ac_cv_prog_$1"
-fi
-])# AC_CHECK_TOOL
-
-
-# AC_CHECK_TOOLS(VARIABLE, PROGS-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND],
-#                [PATH])
-# ------------------------------------------------------------------
-# Check for each tool in PROGS-TO-CHECK-FOR with the cross prefix. If
-# none can be found with a cross prefix, then use the first one that
-# was found without the cross prefix.
-AC_DEFUN([AC_CHECK_TOOLS],
-[if test -n "$ac_tool_prefix"; then
-  for ac_prog in $2
-  do
-    AC_CHECK_PROG([$1],
-                  [$ac_tool_prefix$ac_prog], [$ac_tool_prefix$ac_prog],,
-                  [$4])
-    test -n "$$1" && break
-  done
-fi
-if test -z "$$1"; then
-  ac_ct_$1=$$1
-  AC_CHECK_PROGS([ac_ct_$1], [$2], [$3], [$4])
-  $1=$ac_ct_$1
-fi
-])# AC_CHECK_TOOLS
-
-
-# AC_PREFIX_PROGRAM(PROGRAM)
-# --------------------------
-# Guess the value for the `prefix' variable by looking for
-# the argument program along PATH and taking its parent.
-# Example: if the argument is `gcc' and we find /usr/local/gnu/bin/gcc,
-# set `prefix' to /usr/local/gnu.
-# This comes too late to find a site file based on the prefix,
-# and it might use a cached value for the path.
-# No big loss, I think, since most configures don't use this macro anyway.
-AC_DEFUN([AC_PREFIX_PROGRAM],
-[dnl Get an upper case version of $[1].
-m4_pushdef([AC_Prog], m4_toupper([$1]))dnl
-if test "x$prefix" = xNONE; then
-dnl We reimplement AC_MSG_CHECKING (mostly) to avoid the ... in the middle.
-  echo $ECHO_N "checking for prefix by $ECHO_C" >&AS_MESSAGE_FD
-  AC_PATH_PROG(m4_quote(AC_Prog), [$1])
-  if test -n "$ac_cv_path_[]AC_Prog"; then
-    prefix=`AS_DIRNAME(["$ac_cv_path_[]AC_Prog"])`
-  fi
-fi
-m4_popdef([AC_Prog])dnl
-])# AC_PREFIX_PROGRAM
-
-
-
-
 ## ------------------------ ##
 ## Examining declarations.  ##
 ## ------------------------ ##
diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 8c994ef86..e1e59770b 100644
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -1,5 +1,5 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
-# Macros that test for specific features.
+# Macros that test for specific, unclassified, features.
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 #
@@ -50,242 +50,6 @@
 # Roland McGrath, Noah Friedman, david d zuhn, and many others.
 
 
-## --------------------- ##
-## Checks for programs.  ##
-## --------------------- ##
-
-
-# _AC_PROG_ECHO
-# -------------
-# Check whether to use -n, \c, or newline-tab to separate
-# checking messages from result messages.
-# Don't try to cache, since the results of this macro are needed to
-# display the checking message.  In addition, caching something used once
-# has little interest.
-# Idea borrowed from dist 3.0.  Use `*c*,', not `*c,' because if `\c'
-# failed there is also a new-line to match.
-m4_define([_AC_PROG_ECHO],
-[case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-AC_SUBST(ECHO_C)dnl
-AC_SUBST(ECHO_N)dnl
-AC_SUBST(ECHO_T)dnl
-])# _AC_PROG_ECHO
-
-
-# AC_PROG_MAKE_SET
-# ----------------
-# Define SET_MAKE to set ${MAKE} if make doesn't.
-AC_DEFUN([AC_PROG_MAKE_SET],
-[AC_MSG_CHECKING([whether ${MAKE-make} sets \${MAKE}])
-set dummy ${MAKE-make}; ac_make=`echo "$[2]" | sed 'y,./+-,__p_,'`
-AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
-[cat >conftest.make <<\_ACEOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftest.make])dnl
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  AC_MSG_RESULT([yes])
-  SET_MAKE=
-else
-  AC_MSG_RESULT([no])
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-AC_SUBST([SET_MAKE])dnl
-])# AC_PROG_MAKE_SET
-
-
-# AC_PROG_RANLIB
-# --------------
-AC_DEFUN([AC_PROG_RANLIB],
-[AC_CHECK_TOOL(RANLIB, ranlib, :)])
-
-
-# Check for mawk first since it's generally faster.
-AC_DEFUN([AC_PROG_AWK],
-[AC_CHECK_PROGS(AWK, mawk gawk nawk awk, )])
-
-
-# AC_PROG_YACC
-# ------------
-AC_DEFUN([AC_PROG_YACC],
-[AC_CHECK_PROGS(YACC, 'bison -y' byacc, yacc)])
-
-
-# AC_PROG_LEX
-# -----------
-# Look for flex or lex.  Set its associated library to LEXLIB.
-# Check if lex declares yytext as a char * by default, not a char[].
-AC_DEFUN_ONCE([AC_PROG_LEX],
-[AC_CHECK_PROGS(LEX, flex lex, :)
-if test -z "$LEXLIB"
-then
-  AC_CHECK_LIB(fl, yywrap, LEXLIB="-lfl",
-    [AC_CHECK_LIB(l, yywrap, LEXLIB="-ll")])
-fi
-AC_SUBST(LEXLIB)
-if test "x$LEX" != "x:"; then
-  _AC_DECL_YYTEXT
-fi])
-
-
-# _AC_DECL_YYTEXT
-# ---------------
-# Check if lex declares yytext as a char * by default, not a char[].
-m4_define([_AC_DECL_YYTEXT],
-[AC_CACHE_CHECK(lex output file root, ac_cv_prog_lex_root,
-[# The minimal lex program is just a single line: %%.  But some broken lexes
-# (Solaris, I think it was) want two %% lines, so accommodate them.
-echo '%%
-%%' | $LEX
-if test -f lex.yy.c; then
-  ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
-  ac_cv_prog_lex_root=lexyy
-else
-  AC_MSG_ERROR([cannot find output from $LEX; giving up])
-fi])
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-AC_SUBST(LEX_OUTPUT_ROOT)dnl
-
-AC_CACHE_CHECK(whether yytext is a pointer, ac_cv_prog_lex_yytext_pointer,
-[# POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
-ac_save_LIBS=$LIBS
-LIBS="$LIBS $LEXLIB"
-AC_LINK_IFELSE([`cat $LEX_OUTPUT_ROOT.c`], ac_cv_prog_lex_yytext_pointer=yes)
-LIBS=$ac_save_LIBS
-rm -f "${LEX_OUTPUT_ROOT}.c"
-])
-dnl
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
-  AC_DEFINE(YYTEXT_POINTER, 1,
-            [Define if `lex' declares `yytext' as a `char *' by default,
-             not a `char[]'.])
-fi
-])# _AC_DECL_YYTEXT
-
-
-# Require AC_PROG_LEX in case some people were just calling this macro.
-AU_DEFUN([AC_DECL_YYTEXT],
-[AC_PROG_LEX])
-
-
-# AC_PROG_INSTALL
-# ---------------
-AC_DEFUN([AC_PROG_INSTALL],
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-AC_MSG_CHECKING([for a BSD compatible install])
-if test -z "$INSTALL"; then
-AC_CACHE_VAL(ac_cv_path_install,
-[  ac_save_IFS=$IFS; IFS=$ac_path_separator
-  for ac_dir in $PATH; do
-    IFS=$ac_save_IFS
-    # Account for people who put trailing slashes in PATH elements.
-    case $ac_dir/ in
-    / | ./ | .// | /[cC]/* \
-    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
-    | /usr/ucb/* ) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if AS_EXECUTABLE_P(["$ac_dir/$ac_prog"]); then
-	  if test $ac_prog = install &&
-            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-])dnl
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL=$ac_install_sh
-  fi
-fi
-dnl We do special magic for INSTALL instead of AC_SUBST, to get
-dnl relative paths right.
-AC_MSG_RESULT([$INSTALL])
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-AC_SUBST(INSTALL_PROGRAM)dnl
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-AC_SUBST(INSTALL_DATA)dnl
-])# AC_PROG_INSTALL
-
-
-# AC_PROG_LN_S
-# ------------
-AC_DEFUN([AC_PROG_LN_S],
-[AC_MSG_CHECKING([whether ln -s works])
-AC_SUBST([LN_S], [$as_ln_s])dnl
-if test "$LN_S" = "ln -s"; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no, using $LN_S])
-fi
-])# AC_PROG_LN_S
-
-
-# AC_RSH
-# ------
-# I don't know what it used to do, but it no longer does.
-AU_DEFUN([AC_RSH],
-[AC_DIAGNOSE([obsolete], [$0: is no longer supported.
-Remove this warning when you adjust the code.])])
-
-
-
 ## ------------------------- ##
 ## Checks for declarations.  ##
 ## ------------------------- ##
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b51cf622f..3174f1bc2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,7 @@ AUTOMAKE_OPTIONS = gnits
 SUITE_GENERATED = \
 	aclang.at acc.at acfortran.at \
 	acgeneral.at acspecific.at acfunctions.at acheaders.at actypes.at \
-	aclibs.at
+	aclibs.at acprograms.at
 
 SUITE = suite.at \
         m4sugar.at m4sh.at \
@@ -67,7 +67,8 @@ MACRO_FILES = $(top_srcdir)/lib/autoconf/general.m4 \
               $(top_srcdir)/lib/autoconf/fortran.m4 \
               $(top_srcdir)/lib/autoconf/headers.m4 \
               $(top_srcdir)/lib/autoconf/libs.m4 \
-              $(top_srcdir)/lib/autoconf/types.m4
+              $(top_srcdir)/lib/autoconf/types.m4	\
+              $(top_srcdir)/lib/autoconf/programs.m4
 
 $(SUITE_GENERATED): mktests.sh $(MACRO_FILES)
 	cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index a9a8d04b9..35ff0853d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -68,7 +68,7 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits
 
-SUITE_GENERATED =  	aclang.at acc.at acfortran.at 	acgeneral.at acspecific.at acfunctions.at acheaders.at actypes.at 	aclibs.at
+SUITE_GENERATED =  	aclang.at acc.at acfortran.at 	acgeneral.at acspecific.at acfunctions.at acheaders.at actypes.at 	aclibs.at acprograms.at
 
 
 SUITE = suite.at         m4sugar.at m4sh.at         base.at tools.at torture.at 	compile.at 	$(SUITE_GENERATED) 	semantics.at 	foreign.at
@@ -85,7 +85,7 @@ AUTOM4TE = autom4te_perllibdir='$(top_srcdir)/lib' ../bin/autom4te
 # The files which contains macro we check for syntax.  Don't use $(top_srcdir)
 # here since below we explicitly `cd' to $srcdir.  As for the dependencies,
 # thanks God for VPATH.  Hm...
-MACRO_FILES = $(top_srcdir)/lib/autoconf/general.m4               $(top_srcdir)/lib/autoconf/specific.m4               $(top_srcdir)/lib/autoconf/functions.m4               $(top_srcdir)/lib/autoconf/lang.m4               $(top_srcdir)/lib/autoconf/c.m4               $(top_srcdir)/lib/autoconf/fortran.m4               $(top_srcdir)/lib/autoconf/headers.m4               $(top_srcdir)/lib/autoconf/libs.m4               $(top_srcdir)/lib/autoconf/types.m4
+MACRO_FILES = $(top_srcdir)/lib/autoconf/general.m4               $(top_srcdir)/lib/autoconf/specific.m4               $(top_srcdir)/lib/autoconf/functions.m4               $(top_srcdir)/lib/autoconf/lang.m4               $(top_srcdir)/lib/autoconf/c.m4               $(top_srcdir)/lib/autoconf/fortran.m4               $(top_srcdir)/lib/autoconf/headers.m4               $(top_srcdir)/lib/autoconf/libs.m4               $(top_srcdir)/lib/autoconf/types.m4	              $(top_srcdir)/lib/autoconf/programs.m4
 
 
 CLEANFILES =  	debug-*.sh state-* at-* stderr stdout 	script.s4g script.as script				configure configure.in configure.ac config.status config.cache 	config.log config.h.in config.hin config.h 	config.guess config.sub install-sh		expr						libtool ltconfig ltmain.sh
diff --git a/tests/suite.at b/tests/suite.at
index 68ca0bbb3..a4bc80425 100644
--- a/tests/suite.at
+++ b/tests/suite.at
@@ -67,6 +67,7 @@ m4_include([semantics.at])
 # for types requires looking for headers etc.
 m4_include([acgeneral.at])
 m4_include([acspecific.at])
+m4_include([acprograms.at])
 m4_include([acheaders.at])
 m4_include([actypes.at])
 m4_include([acfunctions.at])