move aclocal checks into right place

dellelce · Nov 6, 2018 · aa4393b · aa4393b
1 parent 0ea847f
commit aa4393b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/mkit.build.sh b/mkit.build.sh
@@ -55,6 +55,13 @@ build_sanity_gnuconf()
  {
   typeset cwd="$PWD"
   cd "$1"
+
+  # Allow mixing aclocals......
+  [ -d "/usr/share/aclocal" ] &&
+  {
+    export ACLOCAL_PATH="/usr/share/aclocal:${prefix}/share/aclocal"
+  }
+
   autoreconf -vif >/dev/null 2>&1; ar_rc=$?
   cd "$cwd"
   [ $ar_rc -ne 0 ] && { echo "autoreconf failed with rc = $ar_rc"; return $ar_rc; }

diff --git a/modules/build/autoconf.sh b/modules/build/autoconf.sh
@@ -2,16 +2,6 @@
 #
 build_autoconf()
 {
- typeset rc=0
- # include pre-existing aclocal path if any
- type aclocal >/dev/null 2>&1
- rc=$?
-
- [ "$rc" -eq 0 ]  &&
- {
-   export ACLOCAL_PATH="${prefix}/share/aclocal:$(aclocal --print-ac-dir)"
- }
-
  build_gnuconf autoconf $srcdir_autoconf
  return $?
 }