summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-01-04 18:05:09 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-01-04 18:05:09 (GMT)
commitd56772873c60ce2d9af8c4e6f5e6cdeed5a54548 (patch)
tree07a5e0d098e4f5f61bf55fd6eda06f3960daacf3
parentcec3c7087e51a9ff97e2b69616efb99700b058bc (diff)
downloadblt-d56772873c60ce2d9af8c4e6f5e6cdeed5a54548.zip
blt-d56772873c60ce2d9af8c4e6f5e6cdeed5a54548.tar.gz
blt-d56772873c60ce2d9af8c4e6f5e6cdeed5a54548.tar.bz2
centralize tclconfig
-rwxr-xr-xunix/aclocal.m42
-rwxr-xr-xunix/configure4
-rwxr-xr-xunix/configure.in2
3 files changed, 4 insertions, 4 deletions
diff --git a/unix/aclocal.m4 b/unix/aclocal.m4
index 0b05739..bfd8a17 100755
--- a/unix/aclocal.m4
+++ b/unix/aclocal.m4
@@ -2,7 +2,7 @@
# Include the TEA standard macro set
#
-builtin(include,tclconfig/tcl.m4)
+builtin(include,../tclconfig/tcl.m4)
#
# Add here whatever m4 macros you want to define for your package
diff --git a/unix/configure b/unix/configure
index 82d5c6f..c1c3467 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1813,7 +1813,7 @@ $as_echo "$as_me: configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" >&6;}
ac_aux_dir=
-for ac_dir in tclconfig "$srcdir"/tclconfig; do
+for ac_dir in ../tclconfig "$srcdir"/../tclconfig; do
if test -f "$ac_dir/install-sh"; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1829,7 +1829,7 @@ for ac_dir in tclconfig "$srcdir"/tclconfig; do
fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in tclconfig \"$srcdir\"/tclconfig" "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../tclconfig \"$srcdir\"/../tclconfig" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
diff --git a/unix/configure.in b/unix/configure.in
index 1f6778b..c2978ef 100755
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -29,7 +29,7 @@ AC_INIT([saods9], [7.6])
TEA_INIT([3.9])
-AC_CONFIG_AUX_DIR(tclconfig)
+AC_CONFIG_AUX_DIR(../tclconfig)
#--------------------------------------------------------------------