diff options
author | Tom Yu <tlyu@mit.edu> | 1994-06-27 17:00:12 +0000 |
---|---|---|
committer | Tom Yu <tlyu@mit.edu> | 1994-06-27 17:00:12 +0000 |
commit | 12bb0842fafb0d25e54cdfd4ee9832240a753a11 (patch) | |
tree | 4ab90ddae49cff55f870e1ed51f99eba345f248a | |
parent | 66175116ebea42a81776c80d75ec1332f5fdd570 (diff) | |
download | krb5-12bb0842fafb0d25e54cdfd4ee9832240a753a11.zip krb5-12bb0842fafb0d25e54cdfd4ee9832240a753a11.tar.gz krb5-12bb0842fafb0d25e54cdfd4ee9832240a753a11.tar.bz2 |
* configure.in (in all relevant subdirs): move invokations of
CONFIG_RULES around so that they preceed anything that even
vaguely resembles a compile test. This is so that $CC will get
set properly before any compile tests run.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3918 dc483132-0cff-0310-8789-dd5450dbe970
36 files changed, 42 insertions, 35 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7b11895..457f0ec 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +Mon Jun 27 08:21:42 1994 Tom Yu (tlyu at dragons-lair) + + * configure.in (in all relevant subdirs): move invokations of + CONFIG_RULES around so that they preceed anything that even + vaguely resembles a compile test. This is so that $CC will get + set properly before any compile tests run. + Sat Jun 25 00:33:56 1994 Tom Yu (tlyu at dragons-lair) * Makefile.in (in all relevant subdirs): make install will dtrt diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in index 54eb2f3..fe63cb0 100644 --- a/src/admin/aname/configure.in +++ b/src/admin/aname/configure.in @@ -1,9 +1,9 @@ AC_INIT(kdb5_anadd.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in index f1c9dfe..4d5f224 100644 --- a/src/admin/convert/configure.in +++ b/src/admin/convert/configure.in @@ -1,9 +1,9 @@ AC_INIT(kdb5_convert.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB4 diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in index dd91e3b..7498ab5 100644 --- a/src/admin/create/configure.in +++ b/src/admin/create/configure.in @@ -1,10 +1,10 @@ AC_INIT(kdb5_create.c) WITH_CCOPTS +CONFIG_RULES WITH_KRB5ROOT AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in index 14fb7ea..340d34d 100644 --- a/src/admin/destroy/configure.in +++ b/src/admin/destroy/configure.in @@ -1,9 +1,9 @@ AC_INIT(kdb5_destroy.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in index 310cad5..c365f62 100644 --- a/src/admin/edit/configure.in +++ b/src/admin/edit/configure.in @@ -1,11 +1,11 @@ AC_INIT(kdb5_edit.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_FUNCS(getcwd) SS_RULES -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in index f7d1444..df58c1c 100644 --- a/src/admin/stash/configure.in +++ b/src/admin/stash/configure.in @@ -1,9 +1,9 @@ AC_INIT(kdb5_stash.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in index 4632b9f..0e5d57b 100644 --- a/src/appl/sample/sclient/configure.in +++ b/src/appl/sample/sclient/configure.in @@ -1,9 +1,9 @@ AC_INIT(sclient.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in index 348a4ae..f731317 100644 --- a/src/appl/sample/sserver/configure.in +++ b/src/appl/sample/sserver/configure.in @@ -1,9 +1,9 @@ AC_INIT(sserver.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in index b8f092e..24ad5c5 100644 --- a/src/appl/simple/client/configure.in +++ b/src/appl/simple/client/configure.in @@ -1,9 +1,9 @@ AC_INIT(sim_client.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in index 4f25a39..3187c0c 100644 --- a/src/appl/simple/server/configure.in +++ b/src/appl/simple/server/configure.in @@ -1,9 +1,9 @@ AC_INIT(sim_server.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in index be031d5..3a30401 100644 --- a/src/appl/user_user/configure.in +++ b/src/appl/user_user/configure.in @@ -1,9 +1,9 @@ AC_INIT(client.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in index 8b251da..1738c11 100644 --- a/src/clients/kinit/configure.in +++ b/src/clients/kinit/configure.in @@ -1,9 +1,9 @@ AC_INIT(kinit.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/configure.in b/src/configure.in index 783b9ad..1c45d87 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1,10 +1,10 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP WITH_KRB5ROOT CONFIG_DIRS(util include isode lib kdc admin kadmin slave clients appl) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) -CONFIG_RULES AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in index 9b49049..3d70dc9 100644 --- a/src/include/krb5/configure.in +++ b/src/include/krb5/configure.in @@ -1,5 +1,6 @@ AC_INIT(acconfig.h) AC_SET_BUILDTOP +CONFIG_RULES AC_CONFIG_HEADER(autoconf.h) AC_PROG_LEX HAVE_YYLINENO @@ -73,7 +74,6 @@ AC_HAVE_LIBRARY(-lndbm) AC_HAVE_LIBRARY(-ldbm) AC_FUNC_CHECK([dbm_open], , AC_DEFINE(ODBM)) -CONFIG_RULES WITH_CCOPTS WITH_KRB5ROOT AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/kadmin/client/configure.in b/src/kadmin/client/configure.in index 68639b0..6d8e49d 100644 --- a/src/kadmin/client/configure.in +++ b/src/kadmin/client/configure.in @@ -1,10 +1,10 @@ AC_INIT(kadmin.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) ET_RULES -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/kadmin/kpasswd/configure.in b/src/kadmin/kpasswd/configure.in index 9a23ca9..ce2662c 100644 --- a/src/kadmin/kpasswd/configure.in +++ b/src/kadmin/kpasswd/configure.in @@ -1,10 +1,10 @@ AC_INIT(kpasswd.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) ET_RULES -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/kdc/configure.in b/src/kdc/configure.in index 932164b..1797cd0 100644 --- a/src/kdc/configure.in +++ b/src/kdc/configure.in @@ -1,10 +1,10 @@ AC_INIT(main.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) ET_RULES -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB4 diff --git a/src/lib/configure.in b/src/lib/configure.in index 751be0f..953bc74 100644 --- a/src/lib/configure.in +++ b/src/lib/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP CONFIG_DIRS(krb5 kdb des425 krb425 crypto gssapi) AC_PROG_ARCHIVE @@ -12,6 +13,5 @@ LinkFile(libcrypto.a, crypto/libcrypto.a) LinkFile(libgssapi_krb5.a, gssapi/libgssapi_krb5.a) AppendRule([all:: libkrb5.a libcrypto.a]) AppendRule([all:: libgssapi_krb5.a]) -CONFIG_RULES WITH_KRB5ROOT AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in index c6e7a10..63abac7 100644 --- a/src/lib/crypto/configure.in +++ b/src/lib/crypto/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP CONFIG_DIRS(des crc32 md4 md5 os) AC_PROG_ARCHIVE @@ -9,6 +10,5 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) AppendRule([all:: libcrypto.a]) KRB_INCLUDE -CONFIG_RULES WITH_KRB5ROOT AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in index 02bf6d2..f3652fc 100644 --- a/src/lib/des425/configure.in +++ b/src/lib/des425/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD @@ -7,5 +8,4 @@ AC_PROG_RANLIB AppendRule([all:: libdes425.a]) KRB_INCLUDE WITH_KRB5ROOT -CONFIG_RULES AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in index cc6a887..11da049 100644 --- a/src/lib/gssapi/configure.in +++ b/src/lib/gssapi/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) AC_SET_BUILDTOP +CONFIG_RULES CONFIG_DIRS(generic krb5) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD @@ -8,6 +9,5 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) AppendRule([all:: libgssapi_krb5.a]) WITH_CCOPTS -CONFIG_RULES WITH_KRB5ROOT AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in index 9d4dd80..c8b2873 100644 --- a/src/lib/gssapi/generic/configure.in +++ b/src/lib/gssapi/generic/configure.in @@ -1,8 +1,8 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP ET_RULES -CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE AC_SIZE_T diff --git a/src/lib/gssapi/krb5/configure.in b/src/lib/gssapi/krb5/configure.in index de1d309..812fd46 100644 --- a/src/lib/gssapi/krb5/configure.in +++ b/src/lib/gssapi/krb5/configure.in @@ -1,8 +1,8 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP ET_RULES -CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in index 767fce2..5ddc2b1 100644 --- a/src/lib/kdb/configure.in +++ b/src/lib/kdb/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD @@ -7,5 +8,4 @@ AC_PROG_RANLIB AppendRule([all:: libkdb5.a]) KRB_INCLUDE WITH_KRB5ROOT -CONFIG_RULES AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/lib/krb425/configure.in b/src/lib/krb425/configure.in index 31dd363..aa8b159 100644 --- a/src/lib/krb425/configure.in +++ b/src/lib/krb425/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP ET_RULES AC_PROG_ARCHIVE @@ -9,6 +10,5 @@ AppendRule([all:: libkrb425.a]) KRB_INCLUDE WITH_KRB5ROOT ISODE_INCLUDE -CONFIG_RULES CopyHeader(krb_err.h,[$(EHDRDIR)]) AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in index a262607..efeec85 100644 --- a/src/lib/krb5/asn.1/configure.in +++ b/src/lib/krb5/asn.1/configure.in @@ -1,8 +1,8 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP UsePepsy -CONFIG_RULES SubdirLibraryRule([${OBJS}]) CopyHeader(KRB5-types.h,[$(EHDRDIR)]) CopyHeader(KRB5_defs.h,[$(EHDRDIR)]) diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in index 7b11d21..acfa4f3 100644 --- a/src/lib/krb5/ccache/configure.in +++ b/src/lib/krb5/ccache/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP CONFIG_DIRS(file stdio) AC_PROG_ARCHIVE @@ -7,7 +8,6 @@ AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) -CONFIG_RULES SubdirLibraryRule([$(OBJS)]) KRB_INCLUDE AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in index 2d8b9ff..e5e96b3 100644 --- a/src/lib/krb5/configure.in +++ b/src/lib/krb5/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) AC_SET_BUILDTOP +CONFIG_RULES CONFIG_DIRS(error_tables asn.1 ccache keytab krb rcache free os posix) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD @@ -8,6 +9,5 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) AppendRule([all:: libkrb5.a]) WITH_CCOPTS -CONFIG_RULES WITH_KRB5ROOT AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in index e5b70ee..639300f 100644 --- a/src/lib/krb5/error_tables/configure.in +++ b/src/lib/krb5/error_tables/configure.in @@ -1,9 +1,9 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP ET_RULES SS_RULES -CONFIG_RULES KRB_INCLUDE SubdirLibraryRule([${OBJS}]) CopyHeader(isode_err.h,[$(EHDRDIR)]) diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in index 5110ac4..5eff23e 100644 --- a/src/lib/krb5/keytab/configure.in +++ b/src/lib/krb5/keytab/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP CONFIG_DIRS(file) AC_PROG_ARCHIVE @@ -7,7 +8,6 @@ AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) -CONFIG_RULES SubdirLibraryRule([$(OBJS)]) KRB_INCLUDE AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in index 12196b3..f404655 100644 --- a/src/lib/krb5/krb/configure.in +++ b/src/lib/krb5/krb/configure.in @@ -1,10 +1,10 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB -CONFIG_RULES SubdirLibraryRule([$(OBJS)]) KRB_INCLUDE ISODE_INCLUDE diff --git a/src/slave/configure.in b/src/slave/configure.in index c318289..2938d3e 100644 --- a/src/slave/configure.in +++ b/src/slave/configure.in @@ -1,10 +1,10 @@ AC_INIT(kprop.c) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(util) -CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT diff --git a/src/util/configure.in b/src/util/configure.in index ec5e4d8..e149a00 100644 --- a/src/util/configure.in +++ b/src/util/configure.in @@ -1,8 +1,8 @@ AC_INIT(configure.in) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP CONFIG_DIRS(unifdef et ss) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) -CONFIG_RULES AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/util/et/configure.in b/src/util/et/configure.in index 4082e77..0935112 100644 --- a/src/util/et/configure.in +++ b/src/util/et/configure.in @@ -1,12 +1,12 @@ AC_INIT(error_table.y) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_PROG_LEX AC_PROG_ARCHIVE AC_PROG_RANLIB HAVE_YYLINENO DECLARE_SYS_ERRLIST -CONFIG_RULES CHECK_STDARG CopySrcHeader(com_err.h,$(BUILDTOP)/include) AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in index f07f3d3..aa37473 100644 --- a/src/util/ss/configure.in +++ b/src/util/ss/configure.in @@ -1,12 +1,12 @@ AC_INIT(ct.y) WITH_CCOPTS +CONFIG_RULES AC_SET_BUILDTOP AC_PROG_LEX AC_PROG_ARCHIVE AC_PROG_RANLIB HAVE_YYLINENO AC_FUNC_CHECK(strdup,AC_DEFINE(HAS_STRDUP)) -CONFIG_RULES ET_RULES SS_RULES CHECK_DIRENT |