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

diff --git a/src/ChangeLog b/src/ChangeLog
index fc80ca90c5fcdd7d8327fbe367c01ac968b93ccc..3a579def48f2caacad7c17543157828c8054ff51 100644 (file)
--- 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 5d95b04f145d562ba393eb9eb2ca05e9df43f693..33ebc1832c4ac087c58d6b5c7930b3e6dc37c074 100644 (file)
--- 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 98d3293f87ac6a23734e6b1105fdc770c93c07a9..30c0a890be2ba7238cf9223e4bad6efebd39e84c 100644 (file)
--- 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 237ba8103b5db1188deecc1d15ac9a4ede4e6fc7..89765b8a8b93ebabf0bc64034018f20d1b3ccd5c 100644 (file)
--- 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 2f57e94a4dc95cde528cac62cf230038a39e823f..1ffdac7d76f6bab44abade13f4e61a3401c537a2 100644 (file)
--- 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 441beacd8275d0255d8be0ac529fdd90ffd3e653..2f618cb8a19fbf83dbc38788da33b7c0fbef3fe8 100644 (file)
--- 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 a3b8b02bc62eb9ef78e85e643ebaa80b69c98942..ac4ca667ef80aaed478a938e514b62c0556f3f27 100644 (file)
--- 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 a2557cc42d49b51174288d88b7ea88b179e21a24..91bc5f7d34cc3360e2ac5405ee2add0bf882f121 100644 (file)
--- 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 14b90b7eef325ed9ebeca1c6abf025744f3867fe..8fa462d1475808b19bcd4ae22b8e8ea87ccb0730 100644 (file)
--- 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 e0afb9dd8c5f5de5f50008052171d82d2a7cacef..d0577155ef4a9bcf5c3f77409f4f8608359f87c3 100644 (file)
--- 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 dc6e68a0f9f2e622bb50b340eff9367264e3199b..8852f05791b5274d4cb075226c78537d423cd600 100644 (file)
--- 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 6e11b937d429768520066436e9d3b773d928c9c5..d663d7f9bf5cf405c1f9274164224b7309db873d 100644 (file)
--- 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 a83ddd3b6cfb1817bce98fbaa323de62a30105c5..8a00e266b06563d1c309448f4d02153e83e87686 100644 (file)
--- 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 95f7a01b6c55f7dc87b7ec4aae467dd84dba6f30..68fa8f58f06678bbf999c5066bcdf0f949396171 100644 (file)
--- 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 51cfded5b5b9d09d57a24c4aeba7542b0a28d550..dc002d878a123210e753829f12ffb8c4d5110d69 100644 (file)
--- 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 a41da02bf3624c2a729740af2adda7bdbd869b13..ae2f0ba66af8e60add0f0ce11b647e8c19f7274d 100644 (file)
--- 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 0512949a53f29415f59ce5263f8e18b57028f775..b14287cb5e1b3d798c2798676fcba8044ec7bd9a 100644 (file)
--- 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 70d36ef840536b5b71cff27db5d742d8893fdab8..f1d3ddea3ffece72c402b7008731ea0288c2f373 100644 (file)
--- 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 666a8194f5549938757d28f590ac6f158ed08eb1..53f626124389fae4cc11b35eb586daa1b0ee161c 100644 (file)
--- 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 13d61681e292d02ccc312e5963df007348e757d2..4b8e7ca645ad8fd0562d7c567dd5657dacbd9344 100644 (file)
--- 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 6bdacc2a87d8a485deaa5ee5008f1b5aed6c8d3b..1ac761036ab3c3e81e0dbfa9889e00dda463f25b 100644 (file)
--- 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 56b4a94325e2082f947650becb9f97ddfac5d680..acac38ef1967c7ecd5f3822d1adb7ea2b89ce46f 100644 (file)
--- 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 6d07853755920af42999a56d9f4beb3b5a6f9922..6fe60397a76baf5e4a24a4e7130c6674426b38f3 100644 (file)
--- 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 82b5583fa48f95e701ea7f65807a415023058653..2810fd03954cb1748378fd9048565740e0019933 100644 (file)
--- 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 036f55f88acf3d14cea1b0e7153636ff4f287d3a..ce8185495ae582bfbdabcb2144a4da0304869478 100644 (file)
--- 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 8fb2d14d9b969ba89662d58d9675e4f3321f769b..f76ada5bb544ce74fa27e59ac665b1ac00badb7f 100644 (file)
--- 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 b8ab0b876c1b41d1f76ddc1fda964f09534706ff..2fafd0cb94367da33b71acdc204c663173efd25c 100644 (file)
--- 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 97a6e9217bdaf892efc2fb68cec4574fa1eac6d7..1fca12bc4f706ca6b952ec873f4485b2f281545a 100644 (file)
--- 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 03cb55d7182c6ba27c354b1649386fb9088f02b0..c74d091a24503c7654238602b5150d6e1d20c8ab 100644 (file)
--- 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