[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] Avoid spurious CONFIG_SITE test failure.
From: |
Eric Blake |
Subject: |
[PATCH 1/2] Avoid spurious CONFIG_SITE test failure. |
Date: |
Tue, 8 Jun 2010 06:53:25 -0600 |
* doc/autoconf.texi (Site Defaults): Mention that CONFIG_SITE
works best as an absolute path.
* tests/base.at (AC_CACHE_CHECK): Follow this best practice.
Signed-off-by: Eric Blake <address@hidden>
---
> Meanwhile, we are failing to detect any errors that might occur while
> sourcing an existing but broken site file, because we don't check for
> non-zero status after sourcing the site file. I hope to look at
> improving lib/autoconf/general.m4 later today, if you don't beat me to it...
This fixes the immediate test failure, but weakens the test...
ChangeLog | 5 +++++
doc/autoconf.texi | 3 ++-
tests/base.at | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fb1083b..6b5e87b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-06-08 Eric Blake <address@hidden>
+ Avoid spurious CONFIG_SITE test failure.
+ * doc/autoconf.texi (Site Defaults): Mention that CONFIG_SITE
+ works best as an absolute path.
+ * tests/base.at (AC_CACHE_CHECK): Follow this best practice.
+
Run libtool test with modern libtool.
* tests/foreign.at (Libtool): Request that libtoolize install
auxiliary files. Assume libtool 2.x is modern.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 6be99aa..3fe3d16 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -20980,7 +20980,8 @@ Site Defaults
@evindex CONFIG_SITE
If the environment variable @code{CONFIG_SITE} is set, @command{configure}
-uses its value as the name of a shell script to read. Otherwise, it
+uses its value as the name of a shell script to read; it is recommended
+that this be an absolute file name. Otherwise, it
reads the shell script @address@hidden/share/config.site} if it exists,
then @address@hidden/etc/config.site} if it exists. Thus,
settings in machine-specific files override those in machine-independent
diff --git a/tests/base.at b/tests/base.at
index 042f16c..e9fadb6 100644
--- a/tests/base.at
+++ b/tests/base.at
@@ -401,7 +401,7 @@ AT_DATA([config.site],
AT_DATA([sitecache],
[[my_cv_some_preset_cache_var=yes
]])
-CONFIG_SITE=config.site
+CONFIG_SITE=$PWD/config.site
export CONFIG_SITE
AT_CHECK_CONFIGURE
AT_CHECK([grep my_cv_some_preset_cache_var sitecache], [], [ignore])
--
1.7.0.1