Reduce local configure script's work by removing static defines and header and
authorKen Raeburn <raeburn@mit.edu>
Wed, 5 Mar 2003 03:38:51 +0000 (03:38 +0000)
committerKen Raeburn <raeburn@mit.edu>
Wed, 5 Mar 2003 03:38:51 +0000 (03:38 +0000)
function info available in krb5/autoconf.h.

* gethostname.c, getst.c, kadm_net.c, klog.c, kparse.c: Include
krb5/autoconf.h.
* kuserok.c, log.c, memcache.c, mk_preauth.c, netread.c: Ditto.
* netwrite.c, put_svc_key.c, recvauth.c, send_to_kdc.c: Ditto.
* tkt_string.c: Ditto.
* Makefile.in: Update dependencies.
(DEFINES): Define KRB4_USE_KEYTAB.
* configure.in: Don't define KRB4_USE_KEYTAB.  Don't check for any headers or
functions; include/configure.in already does it.  Don't invoke AC_C_CONST
explicitly; CONFIG_RULES does that.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15230 dc483132-0cff-0310-8789-dd5450dbe970

18 files changed:
src/lib/krb4/ChangeLog
src/lib/krb4/Makefile.in
src/lib/krb4/configure.in
src/lib/krb4/gethostname.c
src/lib/krb4/getst.c
src/lib/krb4/kadm_net.c
src/lib/krb4/klog.c
src/lib/krb4/kparse.c
src/lib/krb4/kuserok.c
src/lib/krb4/log.c
src/lib/krb4/memcache.c
src/lib/krb4/mk_preauth.c
src/lib/krb4/netread.c
src/lib/krb4/netwrite.c
src/lib/krb4/put_svc_key.c
src/lib/krb4/recvauth.c
src/lib/krb4/send_to_kdc.c
src/lib/krb4/tkt_string.c

index bd31edc55b26af3fd9c2b3a35eaeaf22239c706e..cfb5f425cf2822b1f518334f46c5e6950c086ddc 100644 (file)
@@ -1,3 +1,16 @@
+2003-03-04  Ken Raeburn  <raeburn@mit.edu>
+
+       * gethostname.c, getst.c, kadm_net.c, klog.c, kparse.c: Include
+       krb5/autoconf.h.
+       * kuserok.c, log.c, memcache.c, mk_preauth.c, netread.c: Ditto.
+       * netwrite.c, put_svc_key.c, recvauth.c, send_to_kdc.c: Ditto.
+       * tkt_string.c: Ditto.
+       * Makefile.in: Update dependencies.
+       (DEFINES): Define KRB4_USE_KEYTAB.
+       * configure.in: Don't define KRB4_USE_KEYTAB.  Don't check for any
+       headers or functions; include/configure.in already does it.  Don't
+       invoke AC_C_CONST explicitly; CONFIG_RULES does that.
+
 2003-03-03  Tom Yu  <tlyu@mit.edu>
 
        * g_cnffile.c (krb__get_srvtabname): Keep strdup()ed string in a
index 3f58247374e1ae773883d056971e564dd77bcede..0a8ecff3e2f9bb8f356db2512859edbecffdd290 100644 (file)
@@ -3,6 +3,7 @@ myfulldir=lib/krb4
 mydir=.
 BUILDTOP=$(REL)..$(S)..
 LOCALINCLUDES = -I$(BUILDTOP)/include/kerberosIV -I$(srcdir)/../../include/kerberosIV -I.
+DEFINES= -DKRB4_USE_KEYTAB
 
 ##DOS##BUILDTOP = ..\..
 ##DOS##LIBNAME=$(OUTPRE)krb4.lib
