Browse Source

This patch silences "WARNING: Couldn't find the global config file"

when running make check. From Gilles Espinasse.

	* configure.ac: If DEJAGNU is unset, set it to /dev/null.
	* Makefile.am: Export DEJAGNU.
	* configure: Likewise.
	* Makefile.in: Regenerate.
dejagnu-1.5.2
Ben Elliston 13 years ago
parent
commit
b97cf09cd7
  1. 7
      ChangeLog
  2. 1
      Makefile.am
  3. 2
      Makefile.in
  4. 7
      configure
  5. 6
      configure.ac

7
ChangeLog

@ -1,3 +1,10 @@
2013-06-15 Ben Elliston <bje@gnu.org>
* configure.ac: If DEJAGNU is unset, set it to /dev/null.
* Makefile.am: Export DEJAGNU.
* configure: Likewise.
* Makefile.in: Regenerate.
2013-06-15 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
* doc/user.xml: Fix typos.

1
Makefile.am

@ -20,6 +20,7 @@
# Process this file with automake to generate Makefile.in
AUTOMAKE_OPTIONS = dejagnu
export DEJAGNU
EXTRA_DIST = ChangeLog-1992 MAINTAINERS runtest site.tmpl \
$(pkgdata_DATA) $(config_DATA) $(baseboard_DATA) \

2
Makefile.in

@ -193,6 +193,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEJAGNU = @DEJAGNU@
DEPDIR = @DEPDIR@
DOCBOOK2HTML = @DOCBOOK2HTML@
DOCBOOK2PDF = @DOCBOOK2PDF@
@ -1444,6 +1445,7 @@ uninstall-man: uninstall-man1
uninstall-man1 uninstall-pdf-am uninstall-pkgdataDATA \
uninstall-ps-am
export DEJAGNU
# Give a reassuring message so that users know the "build" worked.
all-local:

7
configure

@ -590,6 +590,7 @@ am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
subdirs
DEJAGNU
EXPECT
DOCBOOK2TEXI
DOCBOOK2PS
@ -4056,6 +4057,12 @@ else
as_fn_error $? "Tcl 8.3 or greater is required" "$LINENO" 5
fi
if test x"$DEJAGNU" = x
then
DEJAGNU="/dev/null"
fi
subdirs="$subdirs example/calc example/mathhelper"

6
configure.ac

@ -56,5 +56,11 @@ else
AC_MSG_ERROR([Tcl 8.3 or greater is required])
fi
if test x"$DEJAGNU" = x
then
DEJAGNU="/dev/null"
fi
AC_SUBST(DEJAGNU)
AC_CONFIG_SUBDIRS([example/calc example/mathhelper])
AC_OUTPUT([Makefile])

Loading…
Cancel
Save