[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/configure.in
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/configure.in |
Date: |
Mon, 05 Sep 2005 14:51:27 -0400 |
Index: ccvs/configure.in
diff -u ccvs/configure.in:1.357 ccvs/configure.in:1.358
--- ccvs/configure.in:1.357 Mon Sep 5 02:38:50 2005
+++ ccvs/configure.in Mon Sep 5 18:51:25 2005
@@ -1451,8 +1451,15 @@
overrides completely and `--enable-config-override=/' or simply
`--enable-config-override' to allow all paths. (Defaults to
`SYSCONFDIR/cvs.conf,SYSCONFDIR/cvs/')]),,
- [# $sysconfdir may still contain variable references.
- eval enable_config_override=`echo $sysconfdir/cvs.conf,$sysconfdir/cvs/`])
+ [# $sysconfdir may still contain variable references. By default, this will
+ # be to $prefix, and $prefix won't be set to its default value until later.
+ # Compromise without setting $prefix for the rest of the file.
+ cvs_save_prefix=$prefix
+ if test "X$prefix" = XNONE; then
+ prefix=$ac_prefix_default
+ fi
+ eval enable_config_override=`echo $sysconfdir/cvs.conf,$sysconfdir/cvs/`
+ prefix=$cvs_save_prefix])
if test x"$enable_config_override" = xyes; then
enable_config_override=/
@@ -1468,9 +1475,11 @@
[[\\/$]]* | ?:[[\\/]]* )
arrayinit="$arrayinit\"$path\", "
;;
- *) AC_MSG_ERROR([expected comma separated list of absolute directory
- names for --enable-config-override, or \`no', not:
- \`$enable_config_override' (\`$path' invalid.)]);;
+ *) AC_MSG_ERROR(
+ [expected comma separated list of absolute directory
+ names for --enable-config-override, or \`no', not:
+ \`$enable_config_override'
+ (\`$path' invalid.)]);;
esac
done
arrayinit="${arrayinit}NULL"