summaryrefslogtreecommitdiffstats
path: root/src/aclocal.m4
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2003-01-10 23:19:01 +0000
committerKen Raeburn <raeburn@mit.edu>2003-01-10 23:19:01 +0000
commita351b2d847103d3117bc0b6e8d56358be1dba644 (patch)
tree27f1a6ace8142ef57f2b6f07dbeef86165100e59 /src/aclocal.m4
parent1f55e6f6211626f3c3dd099dc2a33d9eb4da146b (diff)
downloadkrb5-a351b2d847103d3117bc0b6e8d56358be1dba644.tar.gz
krb5-a351b2d847103d3117bc0b6e8d56358be1dba644.tar.xz
krb5-a351b2d847103d3117bc0b6e8d56358be1dba644.zip
Search for ar, ranlib, install in KRB5_BUILD_LIBRARY* macros rather than
explicitly in directories using those macros. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15111 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/aclocal.m4')
-rw-r--r--src/aclocal.m422
1 files changed, 5 insertions, 17 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 5d95b04f14..33ebc1832c 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -997,24 +997,9 @@ dnl
dnl Pull in the necessary stuff to create the libraries.
AC_DEFUN(KRB5_BUILD_LIBRARY,
-[AC_REQUIRE([KRB5_LIB_AUX])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-AC_CHECK_PROG(AR, ar, ar, false)
+[KRB5_BUILD_LIBRARY_WITH_DEPS
# null out SHLIB_EXPFLAGS because we lack any dependencies
-SHLIB_EXPFLAGS=
-AC_SUBST(LIBLIST)
-AC_SUBST(LIBLINKS)
-AC_SUBST(LDCOMBINE)
-AC_SUBST(LDCOMBINE_TAIL)
-AC_SUBST(SHLIB_EXPFLAGS)
-AC_SUBST(INSTALL_SHLIB)
-AC_SUBST(STLIBEXT)
-AC_SUBST(SHLIBEXT)
-AC_SUBST(SHLIBVEXT)
-AC_SUBST(SHLIBSEXT)
-AC_SUBST(PFLIBEXT)
-AC_SUBST(LIBINSTLIST)])
+SHLIB_EXPFLAGS=])
dnl
dnl KRB5_BUILD_LIBRARY_STATIC
@@ -1042,6 +1027,9 @@ AC_DEFUN(KRB5_BUILD_LIBRARY_WITH_DEPS,
[AC_REQUIRE([KRB5_LIB_AUX])dnl
AC_REQUIRE([AC_PROG_LN_S])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl
+AC_REQUIRE([AC_PROG_ARCHIVE])dnl
+AC_REQUIRE([AC_PROG_ARCHIVE_ADD])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
AC_CHECK_PROG(AR, ar, ar, false)
AC_SUBST(LIBLIST)
AC_SUBST(LIBLINKS)