diff options
| author | Tom Yu <tlyu@mit.edu> | 1994-06-17 07:22:12 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1994-06-17 07:22:12 +0000 |
| commit | 32c8adaeaf9639dc536a718d9fa8551ac6af9753 (patch) | |
| tree | 43f171558b1b3e3779e33b6e26603b3e0b1b560b /src | |
| parent | 1255123721a9ead5eda5d0628b5d2bb8c31b5dec (diff) | |
| download | krb5-32c8adaeaf9639dc536a718d9fa8551ac6af9753.tar.gz krb5-32c8adaeaf9639dc536a718d9fa8551ac6af9753.tar.xz krb5-32c8adaeaf9639dc536a718d9fa8551ac6af9753.zip | |
support to calculate BUILDTOP in makeaclocals
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3861 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
129 files changed, 155 insertions, 65 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index ecd483bf5..9cecae8ff 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/aclocal.m4 b/src/aclocal.m4 index c3816e9c5..fb202c105 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -26,11 +26,20 @@ define(AC__CONFIG_AUX,[ AC_PROVIDE([$0])dnl ])dnl dnl +dnl set up buildtop stuff +dnl +define(AC_BUILDTOP,[.])dnl +define(AC_SET_BUILDTOP, +[BUILDTOP=AC_BUILDTOP +AC_SUBST(BUILDTOP)dnl +])dnl +dnl +dnl dnl Does configure need to be run in immediate subdirectories of this dnl directory? dnl define(CONFIG_DIRS,[ -AC_REQUIRE([AC__CONFIG_AUX]) +AC_REQUIRE([AC__CONFIG_AUX])dnl changequote(<<<,>>>)dnl SUBDIRS="$1" if [ -z "${norecursion}" ] ; then @@ -123,8 +132,9 @@ $2::<<< @case '${MFLAGS}' in *[ik]*) set +e ;; esac; \ for i in $(SUBDIRS) ;\ do \ - (cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)/$$i..."; \ - $(MAKE) $(MFLAGS) CURRENT_DIR=$(CURRENT_DIR)/$$i >>>$2<<<); \ + (cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \ + $(MAKE) $(MFLAGS) \ + CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$2<<<); \ done>>> divert(0)dnl changequote([,])dnl diff --git a/src/admin/Makefile.in b/src/admin/Makefile.in index e2d867610..500b5a2a8 100644 --- a/src/admin/Makefile.in +++ b/src/admin/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in index 14e7a1c37..13247906b 100644 --- a/src/admin/convert/configure.in +++ b/src/admin/convert/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdb5_convert.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/admin/create/Makefile.in b/src/admin/create/Makefile.in index 0ebe65c61..53bd1db61 100644 --- a/src/admin/create/Makefile.in +++ b/src/admin/create/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in index d2310e478..cfc272109 100644 --- a/src/admin/create/configure.in +++ b/src/admin/create/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdb5_create.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in index 508ff06b7..0cd4fc4d1 100644 --- a/src/admin/destroy/Makefile.in +++ b/src/admin/destroy/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in index 88f8fb545..3e6da1234 100644 --- a/src/admin/destroy/configure.in +++ b/src/admin/destroy/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdb5_destroy.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in index 8af59ec90..01496e600 100644 --- a/src/admin/edit/Makefile.in +++ b/src/admin/edit/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in index 5b80c3106..954c13acd 100644 --- a/src/admin/edit/configure.in +++ b/src/admin/edit/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdb5_edit.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) SS_RULES diff --git a/src/admin/stash/Makefile.in b/src/admin/stash/Makefile.in index 9ac8c6d3c..391941104 100644 --- a/src/admin/stash/Makefile.in +++ b/src/admin/stash/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in index ee61debce..83dffc46c 100644 --- a/src/admin/stash/configure.in +++ b/src/admin/stash/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdb5_stash.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in index 2cc270244..6fd0859a1 100644 --- a/src/appl/Makefile.in +++ b/src/appl/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/appl/configure.in b/src/appl/configure.in index 78461057c..7cdf8fea5 100644 --- a/src/appl/configure.in +++ b/src/appl/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(sample simple user_user) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in index 2cc270244..6fd0859a1 100644 --- a/src/appl/sample/Makefile.in +++ b/src/appl/sample/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/appl/sample/configure.in b/src/appl/sample/configure.in index 68abe78b9..c1c3fa2b8 100644 --- a/src/appl/sample/configure.in +++ b/src/appl/sample/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(sclient sserver) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in index 5b6449260..d79c362b7 100644 --- a/src/appl/sample/sclient/Makefile.in +++ b/src/appl/sample/sclient/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in index c1db0af46..40a35bff3 100644 --- a/src/appl/sample/sclient/configure.in +++ b/src/appl/sample/sclient/configure.in @@ -1,4 +1,5 @@ AC_INIT(sclient.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in index 59590b606..12ab63547 100644 --- a/src/appl/sample/sserver/Makefile.in +++ b/src/appl/sample/sserver/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in index 600c1098e..03cc40f72 100644 --- a/src/appl/sample/sserver/configure.in +++ b/src/appl/sample/sserver/configure.in @@ -1,4 +1,5 @@ AC_INIT(sserver.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in index 2cc270244..6fd0859a1 100644 --- a/src/appl/simple/Makefile.in +++ b/src/appl/simple/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in index a606349a4..58a64b04c 100644 --- a/src/appl/simple/client/Makefile.in +++ b/src/appl/simple/client/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in index 2bdcf76ae..2b66c22b4 100644 --- a/src/appl/simple/client/configure.in +++ b/src/appl/simple/client/configure.in @@ -1,4 +1,5 @@ AC_INIT(sim_client.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/appl/simple/configure.in b/src/appl/simple/configure.in index 2458e9f87..26a05ce11 100644 --- a/src/appl/simple/configure.in +++ b/src/appl/simple/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(client server) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in index c996df3ea..6d852c882 100644 --- a/src/appl/simple/server/Makefile.in +++ b/src/appl/simple/server/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in index 61ade336d..d71cde86e 100644 --- a/src/appl/simple/server/configure.in +++ b/src/appl/simple/server/configure.in @@ -1,4 +1,5 @@ AC_INIT(sim_server.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/appl/telnet/Makefile.in b/src/appl/telnet/Makefile.in index efe7e891e..4e3d8e059 100644 --- a/src/appl/telnet/Makefile.in +++ b/src/appl/telnet/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ TELNET_OPSYS= @TELNET@ all:: diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in index d84b86095..7fb5a3feb 100644 --- a/src/appl/telnet/configure.in +++ b/src/appl/telnet/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(libtelnet telnet telnetd) CONFIG_RULES AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in index 9d0519958..1f1129b69 100644 --- a/src/appl/telnet/libtelnet/Makefile.in +++ b/src/appl/telnet/libtelnet/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in index 15e2337d5..da7e0b451 100644 --- a/src/appl/telnet/libtelnet/configure.in +++ b/src/appl/telnet/libtelnet/configure.in @@ -1,4 +1,5 @@ AC_INIT(auth.c) +AC_SET_BUILDTOP CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in index 6764c333a..6cf5ce263 100644 --- a/src/appl/user_user/Makefile.in +++ b/src/appl/user_user/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) -DDEBUG LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in index aa5084d87..808ded1bc 100644 --- a/src/appl/user_user/configure.in +++ b/src/appl/user_user/configure.in @@ -1,4 +1,5 @@ AC_INIT(client.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in index 2cc270244..6fd0859a1 100644 --- a/src/clients/Makefile.in +++ b/src/clients/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/clients/configure.in b/src/clients/configure.in index a66530a61..cdd632054 100644 --- a/src/clients/configure.in +++ b/src/clients/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(klist kinit kdestroy) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in index ec8bccba1..9f6eb194c 100644 --- a/src/clients/kdestroy/Makefile.in +++ b/src/clients/kdestroy/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in index 3b43bb629..f168750f7 100644 --- a/src/clients/kdestroy/configure.in +++ b/src/clients/kdestroy/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdestroy.c) +AC_SET_BUILDTOP CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in index ff9b5ed5b..b583384ff 100644 --- a/src/clients/kinit/Makefile.in +++ b/src/clients/kinit/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in index d380cf2a0..0c7514635 100644 --- a/src/clients/kinit/configure.in +++ b/src/clients/kinit/configure.in @@ -1,4 +1,5 @@ AC_INIT(kinit.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in index 36d811081..dd002985a 100644 --- a/src/clients/klist/Makefile.in +++ b/src/clients/klist/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in index 10d47de16..c09d5e4f7 100644 --- a/src/clients/klist/configure.in +++ b/src/clients/klist/configure.in @@ -1,4 +1,5 @@ AC_INIT(klist.c) +AC_SET_BUILDTOP CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE diff --git a/src/configure.in b/src/configure.in index e5eac0c87..d73a8e6cc 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(util include isode lib kdc admin kadmin slave clients appl) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/include/Makefile.in b/src/include/Makefile.in index bbccd9096..7f66f330e 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ # nothing needed here srcdir = @srcdir@ SUBDIRS = @SUBDIRS@ diff --git a/src/include/configure.in b/src/include/configure.in index 3b0a6590a..ecbd36777 100644 --- a/src/include/configure.in +++ b/src/include/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(krb5 kerberosIV) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/include/kerberosIV/Makefile.in b/src/include/kerberosIV/Makefile.in index 81afd824b..f275dce10 100644 --- a/src/include/kerberosIV/Makefile.in +++ b/src/include/kerberosIV/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/include/kerberosIV/configure.in b/src/include/kerberosIV/configure.in index e216b524a..648d3e016 100644 --- a/src/include/kerberosIV/configure.in +++ b/src/include/kerberosIV/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES WITH_KRB5ROOT AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in index 34c4795d5..6d4d20c0a 100644 --- a/src/include/krb5/Makefile.in +++ b/src/include/krb5/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -8,7 +9,6 @@ KRB5ROOT = @KRB5ROOT@ KDB5DIR = $(KRB5ROOT) KRB5SRVTABDIR = /etc -BUILDTOP = ../.. RM = rm -f diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in index 6bbe220fb..862658c03 100644 --- a/src/include/krb5/configure.in +++ b/src/include/krb5/configure.in @@ -1,4 +1,5 @@ AC_INIT(acconfig.h) +AC_SET_BUILDTOP AC_CONFIG_HEADER(autoconf.h) AC_PROG_LEX HAVE_YYLINENO diff --git a/src/isode/Makefile.in b/src/isode/Makefile.in index 47706e8ff..da06aeb5b 100644 --- a/src/isode/Makefile.in +++ b/src/isode/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/isode/compat/Makefile.in b/src/isode/compat/Makefile.in index 7241ca8cf..a76fd57e9 100644 --- a/src/isode/compat/Makefile.in +++ b/src/isode/compat/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ ############################################################################### # Instructions to Make, for compilation of UNIX compatibility library ############################################################################### @@ -5,8 +6,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ -BUILDTOP = ../../ -TOPDIR = $(BUILDTOP) +TOPDIR = $(BUILDTOP)/ OPTIONS = -I. -I$(HDIR) -I$(ISODEINC) $(PEPYPATH) $(KRBOPT) CFLAGS = $(OPTIONS) $(LOPTIONS) @@ -16,7 +16,7 @@ ISODEINCM= $(KRBINC)isode ISODEINC= $(ISODEINCM)/ HDIR = $(TOPDIR)isode/h/ -UTILDIR = $(srcdir)/$(BUILDTOP)isode/util/ +UTILDIR = $(srcdir)/$(TOPDIR)isode/util/ INCDIRM = $(HDIR) INCDIR = $(INCDIRM)/ PEPSYDIRM= $(INCDIR)pepsy diff --git a/src/isode/compat/configure.in b/src/isode/compat/configure.in index 0159192e5..b18ba0dd7 100644 --- a/src/isode/compat/configure.in +++ b/src/isode/compat/configure.in @@ -1,3 +1,4 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_REPLACE_FUNCS(strdup) -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/isode/configure.in b/src/isode/configure.in index 2ef53dd99..d98e89727 100644 --- a/src/isode/configure.in +++ b/src/isode/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(h compat psap pepsy support) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/isode/h/Makefile.in b/src/isode/h/Makefile.in index 92e3b1baa..2390c5e8f 100644 --- a/src/isode/h/Makefile.in +++ b/src/isode/h/Makefile.in @@ -1,11 +1,11 @@ +BUILDTOP=@BUILDTOP@ ############################################################################### # Instructions to Make, for compilation of ISODE header files ############################################################################### srcdir = @srcdir@ VPATH = @srcdir@ -BUILDTOP = ../../ -TOPDIR = $(BUILDTOP) +TOPDIR = $(BUILDTOP)/ OPTIONS = -I. -I$(HDIR) $(PEPYPATH) $(KRBOPT) CFLAGS = $(OPTIONS) $(LOPTIONS) diff --git a/src/isode/h/configure.in b/src/isode/h/configure.in index cdff2db09..1ffff33fd 100644 --- a/src/isode/h/configure.in +++ b/src/isode/h/configure.in @@ -1,2 +1,3 @@ AC_INIT(configure.in) -AC_OUTPUT(Makefile) +AC_SET_BUILDTOP +AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/isode/pepsy/Makefile.in b/src/isode/pepsy/Makefile.in index 2f98140b8..0b7db0f2a 100644 --- a/src/isode/pepsy/Makefile.in +++ b/src/isode/pepsy/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ ############################################################################### # Instructions to Make, for compilation of ISODE PEPSY process ############################################################################### @@ -6,14 +7,13 @@ srcdir = @srcdir@ VPATH = @srcdir@ DEFS = @DEFS@ -BUILDTOP = ../../ -TOPDIR = $(BUILDTOP) +TOPDIR = $(BUILDTOP)/ OPTIONS = -I. -I$(HDIR) -I$(TOPDIR)include $(PEPYPATH) $(KRBOPT) CFLAGS = $(OPTIONS) $(LOPTIONS) $(DEFS) HDIR = $(srcdir)/$(TOPDIR)isode/h/ -UTILDIR = $(srcdir)/$(BUILDTOP)isode/util/ +UTILDIR = $(srcdir)/$(TOPDIR)isode/util/ INCDIRM = $(HDIR) INCDIR = $(INCDIRM)/ PEPSYDIRM= $(INCDIR)pepsy diff --git a/src/isode/pepsy/configure.in b/src/isode/pepsy/configure.in index 3f73b8465..56a3b8c2a 100644 --- a/src/isode/pepsy/configure.in +++ b/src/isode/pepsy/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_PROG_LEX AC_YYTEXT_POINTER HAVE_YYLINENO -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/isode/psap/Makefile.in b/src/isode/psap/Makefile.in index 73c43255f..c13f7564b 100644 --- a/src/isode/psap/Makefile.in +++ b/src/isode/psap/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ ############################################################################### # Instructions to Make, for compilation of ISODE PSAP processes ############################################################################### @@ -5,8 +6,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ -BUILDTOP = ../../ -TOPDIR = $(BUILDTOP) +TOPDIR = $(BUILDTOP)/ LIBDIR = $(TOPDIR)lib/ OPTIONS = -I. -I$(HDIR) -I$(ISODEINC) $(PEPYPATH) $(KRBOPT) @@ -17,7 +17,7 @@ ISODEINCM= $(KRBINC)isode ISODEINC= $(ISODEINCM)/ HDIR = $(TOPDIR)isode/h/ -UTILDIR = $(srcdir)/$(BUILDTOP)isode/util/ +UTILDIR = $(srcdir)/$(TOPDIR)isode/util/ INCDIRM = $(HDIR) INCDIR = $(INCDIRM)/ PEPSYDIRM= $(INCDIR)pepsy diff --git a/src/isode/psap/configure.in b/src/isode/psap/configure.in index c7b4a2bbc..191ca7526 100644 --- a/src/isode/psap/configure.in +++ b/src/isode/psap/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(socket) -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/isode/support/Makefile.in b/src/isode/support/Makefile.in index 807ed167d..6d6df306e 100644 --- a/src/isode/support/Makefile.in +++ b/src/isode/support/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ ############################################################################### # Instructions to Make, for compilation of ISODE support processes ############################################################################### @@ -5,14 +6,13 @@ srcdir = @srcdir@ VPATH = @srcdir@ -BUILDTOP = ../../ -TOPDIR = $(BUILDTOP) +TOPDIR = $(BUILDTOP)/ OPTIONS = -I. -I$(HDIR) $(PEPYPATH) $(KRBOPT) CFLAGS = $(OPTIONS) $(LOPTIONS) HDIR = $(srcdir)/$(TOPDIR)isode/h/ -UTILDIR = $(srcdir)/$(BUILDTOP)isode/util/ +UTILDIR = $(srcdir)/$(TOPDIR)isode/util/ INCDIRM = $(HDIR) INCDIR = $(INCDIRM)/ PEPSYDIRM= $(INCDIR)pepsy diff --git a/src/isode/support/configure.in b/src/isode/support/configure.in index cdff2db09..1ffff33fd 100644 --- a/src/isode/support/configure.in +++ b/src/isode/support/configure.in @@ -1,2 +1,3 @@ AC_INIT(configure.in) -AC_OUTPUT(Makefile) +AC_SET_BUILDTOP +AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in index 66b26e480..2f8305498 100644 --- a/src/kadmin/Makefile.in +++ b/src/kadmin/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/kadmin/client/Makefile.in b/src/kadmin/client/Makefile.in index 3f56b59dc..ea4314579 100644 --- a/src/kadmin/client/Makefile.in +++ b/src/kadmin/client/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/kadmin/client/configure.in b/src/kadmin/client/configure.in index 192775cb0..6c2ff6122 100644 --- a/src/kadmin/client/configure.in +++ b/src/kadmin/client/configure.in @@ -1,4 +1,5 @@ AC_INIT(kadmin.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) ET_RULES diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in index d46e2e505..5b34bf55f 100644 --- a/src/kadmin/configure.in +++ b/src/kadmin/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_WITH([krb4],v4server=v4server,v4server=) CONFIG_DIRS(client kpasswd server $v4server) MAKE_SUBDIRS("making",all) diff --git a/src/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in index fbaaa2acb..750729a50 100644 --- a/src/kadmin/kpasswd/Makefile.in +++ b/src/kadmin/kpasswd/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/kadmin/kpasswd/configure.in b/src/kadmin/kpasswd/configure.in index 169694b38..078be763f 100644 --- a/src/kadmin/kpasswd/configure.in +++ b/src/kadmin/kpasswd/configure.in @@ -1,4 +1,5 @@ AC_INIT(kpasswd.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) ET_RULES diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index 0e5dddaf6..b42646763 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -9,7 +10,6 @@ K4LIB = @K4LIB@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/kdc/configure.in b/src/kdc/configure.in index 1793b21e8..6a93b5d84 100644 --- a/src/kdc/configure.in +++ b/src/kdc/configure.in @@ -1,4 +1,5 @@ AC_INIT(main.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) ET_RULES diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 50f139975..d2fbf83ab 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/lib/configure.in b/src/lib/configure.in index 876f490e2..6171722a8 100644 --- a/src/lib/configure.in +++ b/src/lib/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(krb5 kdb des425 krb425 crypto gssapi) AC_PROG_ARCHIVE AC_PROG_RANLIB diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 70026ab49..fe1946e95 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -16,7 +17,6 @@ RM = rm -f CP = cp RANLIB = @RANLIB@ -BUILDTOP = ../.. SRCTOP = $(srcdir)/$(BUILDTOP) OBJS= cryptoconf.o diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in index dd05b0eb9..9f81e7cf2 100644 --- a/src/lib/crypto/configure.in +++ b/src/lib/crypto/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(des crc32 md4 md5 os) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in index c2c88a4ef..7f9cf8f88 100644 --- a/src/lib/crypto/crc32/Makefile.in +++ b/src/lib/crypto/crc32/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/crypto/crc32/configure.in b/src/lib/crypto/crc32/configure.in index 184c6f447..cc5e8f0b7 100644 --- a/src/lib/crypto/crc32/configure.in +++ b/src/lib/crypto/crc32/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in index f8a3ffc9a..5ee98d937 100644 --- a/src/lib/crypto/des/Makefile.in +++ b/src/lib/crypto/des/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/crypto/des/configure.in b/src/lib/crypto/des/configure.in index 184c6f447..cc5e8f0b7 100644 --- a/src/lib/crypto/des/configure.in +++ b/src/lib/crypto/des/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in index 04e56f404..0e758dd51 100644 --- a/src/lib/crypto/md4/Makefile.in +++ b/src/lib/crypto/md4/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/crypto/md4/configure.in b/src/lib/crypto/md4/configure.in index 184c6f447..cc5e8f0b7 100644 --- a/src/lib/crypto/md4/configure.in +++ b/src/lib/crypto/md4/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in index ff2571bb8..a8c5a1c3c 100644 --- a/src/lib/crypto/md5/Makefile.in +++ b/src/lib/crypto/md5/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/crypto/md5/configure.in b/src/lib/crypto/md5/configure.in index 184c6f447..cc5e8f0b7 100644 --- a/src/lib/crypto/md5/configure.in +++ b/src/lib/crypto/md5/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in index 86ca11ee5..646883479 100644 --- a/src/lib/crypto/os/Makefile.in +++ b/src/lib/crypto/os/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -15,7 +16,6 @@ LN = @LN_S@ LIBOBJS = @LIBOBJS@ -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/crypto/os/configure.in b/src/lib/crypto/os/configure.in index f7d18016d..49a6c8228 100644 --- a/src/lib/crypto/os/configure.in +++ b/src/lib/crypto/os/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index 0c436341a..f9ee53cfb 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ RANLIB = @RANLIB@ ARCHIVE = @ARCHIVE@ ARADD = @ARADD@ @@ -16,7 +17,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in index f0cb91d40..504b0c78b 100644 --- a/src/lib/des425/configure.in +++ b/src/lib/des425/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 02f3bb2fe..136857964 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in index 7522785d7..21c964609 100644 --- a/src/lib/gssapi/configure.in +++ b/src/lib/gssapi/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(generic krb5) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index d64446427..bc2359ecb 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -14,7 +15,6 @@ CP = cp AWK = @AWK@ -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in index fe09467ca..3e74e536c 100644 --- a/src/lib/gssapi/generic/configure.in +++ b/src/lib/gssapi/generic/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP ET_RULES CONFIG_RULES SubdirLibraryRule([${OBJS}]) diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index b748bab75..7a6e82a3d 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -14,7 +15,6 @@ CP = cp AWK = @AWK@ -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/gssapi/krb5/configure.in b/src/lib/gssapi/krb5/configure.in index 0843821e4..e5f2f6ede 100644 --- a/src/lib/gssapi/krb5/configure.in +++ b/src/lib/gssapi/krb5/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP ET_RULES CONFIG_RULES SubdirLibraryRule([${OBJS}]) diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index 1870b3a9e..369a8c71c 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ RANLIB = @RANLIB@ ARCHIVE = @ARCHIVE@ ARADD = @ARADD@ @@ -14,7 +15,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in index 576db04b2..fd132bd5c 100644 --- a/src/lib/kdb/configure.in +++ b/src/lib/kdb/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB diff --git a/src/lib/krb425/Makefile.in b/src/lib/krb425/Makefile.in index a5c0e8702..c5b3ac250 100644 --- a/src/lib/krb425/Makefile.in +++ b/src/lib/krb425/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ RANLIB = @RANLIB@ ARCHIVE = @ARCHIVE@ ARADD = @ARADD@ @@ -18,7 +19,6 @@ CP = cp AWK = @AWK@ -BUILDTOP = ../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: krb_err.h includes $(OBJS) diff --git a/src/lib/krb425/configure.in b/src/lib/krb425/configure.in index 58ec1c066..f414b745d 100644 --- a/src/lib/krb425/configure.in +++ b/src/lib/krb425/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP ET_RULES AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index 4da82a904..c8e03d64a 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in index ee4ff4600..c0a86e5a4 100644 --- a/src/lib/krb5/asn.1/Makefile.in +++ b/src/lib/krb5/asn.1/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -11,7 +12,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. PEPSY = @PEPSY@ PSYFLAGS = @PSYFLAGS@ diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in index 2cf4f07ff..5dc1c4e95 100644 --- a/src/lib/krb5/asn.1/configure.in +++ b/src/lib/krb5/asn.1/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP UsePepsy CONFIG_RULES SubdirLibraryRule([${OBJS}]) diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index b8f12a336..a2a1deb80 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in index c3f602750..aae14229c 100644 --- a/src/lib/krb5/ccache/configure.in +++ b/src/lib/krb5/ccache/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(file stdio) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in index 9050efd87..4042d5c98 100644 --- a/src/lib/krb5/ccache/file/Makefile.in +++ b/src/lib/krb5/ccache/file/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -10,7 +11,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in index 184c6f447..cc5e8f0b7 100644 --- a/src/lib/krb5/ccache/file/configure.in +++ b/src/lib/krb5/ccache/file/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in index e7acee5fd..4d30ca41c 100644 --- a/src/lib/krb5/ccache/stdio/Makefile.in +++ b/src/lib/krb5/ccache/stdio/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -10,7 +11,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/ccache/stdio/configure.in b/src/lib/krb5/ccache/stdio/configure.in index 184c6f447..cc5e8f0b7 100644 --- a/src/lib/krb5/ccache/stdio/configure.in +++ b/src/lib/krb5/ccache/stdio/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in index 5e8349336..33b71b310 100644 --- a/src/lib/krb5/configure.in +++ b/src/lib/krb5/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(error_tables asn.1 ccache keytab krb rcache free os posix) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index 7ce525c1b..7be230d09 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -12,7 +13,6 @@ CP = cp AWK = @AWK@ -BUILDTOP = ../../.. EHDRDIR=$(BUILDTOP)/include/krb5 diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in index de80b5a78..0043f2a55 100644 --- a/src/lib/krb5/error_tables/configure.in +++ b/src/lib/krb5/error_tables/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP ET_RULES SS_RULES CONFIG_RULES diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in index c1f65c67c..fde268cbe 100644 --- a/src/lib/krb5/free/Makefile.in +++ b/src/lib/krb5/free/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/free/configure.in b/src/lib/krb5/free/configure.in index 465abd0b2..ceccb7221 100644 --- a/src/lib/krb5/free/configure.in +++ b/src/lib/krb5/free/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index 48f0cca84..3c9fab608 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in index f95f46243..6e557cb1f 100644 --- a/src/lib/krb5/keytab/configure.in +++ b/src/lib/krb5/keytab/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(file) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in index cacaedb2a..8f2cead56 100644 --- a/src/lib/krb5/keytab/file/Makefile.in +++ b/src/lib/krb5/keytab/file/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -10,7 +11,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/keytab/file/configure.in b/src/lib/krb5/keytab/file/configure.in index 184c6f447..cc5e8f0b7 100644 --- a/src/lib/krb5/keytab/file/configure.in +++ b/src/lib/krb5/keytab/file/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index 56990f917..70ef54732 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in index 3f298de95..09b8861b8 100644 --- a/src/lib/krb5/krb/configure.in +++ b/src/lib/krb5/krb/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index 893cfd417..33d5ee341 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -10,7 +11,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in index 465abd0b2..ceccb7221 100644 --- a/src/lib/krb5/os/configure.in +++ b/src/lib/krb5/os/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in index 26eb2ead7..fa76077e0 100644 --- a/src/lib/krb5/posix/Makefile.in +++ b/src/lib/krb5/posix/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/posix/configure.in b/src/lib/krb5/posix/configure.in index 9400c463a..8afcc40ba 100644 --- a/src/lib/krb5/posix/configure.in +++ b/src/lib/krb5/posix/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index 615727459..baa147f98 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/rcache/configure.in b/src/lib/krb5/rcache/configure.in index 465abd0b2..ceccb7221 100644 --- a/src/lib/krb5/rcache/configure.in +++ b/src/lib/krb5/rcache/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index cfda0329f..8a31cd165 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/slave/configure.in b/src/slave/configure.in index da7aea579..b47fdca82 100644 --- a/src/slave/configure.in +++ b/src/slave/configure.in @@ -1,4 +1,5 @@ AC_INIT(kprop.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(util) diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 2cc270244..6fd0859a1 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/util/configure.in b/src/util/configure.in index e2387b44c..4fde8230b 100644 --- a/src/util/configure.in +++ b/src/util/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(unifdef et ss) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in index 0d3057a28..ae022240c 100644 --- a/src/util/et/Makefile.in +++ b/src/util/et/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -16,7 +17,6 @@ RM = rm -f all:: -BUILDTOP=../.. LINTFLAGS=-uhvb LINTFILES= error_message.c et_name.c init_et.c com_err.c LIBOBJS= error_message.o et_name.o init_et.o com_err.o diff --git a/src/util/et/configure.in b/src/util/et/configure.in index 8a40695ff..248361e94 100644 --- a/src/util/et/configure.in +++ b/src/util/et/configure.in @@ -1,4 +1,5 @@ AC_INIT(error_table.y) +AC_SET_BUILDTOP AC_PROG_LEX AC_PROG_ARCHIVE AC_PROG_RANLIB diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in index 99a1cdd34..de6e49c37 100644 --- a/src/util/ss/Makefile.in +++ b/src/util/ss/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -22,7 +23,6 @@ CHMOD=chmod all:: -BUILDTOP=../.. TOP=$(BUILDTOP) # hard coded srcdir/.. is so that ss/ss.h works diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in index 8bc4bdda6..915afe40f 100644 --- a/src/util/ss/configure.in +++ b/src/util/ss/configure.in @@ -1,4 +1,5 @@ AC_INIT(ct.y) +AC_SET_BUILDTOP AC_PROG_LEX AC_PROG_ARCHIVE AC_PROG_RANLIB diff --git a/src/util/unifdef/Makefile.in b/src/util/unifdef/Makefile.in index 88765b4f3..c8670fd43 100644 --- a/src/util/unifdef/Makefile.in +++ b/src/util/unifdef/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/util/unifdef/configure.in b/src/util/unifdef/configure.in index f56fa1022..0bfc43b25 100644 --- a/src/util/unifdef/configure.in +++ b/src/util/unifdef/configure.in @@ -1,3 +1,4 @@ AC_INIT(unifdef.c) +AC_SET_BUILDTOP CONFIG_RULES AC_OUTPUT(Makefile,[EXTRA_RULES]) |