diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2003-01-10 23:19:01 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2003-01-10 23:19:01 +0000 |
| commit | a351b2d847103d3117bc0b6e8d56358be1dba644 (patch) | |
| tree | 27f1a6ace8142ef57f2b6f07dbeef86165100e59 /src | |
| parent | 1f55e6f6211626f3c3dd099dc2a33d9eb4da146b (diff) | |
| download | krb5-a351b2d847103d3117bc0b6e8d56358be1dba644.zip krb5-a351b2d847103d3117bc0b6e8d56358be1dba644.tar.gz krb5-a351b2d847103d3117bc0b6e8d56358be1dba644.tar.bz2 | |
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')
29 files changed, 48 insertions, 73 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fc80ca9..3a579de 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 5d95b04..33ebc18 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 98d3293..30c0a89 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 237ba81..89765b8 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 2f57e94..1ffdac7 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 441beac..2f618cb 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 a3b8b02..ac4ca66 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 a2557cc..91bc5f7 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 14b90b7..8fa462d 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 e0afb9d..d057715 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 dc6e68a..8852f05 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 6e11b93..d663d7f 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 a83ddd3..8a00e26 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 95f7a01..68fa8f5 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 51cfded..dc002d8 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 a41da02..ae2f0ba 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 0512949..b14287c 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 70d36ef..f1d3dde 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 666a819..53f6261 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 13d6168..4b8e7ca 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 6bdacc2..1ac7610 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 56b4a94..acac38e 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 6d07853..6fe6039 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 82b5583..2810fd0 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 036f55f..ce81854 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 8fb2d14..f76ada5 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 b8ab0b8..2fafd0c 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 97a6e92..1fca12b 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 03cb55d..c74d091 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 |