Move krb5-config to new src/build-tools directory

In preparation for adding a bunch of pkg-config data files, move
krb5-config into a new source tree subdirectory containing tools we
provide as outputs to other build systems.

diff --git a/.gitignore b/.gitignore
index 6ab9237adbbb0b30743ed759b2bb84d7223c354d..f8c7c9d1afa9f351c72f6485920dbb1d537a1a11 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,6 @@ testlog
 /src/config.log
 /src/config.status
 /src/configure
-/src/krb5-config
 /src/pyrunenv.vals
 /src/runenv.py
 
@@ -39,6 +38,8 @@ testlog
 /src/appl/user_user/uuclient
 /src/appl/user_user/uuserver
 
+/src/build-tools/krb5-config
+
 /src/clients/kdestroy/kdestroy
 
 /src/clients/kinit/kinit

diff --git a/src/Makefile.in b/src/Makefile.in
index 2c658310f72a10189bef02753082552853ec7891..da2cfe5577ba4c9cb51a5581a838506c0bf0db2b 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,7 +14,7 @@ SUBDIRS=util include lib \
        @ldap_plugin_dir@ \
        plugins/preauth/pkinit \
        kdc kadmin slave clients appl tests \
-       config-files man doc @po@
+       config-files build-tools man doc @po@
 WINSUBDIRS=include util lib ccapi windows clients appl
 BUILDTOP=$(REL).
 LOCALINCLUDES = -I$(srcdir) 
@@ -29,8 +29,6 @@ HDRS =
 
 DISTFILES = $(SRCS) $(HDRS) COPYING COPYING.LIB ChangeLog Makefile.in
 
-all-unix:: krb5-config
-
 # Lots of things will start to depend on the thread support, which
 # needs autoconf.h, but building "all" in include requires that util/et
 # have been built first.  Until we can untangle this, let's just check
@@ -88,7 +86,7 @@ TAGS: $(SRCS)
 
 clean-:: clean-windows
 clean-unix::
-       $(RM) *.o core krb5-config
+       $(RM) *.o core
 
 mostlyclean: clean
 
@@ -533,17 +531,6 @@ install-windows::
        -copy clients\kswitch\$(OUTPRE)kswitch.pdb "$(KRB_INSTALL_DIR)\bin\."
        copy windows\leash\htmlhelp\*.chm "$(KRB_INSTALL_DIR)\bin\."
 
-install-unix:: 
-       $(INSTALL_SCRIPT) krb5-config \
-               $(DESTDIR)$(CLIENT_BINDIR)/krb5-config
-
-krb5-config: $(srcdir)/krb5-config.in config.status
-       $(SHELL) config.status krb5-config
-
-# Test to ensure that krb5-config does not spit out things like
-# $(PURE) or $(LDFLAGS) in case someone changes config/shlib.conf
-check-unix:: krb5-config
-       $(SHELL) $(srcdir)/t_krbconf
 check-prerecurse: runenv.py
 
 # Create a test realm and spawn a shell in an environment pointing to it.

diff --git a/src/build-tools/Makefile.in b/src/build-tools/Makefile.in
new file mode 100644 (file)
index 0000000..fa56900
--- /dev/null
+++ b/src/build-tools/Makefile.in
@@ -0,0 +1,15 @@
+mydir=build-tools
+BUILDTOP=$(REL)..
+
+all-unix:: krb5-config
+
+krb5-config: $(srcdir)/krb5-config.in $(BUILDTOP)/config.status
+       cd $(BUILDTOP) && $(SHELL) config.status $(mydir)/$@
+
+install-unix::
+       $(INSTALL_SCRIPT) krb5-config $(DESTDIR)$(CLIENT_BINDIR)/krb5-config
+
+# Test to ensure that krb5-config does not spit out things like
+# $(PURE) or $(LDFLAGS) in case someone changes config/shlib.conf
+check-unix:: krb5-config
+       $(SHELL) $(srcdir)/t_krbconf

diff --git a/src/build-tools/deps b/src/build-tools/deps
new file mode 100644 (file)
index 0000000..2feac3c
--- /dev/null
+++ b/src/build-tools/deps
@@ -0,0 +1 @@
+# No dependencies here.

diff --git a/src/krb5-config.in b/src/build-tools/krb5-config.in
similarity index 99%
rename from src/krb5-config.in
rename to src/build-tools/krb5-config.in
index c950b36b5d48a2f1f9603efeedf4b287b83eada2..e688626f39f02dbaa538645449cb45d1990e5cc4 100755 (executable)
--- a/src/krb5-config.in
+++ b/src/build-tools/krb5-config.in
@@ -7,7 +7,7 @@
 #   require a specific license from the United States Government.
 #   It is the responsibility of any person or organization contemplating
 #   export to obtain such a license before exporting.
-# 
+#
 # WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
 # distribute this software and its documentation for any purpose and
 # without fee is hereby granted, provided that the above copyright
@@ -21,7 +21,7 @@
 # M.I.T. makes no representations about the suitability of
 # this software for any purpose.  It is provided "as is" without express
 # or implied warranty.
-# 
+#
 #
 
 # Configurable parameters set by autoconf

diff --git a/src/t_krbconf b/src/build-tools/t_krbconf
similarity index 99%
rename from src/t_krbconf
rename to src/build-tools/t_krbconf
index 9fe898cf23fe6904a4365ebaf88d6fbf874fc97e..5a141f5f584d0125ad9e79ea1b336dbd1f75f021 100644 (file)
--- a/src/t_krbconf
+++ b/src/build-tools/t_krbconf
@@ -7,7 +7,7 @@
 #   require a specific license from the United States Government.
 #   It is the responsibility of any person or organization contemplating
 #   export to obtain such a license before exporting.
-# 
+#
 # WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
 # distribute this software and its documentation for any purpose and
 # without fee is hereby granted, provided that the above copyright

diff --git a/src/configure.in b/src/configure.in
index faf93a1c9469bf4b8b7505deaa25e7c1e0738fe3..69863d21947980d09faefa13369df6f1d3bac561 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -1290,7 +1290,7 @@ AC_DEFINE_UNQUOTED(DEFKTNAME, ["$DEFKTNAME"], [Define to default keytab name])
 AC_DEFINE_UNQUOTED(DEFCKTNAME, ["$DEFCKTNAME"],
                    [Define to default client keytab name])
 
-AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
+AC_CONFIG_FILES(build-tools/krb5-config, [chmod +x build-tools/krb5-config])
 V5_AC_OUTPUT_MAKEFILE(.
 
        util util/support util/profile util/profile/testmod util/send-pr
@@ -1323,7 +1323,7 @@ dnl       lib/krb5/ccache/ccapi
 
 dnl    ccapi ccapi/lib ccapi/lib/unix ccapi/server ccapi/server/unix ccapi/test
 
-       kdc slave config-files man doc include
+       kdc slave config-files build-tools man doc include
 
        plugins/locate/python
        plugins/kadm5_hook/test