* configure.in: use KRB5_POSIX_LOCKS, AC_EGREP_HEADER. (from

	epeisach).
[from 0961]
	(ET_HEADERS): new variable for the names of the headers that
	lib/krb5/error_tables builds and installs here (so that they get
	pushed out to the installed include directory.)
	(BUILT_HEADERS): locally built headers, for all, install, and
	clean.
	(clean): delete built and et headers.
[inspired by 0937, but done more thoroughly.]

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index cf7172ee44d80fafa7c115b994af12dfad29063b..d1f17947f977f6255319ea37ea64df52c37bd069 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,19 @@
+Fri Nov 18 01:28:47 1994  Mark Eichin  <eichin@cygnus.com>
+
+       * Makefile.in (install): elide dependency so $(srcdir) works; use
+       $(INSTALL_DATA).
+       (ET_HEADERS): new variable for the names of the headers that
+       lib/krb5/error_tables builds and installs here (so that they get
+       pushed out to the installed include directory.)
+       (BUILT_HEADERS): locally built headers, for all, install, and
+       clean.
+       (clean): delete built and et headers.
+
+Fri Nov 18 01:15:00 1994  Mark Eichin  <eichin@cygnus.com>
+
+       * configure.in: use KRB5_POSIX_LOCKS, AC_EGREP_HEADER. (from
+       epeisach).
+
 Thu Nov 10 22:04:19 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * hostaddr.h (krb5_address): Add magic number field.

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 2693d7de60728b33365565577b35ab561808a8c5..64db7070842fe0299716c3c4bc04cbff55dda3a6 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -7,8 +7,12 @@ KRB5_HEADERS = asn1.h base-defs.h ccache.h crc-32.h encryption.h \
                keytab.h krb5.h libos.h los-proto.h macros.h mit-des.h \
                narrow.h proto.h rcache.h rsa-md4.h safepriv.h \
                sysincl.h widen.h wordsize.h
+# these are installed here for the build from lib/krb5/error_tables but 
+# also need to be in the installed tree
+ET_HEADERS = adm_err.h asn1_err.h isode_err.h kdb5_err.h krb5_err.h
+BUILT_HEADERS = autoconf.h config.h osconf.h
 
-all:: autoconf.h osconf.h config.h
+all:: $(BUILT_HEADERS)
 
 includes:: autoconf.h
 
@@ -28,11 +32,10 @@ KRB5ROOT = @KRB5ROOT@
 
 KRB5_INCDIR = $(KRB5ROOT)/include
 
-install:: $(KRB5_HEADERS) config.h osconf.h autoconf.h
-       @set -x; for f in $(KRB5_HEADERS) ; \
-       do cp $(srcdir)/$$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f ; \
+install::
+       @set -x; for f in $(KRB5_HEADERS) $(BUILT_HEADERS) $(ET_HEADERS); \
+       do $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f ; \
        done
-       cp config.h osconf.h $(DESTDIR)$(KRB5_INCDIR)/krb5/$$f 
 
 PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+" \
                  -e "s+@KDB5DIR+$(KDB5DIR)+" \
@@ -56,4 +59,4 @@ config.h: $(CONFSRC)
        else (set -x; $(RM) config.h ; $(CP) config.new config.h) fi
 
 clean::
-       $(RM) config.h config.new osconf.h osconf.new
+       $(RM) config.new osconf.new $(ET_HEADERS) $(BUILT_HEADERS)

diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in
index 9391f67c95c16eea635971ecd1362e801e175861..984b0c54c9fccfff7a0a8c569509b3cea3212eb1 100644 (file)
--- a/src/include/krb5/configure.in
+++ b/src/include/krb5/configure.in
@@ -6,6 +6,7 @@ CONFIG_RULES
 ISODE_DEFS
 AC_CONFIG_HEADER(autoconf.h)
 AC_PROG_LEX
+AC_PROG_INSTALL
 HAVE_YYLINENO
 AC_FUNC_CHECK(strdup,AC_DEFINE(HAS_STRDUP))
 CHECK_DIRENT
@@ -15,15 +16,10 @@ CHECK_WAIT_TYPE
 dnl stuff from config.h
 AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS)))
 
-AC_HEADER_CHECK(flock.h,[echo found flock.h for non-posix locks],
-AC_COMPILE_CHECK([POSIX file locking -- structs and flags],
-[#include <sys/types.h>
-#include <fcntl.h>],
-[struct flock f; 1+F_SETLK;], 
-AC_DEFINE(POSIX_FILE_LOCKS)))
+KRB5_POSIX_LOCKS
 
 dnl time_t, only used in lib/krb5/os/timeofday.c
-AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
+AC_EGREP_HEADER(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
 
 
 dnl AC_RETSIGTYPE isn't quite right, but almost.