diff options
| author | Ben Elliston <bje@gnu.org> | 2013-06-15 23:01:09 +1000 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2013-06-15 23:01:09 +1000 |
| commit | b97cf09cd7b79d87b4ecfa064657140e25a8958e (patch) | |
| tree | 4507b364cc8ba68c53e715a01d2c980e6c342ea5 | |
| parent | 3e48e41582a059339540d962e77a5eb3cc48b265 (diff) | |
| download | dejagnu-b97cf09cd7b79d87b4ecfa064657140e25a8958e.zip dejagnu-b97cf09cd7b79d87b4ecfa064657140e25a8958e.tar.gz dejagnu-b97cf09cd7b79d87b4ecfa064657140e25a8958e.tar.bz2 | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 6 |
5 files changed, 23 insertions, 0 deletions
@@ -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. diff --git a/Makefile.am b/Makefile.am index 79e38d3..ac60114 100644 --- a/Makefile.am +++ b/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) \ diff --git a/Makefile.in b/Makefile.in index 58d1f0e..1171a38 100644 --- a/Makefile.in +++ b/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: @@ -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" diff --git a/configure.ac b/configure.ac index 7ab586d..70ea257 100644 --- a/configure.ac +++ b/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]) |