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

29 files changed, 48 insertions, 73 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fc80ca90c..3a579def4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Require
+	AC_PROG_ARCHIVE, AC_PROG_ARCHIVE_ADD, and AC_PROG_INSTALL.
+	(KRB5_BUILD_LIBRARY): Use KRB5_BUILD_LIBRARY_WITH_DEPS instead of
+	duplicating its contents.
+	* configure.in: Don't explicitly invoke AC_PROG_INSTALL,
+	AC_PROG_ARCHIVE, AC_PROG_ARCHIVE_ADD, AC_PROG_RANLIB.
+
 	* aclocal.m4 (CONFIG_RULES): Substitute files for @lib_frag@ and
 	@libobj_frag@ markers.
 	(V5_SET_TOPDIR): Don't define krb5_append_frags.
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 5d95b04f1..33ebc1832 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)
diff --git a/src/configure.in b/src/configure.in
index 98d3293f8..30c0a890b 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -47,10 +47,6 @@ dnl
 dnl Begin autoconf tests for the Makefiles generated out of the top-level
 dnl configure.in...
 dnl
-AC_PROG_INSTALL
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
 AC_CHECK_FUNCS(memmove)
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 237ba8103..89765b8a8 100644
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,5 +1,7 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_INSTALL.
+
 	* Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
 
 2002-12-06  Tom Yu  <tlyu@mit.edu>
diff --git a/src/krb524/configure.in b/src/krb524/configure.in
index 2f57e94a4..1ffdac7d7 100644
--- a/src/krb524/configure.in
+++ b/src/krb524/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(krb524d.c)
 CONFIG_RULES
-AC_PROG_INSTALL
 KRB5_BUILD_LIBRARY_STATIC
 KRB5_BUILD_LIBOBJS
 AC_PROG_AWK
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 441beacd8..2f618cb8a 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_ARCHIVE,
+	AC_PROG_ARCHIVE_ADD, AC_PROG_RANLIB, AC_PROG_INSTALL.
+
 	* configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
 	K5_GEN_MAKEFILE and K5_AC_OUTPUT.
 
diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
index a3b8b02bc..ac4ca667e 100644
--- a/src/lib/crypto/configure.in
+++ b/src/lib/crypto/configure.in
@@ -1,9 +1,5 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
-AC_PROG_INSTALL
 
 AC_CHECK_HEADERS(memory.h unistd.h)
 
diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index a2557cc42..91bc5f7d3 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_INSTALL, or check
+	for #pragma weak.
+
 	* Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
 
 2002-10-10  Sam Hartman  <hartmans@mit.edu>
diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
index 14b90b7ee..8fa462d14 100644
--- a/src/lib/des425/configure.in
+++ b/src/lib/des425/configure.in
@@ -1,23 +1,9 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-AC_PROG_INSTALL
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 dnl
-AC_MSG_CHECKING([if pragma weak supported])
-AC_CACHE_VAL(krb5_cv_pragma_weak,
-[AC_TRY_LINK(
-[#pragma weak testit = __testit
-int __testit = 1;],
-[extern int testit;
-exit(testit);],
-krb5_cv_pragma_weak=yes, krb5_cv_pragma_weak=no)])
-AC_MSG_RESULT($krb5_cv_pragma_weak)
-if test $krb5_cv_pragma_weak = yes; then
-AC_DEFINE(HAVE_PRAGMA_WEAK)
-fi
-dnl
 KRB5_RUN_FLAGS
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY_WITH_DEPS
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index e0afb9dd8..d0577155e 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_ARCHIVE,
+	AC_PROG_ARCHIVE_ADD, AC_PROG_INSTALL, AC_PROG_RANLIB.
+
 	* configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
 	K5_GEN_MAKEFILE and K5_AC_OUTPUT.
 
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index dc6e68a0f..8852f0579 100644
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -1,12 +1,6 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-dnl AC_CONFIG_SUBDIRS(generic krb5)
-dnl AC_CONFIG_SUBDIRS(generic krb5 mechglue)
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
 AC_PROG_AWK
-AC_PROG_INSTALL
-AC_PROG_RANLIB
 AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h memory.h)
 AC_TYPE_SIZE_T
 AC_CHECK_SIZEOF(short)
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 6e11b937d..d663d7f9b 100644
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_ARCHIVE,
+	AC_PROG_ARCHIVE_ADD, AC_PROG_RANLIB, AC_PROG_INSTALL.
+
 	* configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
 	K5_GEN_MAKEFILE and K5_AC_OUTPUT.
 
diff --git a/src/lib/kadm5/configure.in b/src/lib/kadm5/configure.in
index a83ddd3b6..8a00e266b 100644
--- a/src/lib/kadm5/configure.in
+++ b/src/lib/kadm5/configure.in
@@ -1,9 +1,5 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
-AC_PROG_INSTALL
 AC_PROG_LEX
 AC_PROG_AWK
 AC_CHECK_HEADERS(syslog.h memory.h)
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 95f7a01b6..68fa8f58f 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_ARCHIVE,
+	AC_PROG_ARCHIVE_ADD, AC_PROG_RANLIB, AC_PROG_INSTALL.
+
 	* Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
 
 2002-12-23  Ezra Peisach  <epeisach@bu.edu>
diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
index 51cfded5b..dc002d878 100644
--- a/src/lib/kdb/configure.in
+++ b/src/lib/kdb/configure.in
@@ -1,9 +1,5 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
-AC_PROG_INSTALL
 AC_CHECK_HEADERS(unistd.h)
 AC_TYPE_MODE_T
 AC_TYPE_OFF_T
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index a41da02bf..ae2f0ba66 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_ARCHIVE,
+	AC_PROG_ARCHIVE_ADD, AC_PROG_RANLIB, AC_PROG_INSTALL.
+
 	* Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
 
 2003-01-05  Sam Hartman  <hartmans@mit.edu>
diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in
index 0512949a5..b14287cb5 100644
--- a/src/lib/krb4/configure.in
+++ b/src/lib/krb4/configure.in
@@ -1,9 +1,5 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
-AC_PROG_INSTALL
 AC_C_CONST
 AC_CHECK_HEADERS(sys/select.h time.h unistd.h)
 dnl Could check for full stdc environment, but will only test
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 70d36ef84..f1d3ddea3 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,5 +1,7 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_INSTALL.
+
 	* configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
 	K5_GEN_MAKEFILE and K5_AC_OUTPUT.
 
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 666a8194f..53f626124 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-AC_PROG_INSTALL
 AC_PROG_AWK
 dnl
 AC_C_CONST
diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index 13d61681e..4b8e7ca64 100644
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_ARCHIVE,
+	AC_PROG_ARCHIVE_ADD, AC_PROG_RANLIB, AC_PROG_INSTALL.
+
 	* configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
 	K5_GEN_MAKEFILE and K5_AC_OUTPUT.
 
diff --git a/src/lib/rpc/configure.in b/src/lib/rpc/configure.in
index 6bdacc2a8..1ac761036 100644
--- a/src/lib/rpc/configure.in
+++ b/src/lib/rpc/configure.in
@@ -1,10 +1,6 @@
 AC_INIT(auth_gssapi.c)
 CONFIG_RULES
 AC_CONFIG_SUBDIRS(unit-test)
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
-AC_PROG_INSTALL
 AC_CHECK_HEADERS(sys/uio.h)
 AC_TYPE_GETGROUPS
 dnl Arrange for types.hin to include stdlib.h
diff --git a/src/util/db2/ChangeLog b/src/util/db2/ChangeLog
index 56b4a9432..acac38ef1 100644
--- a/src/util/db2/ChangeLog
+++ b/src/util/db2/ChangeLog
@@ -1,5 +1,7 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_INSTALL.
+
 	* configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of
 	K5_GEN_MAKEFILE and K5_AC_OUTPUT.
 
diff --git a/src/util/db2/configure.in b/src/util/db2/configure.in
index 6d0785375..6fe60397a 100644
--- a/src/util/db2/configure.in
+++ b/src/util/db2/configure.in
@@ -3,7 +3,6 @@ AC_INIT(db/db.c)
 AC_CONFIG_HEADER(include/config.h include/db-config.h)
 CONFIG_RULES
 
-AC_PROG_INSTALL
 AC_PATH_PROG(FALSE,false,:)
 AC_PATH_PROG(SH,sh,$FALSE)
 AC_PATH_PROG(SH5,sh5,$FALSE)
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 82b5583fa..2810fd039 100644
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_INSTALL,
+	AC_PROG_ARCHIVE, AC_PROG_RANLIB.
+
 	* Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
 
 2002-12-12  Tom Yu  <tlyu@mit.edu>
diff --git a/src/util/et/configure.in b/src/util/et/configure.in
index 036f55f88..ce8185495 100644
--- a/src/util/et/configure.in
+++ b/src/util/et/configure.in
@@ -4,9 +4,6 @@ AC_C_CONST
 AC_PROG_LEX
 AC_PROG_YACC
 AC_PROG_AWK
-AC_PROG_INSTALL
-AC_PROG_ARCHIVE
-AC_PROG_RANLIB
 HAVE_YYLINENO
 DECLARE_SYS_ERRLIST
 dnl
diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index 8fb2d14d9..f76ada5bb 100644
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_INSTALL,
+	AC_PROG_ARCHIVE, AC_PROG_RANLIB.
+
 	* Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
 
 2002-12-06  Ezra Peisach  <epeisach@bu.edu>
diff --git a/src/util/pty/configure.in b/src/util/pty/configure.in
index b8ab0b876..2fafd0cb9 100644
--- a/src/util/pty/configure.in
+++ b/src/util/pty/configure.in
@@ -1,10 +1,6 @@
 AC_INIT(getpty.c)
 CONFIG_RULES
 AC_PROG_AWK
-dnl LinkFileDir([$](TOPLIBD)/libpty.a,libpty.a,../util/pty)
-AC_PROG_INSTALL
-AC_PROG_ARCHIVE
-AC_PROG_RANLIB
 AC_CHECK_FUNCS(fchmod fchown revoke vhangup killpg _getpty)
 dnl
 LOGINLIBS=
diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 97a6e9217..1fca12bc4 100644
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,5 +1,8 @@
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
+	* configure.in: Don't explicitly invoke AC_PROG_INSTALL, and
+	certainly not twice.
+
 	* Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
 
 2003-01-05  Sam Hartman  <hartmans@mit.edu>
diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in
index 03cb55d71..c74d091a2 100644
--- a/src/util/ss/configure.in
+++ b/src/util/ss/configure.in
@@ -1,10 +1,8 @@
 AC_INIT(ct.y)
 CONFIG_RULES
-AC_PROG_INSTALL
 AC_PROG_LEX
 AC_PROG_YACC
 AC_PROG_AWK
-AC_PROG_INSTALL
 HAVE_YYLINENO
 AC_CHECK_FUNCS(strdup)
 CHECK_DIRENT