@@ -317,8 +318,8 @@ gethostname.so gethostname.po $(OUTPRE)gethostname.$(OBJEXT): gethostname.c $(SR
   $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \
   krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h
 kadm_err.so kadm_err.po $(OUTPRE)kadm_err.$(OBJEXT): kadm_err.c $(COM_ERR_DEPS)
-kadm_net.so kadm_net.po $(OUTPRE)kadm_net.$(OBJEXT): kadm_net.c $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/kerberosIV/krb.h \
+kadm_net.so kadm_net.po $(OUTPRE)kadm_net.$(OBJEXT): kadm_net.c $(BUILDTOP)/include/krb5/autoconf.h \
+  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/kerberosIV/krbports.h \
   $(SRCTOP)/include/kerberosIV/kadm.h $(BUILDTOP)/include/kerberosIV/kadm_err.h \
@@ -406,8 +407,8 @@ rd_safe.so rd_safe.po $(OUTPRE)rd_safe.$(OBJEXT): rd_safe.c $(SRCTOP)/include/ke
 send_to_kdc.so send_to_kdc.po $(OUTPRE)send_to_kdc.$(OBJEXT): send_to_kdc.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/kerberosIV/krbports.h \
-  $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/fake-addrinfo.h \
+  $(SRCTOP)/include/kerberosIV/prot.h $(BUILDTOP)/include/krb5/autoconf.h \
+  $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/fake-addrinfo.h \
   $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5.h \
   $(SRCTOP)/include/krb5/kdb.h krb4int.h
@@ -425,7 +426,7 @@ rd_preauth.so rd_preauth.po $(OUTPRE)rd_preauth.$(OBJEXT): rd_preauth.c $(SRCTOP
   $(BUILDTOP)/include/krb5/autoconf.h
 mk_preauth.so mk_preauth.po $(OUTPRE)mk_preauth.$(OBJEXT): mk_preauth.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
-  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
+  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h
 unix_time.so unix_time.po $(OUTPRE)unix_time.$(OBJEXT): unix_time.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
@@ -446,8 +447,8 @@ in_tkt.so in_tkt.po $(OUTPRE)in_tkt.$(OBJEXT): in_tkt.c $(SRCTOP)/include/kerber
   $(BUILDTOP)/include/krb5/autoconf.h
 tkt_string.so tkt_string.po $(OUTPRE)tkt_string.$(OBJEXT): tkt_string.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
-  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5/autoconf.h
+  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \
+  $(SRCTOP)/include/port-sockets.h
 g_tf_fname.so g_tf_fname.po $(OUTPRE)g_tf_fname.$(OBJEXT): g_tf_fname.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \
   $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
   $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
@@ -467,17 +468,15 @@ unix_glue.so unix_glue.po $(OUTPRE)unix_glue.$(OBJEXT): unix_glue.c $(SRCTOP)/in
   $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h
 klog.so klog.po $(OUTPRE)klog.$(OBJEXT): klog.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
-  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \
-  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/kerberosIV/klog.h
+  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \
+  krb4int.h $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/klog.h
 kuserok.so kuserok.po $(OUTPRE)kuserok.$(OBJEXT): kuserok.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
-  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
+  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h
 log.so log.po $(OUTPRE)log.$(OBJEXT): log.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
-  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \
-  $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(SRCTOP)/include/kerberosIV/klog.h
+  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \
+  krb4int.h $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/klog.h
 kntoln.so kntoln.po $(OUTPRE)kntoln.$(OBJEXT): kntoln.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \
   $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
   $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h
@@ -506,8 +505,8 @@ g_svc_in_tkt.so g_svc_in_tkt.po $(OUTPRE)g_svc_in_tkt.$(OBJEXT): g_svc_in_tkt.c
   krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h
 recvauth.so recvauth.po $(OUTPRE)recvauth.$(OBJEXT): recvauth.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
-  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5/autoconf.h
+  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \
+  $(SRCTOP)/include/port-sockets.h
 ad_print.so ad_print.po $(OUTPRE)ad_print.$(OBJEXT): ad_print.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \
@@ -518,7 +517,7 @@ cr_death_pkt.so cr_death_pkt.po $(OUTPRE)cr_death_pkt.$(OBJEXT): cr_death_pkt.c
 kparse.so kparse.po $(OUTPRE)kparse.$(OBJEXT): kparse.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \
   $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \
   $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \
-  $(SRCTOP)/include/kerberosIV/kparse.h
+  $(SRCTOP)/include/kerberosIV/kparse.h $(BUILDTOP)/include/krb5/autoconf.h
 put_svc_key.so put_svc_key.po $(OUTPRE)put_svc_key.$(OBJEXT): put_svc_key.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \
@@ -529,12 +528,12 @@ sendauth.so sendauth.po $(OUTPRE)sendauth.$(OBJEXT): sendauth.c $(SRCTOP)/includ
   krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h
 netread.so netread.po $(OUTPRE)netread.$(OBJEXT): netread.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
-  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5/autoconf.h
+  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \
+  $(SRCTOP)/include/port-sockets.h
 netwrite.so netwrite.po $(OUTPRE)netwrite.$(OBJEXT): netwrite.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
-  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \
-  $(BUILDTOP)/include/krb5/autoconf.h
+  $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \
+  $(SRCTOP)/include/port-sockets.h
 g_cnffile.so g_cnffile.po $(OUTPRE)g_cnffile.$(OBJEXT): g_cnffile.c $(SRCTOP)/include/kerberosIV/krb.h \
   $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \
   $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/k5-int.h \
index 0f99a17878092476cec918831d9dfaad831377a1..87aeebccf927fe7e1369f122ea86ab7f0ebc5ceb 100644 (file)
@@ -1,14 +1,7 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-AC_C_CONST
-AC_CHECK_HEADERS(sys/select.h time.h unistd.h)
-dnl Could check for full stdc environment, but will only test
-dnl for stdlib.h
-AC_CHECK_HEADERS(stdlib.h)
-
 AC_TYPE_MODE_T
 AC_TYPE_UID_T
-AC_DEFINE(KRB4_USE_KEYTAB)
 case $krb5_cv_host in
      powerpc-apple-darwin*)
      KRB_ERR_TXT=
@@ -18,7 +11,6 @@ case $krb5_cv_host in
      ;;
 esac
 AC_SUBST([KRB_ERR_TXT])
-AC_CHECK_FUNCS(strdup seteuid setreuid setresuid)
 AC_PROG_AWK
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY_WITH_DEPS
index caff02e737c45dbeadfc8c275c2c5359e5c23f92..c09be7299df5e16d8b85afd3cdfef65cffda1853 100644 (file)
@@ -10,6 +10,7 @@
 #include "mit-copyright.h"
 #include "krb.h"
 #include "krb4int.h"
+#include "krb5/autoconf.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
index ebcf54a70974a72338a5eaab2e3458dff100f24e..252571eaff342d895165b3ae9f25adc9c21fbf95 100644 (file)
@@ -10,6 +10,7 @@
 #include "mit-copyright.h"
 #include "krb.h"
 #include "krb4int.h"
+#include "krb5/autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
index 781ec82da6f98406bdcb054a1614ad8e2ebcf0ce..2ea4f371dd85f958d375397afcf3ca67e1a4d6a4 100644 (file)
@@ -31,6 +31,7 @@
 #include <signal.h>
 #include <string.h>
 #include <stdlib.h>
+#include "krb5/autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
index aa2b5f8c9e03bfdd89a697683f401ab090ab9a02..f0b87631a5633a36e04a0bf95f9956341fa411c2 100644 (file)
@@ -25,6 +25,7 @@
  */
 
 #include "krb.h"
+#include "krb5/autoconf.h"
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
index c60cbbcfd555ad9e6fdb3609ab0b4f151d663d29..94e5b935e3f3d2c46a751175a83567daeb41753e 100644 (file)
@@ -38,6 +38,7 @@
 #include <ctype.h>
 #include <kparse.h>
 #include <string.h>
+#include "krb5/autoconf.h"
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
index 615bd3365f9f5d7805b33b063f5ed15a02425a8b..e2f673001e25b85b6467b6756e022aa5d26f4811 100644 (file)
@@ -37,6 +37,7 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <string.h>
+#include "krb5/autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
index 850cbfb82638dfa99948e5acf41e54c955a0bf49..d7447aebb290494d256cca45718f4971a546b21d 100644 (file)
@@ -31,6 +31,7 @@
 #endif
 
 #include "krb.h"
+#include "krb5/autoconf.h"
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
index 65fbce4515c41c3c24ff0d9cca4802a2560e6407..6a7b48a70fb4f3f1644508a347c9734afbf6d5b2 100644 (file)
@@ -14,6 +14,7 @@
 
 #include "krb.h"
 #include "krb4int.h"
+#include "krb5/autoconf.h"
 
 #ifdef _WIN32
 #include <errno.h>
index 5295b22552300a26080033b04b47b453d733cb58..342654adae0e6480e9e651c71f62f5dad56a4bbd 100644 (file)
@@ -15,6 +15,7 @@
 #include "krb.h"
 #include <string.h>
 
+#include "krb5/autoconf.h"
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #else
index 140bca3b15d598a9cf16028a87cc50102da5891f..87ead207fcfcd9c9135f83acb01643f99a669fc1 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <errno.h>
 #include "krb.h"
+#include "krb5/autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
index 18468db6b97615372ad3d8dd70716d8159fb8f22..1447b7c3c2447deda48370d1659dc968e2323163 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <errno.h>
 #include "krb.h"
+#include "krb5/autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
index d31b0a36c4214831b693f3a5531042382bdfeabd..80561cc4fa34740233a60af6d5e4177892413c19 100644 (file)
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <fcntl.h>
+#include "krb5/autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
index 220fbd94854b93e91627867998bd6699c898a936..3d58a33c65fc7ec10fb8dfe410af94e75809c01b 100644 (file)
@@ -28,6 +28,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include "krb5/autoconf.h"
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
index b7401650a07bdf095df235c7e8f40397e467dc33..f9db28805c491bf89f3f3600c704bd527b986f21 100644 (file)
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "krb5/autoconf.h"
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
index 70eb60e86fd2bb54501fd0778b9d48fa1d199bc3..97a62d174e64dd9ab281f274352506c602b28c84 100644 (file)
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
+#include "krb5/autoconf.h"
 #include "port-sockets.h" /* XXX this gets us MAXPATHLEN but we should find
                             a better way */