[961] in Kerberos-V5-bugs

home help back first fref pref prev next nref lref last post

Putting checks for POSIX_LOCKS in aclocal.m4

daemon@ATHENA.MIT.EDU (epeisach@MIT.EDU)
Tue Nov 15 10:25:06 1994

From: epeisach@MIT.EDU
Date: Tue, 15 Nov 1994 10:25:02 -0500
To: krb5-bugs@MIT.EDU


Combining the appl/popper/configure.in and include/krb5/configure.in....
(question - is the appl/popper required?)

*** 1.7	1994/11/15 14:38:17
--- aclocal.m4	1994/11/15 15:07:16
***************
*** 607,609 ****
--- 607,626 ----
  fi
  ])dnl
  dnl
+ dnl
+ dnl Check for POSIX_FILE_LOCKS - used be include/krb5 and appl/popper
+ dnl
+ AC_DEFUN([KRB5_POSIX_LOCKS],[dnl
+ AC_HEADER_CHECK(flock.h,[echo found flock.h for non-posix locks],
+   [AC_MSG_CHECKING([POSIX file locking -- structs and flags])
+   AC_CACHE_VAL(krb5_cv_struct_flock,
+ [AC_TRY_LINK(dnl
+ [#include <sys/types.h>
+ #include <fcntl.h>],
+ [struct flock f; 1+F_SETLK;], 
+   krb5_cv_struct_flock=yes, krb5_cv_struct_flock=no)])
+   AC_MSG_RESULT($krb5_cv_struct_flock)
+   if test $krb5_cv_struct_flock = yes; then
+     AC_DEFINE(POSIX_FILE_LOCKS)
+   fi
+ ])])dnl
===================================================================
RCS file: /mit/krb5/.cvsroot/src/include/krb5/configure.in,v
retrieving revision 1.12
diff -c -r1.12 configure.in
*** 1.12	1994/10/31 19:45:09
--- configure.in	1994/11/15 15:08:46
***************
*** 15,29 ****
  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)))
  
  dnl time_t, only used in lib/krb5/os/timeofday.c
! AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
  
  
  dnl AC_RETSIGTYPE isn't quite right, but almost.
--- 15,24 ----
  dnl stuff from config.h
  AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS)))
  
! KRB5_POSIX_LOCKS
  
  dnl time_t, only used in lib/krb5/os/timeofday.c
! AC_EGREP_HEADER(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES))
  
  
  dnl AC_RETSIGTYPE isn't quite right, but almost.
===================================================================
RCS file: /mit/krb5/.cvsroot/src/appl/popper/configure.in,v
retrieving revision 5.8
diff -c -r5.8 configure.in
*** 5.8	1994/10/26 05:42:59
--- configure.in	1994/11/15 14:51:05
***************
*** 12,24 ****
  AC_CHECK_LIB(dbm,main)
  CHECK_WAIT_TYPE
  CHECK_FCNTL
! 
! 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)))
  
  AC_HAVE_HEADERS(strings.h)
  AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H))
--- 12,18 ----
  AC_CHECK_LIB(dbm,main)
  CHECK_WAIT_TYPE
  CHECK_FCNTL
! KRB5_POSIX_LOCKS
  
  AC_HAVE_HEADERS(strings.h)
  AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H))

home help back first fref pref prev next nref lref last post