From d56772873c60ce2d9af8c4e6f5e6cdeed5a54548 Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 4 Jan 2017 13:05:09 -0500 Subject: centralize tclconfig --- unix/aclocal.m4 | 2 +- unix/configure | 4 ++-- unix/configure.in | 2 +- 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) #-------------------------------------------------------------------- -- cgit v0.12