diff options
| author | Theodore Tso <tytso@mit.edu> | 1998-11-16 17:58:42 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1998-11-16 17:58:42 +0000 |
| commit | 530c5da1d759dd96c2e69e0fc7e7ed34685828fa (patch) | |
| tree | e4220178fe9edfa8ea924c56420876a37a0eb9a0 /src | |
| parent | 7c66031f13570e327119aed0982f1f3a24a82754 (diff) | |
| download | krb5-530c5da1d759dd96c2e69e0fc7e7ed34685828fa.zip krb5-530c5da1d759dd96c2e69e0fc7e7ed34685828fa.tar.gz krb5-530c5da1d759dd96c2e69e0fc7e7ed34685828fa.tar.bz2 | |
aclocal.m4: Add support for FreeBSD systems using ELF (and not just
a.out systems). Also remove the definition for the KRB5_POSIX_LOCKS
test, since it is no longer needed. (See ChangeLog for
lib/krb5/os/lock_file.c for more details.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11040 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/aclocal.m4 | 35 |
2 files changed, 21 insertions, 21 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 512128e..42cc98f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +1998-11-14 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * aclocal.m4: Add support for FreeBSD systems using ELF (and not + just a.out systems). Also remove the definition for + the KRB5_POSIX_LOCKS test, since it is no longer needed. + (See ChangeLog for lib/krb5/os/lock_file.c for more details.) + 1998-09-22 Theodore Ts'o <tytso@rsts-11.mit.edu> * aclocal.m4 (AC_PROG_LEX): Autoconf "fixed" AC_PROG_LEX long diff --git a/src/aclocal.m4 b/src/aclocal.m4 index f7f5dac..aca3d0b 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -410,7 +410,8 @@ define(K5_AC_OUTPUT,[AC_OUTPUT($krb5_output_list)])dnl dnl dnl K5_OUTPUT_FILES dnl -dnl This is for compatibility purposes, and is deprecated... +dnl This is for compatibility purposes, and can be removed (once all the +dnl Makefile.in's have been checked in.) dnl define(K5_OUTPUT_FILES,[K5_AC_OUTPUT])dnl dnl @@ -496,24 +497,6 @@ AC_FUNC_CHECK(updwtmp,AC_DEFINE(HAVE_UPDWTMP)) AC_FUNC_CHECK(updwtmpx,AC_DEFINE(HAVE_UPDWTMPX)) ])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 -dnl dnl WITH_NETLIB dnl dnl @@ -1077,12 +1060,22 @@ mips-*-netbsd*) ;; *-*-freebsd*) + if test -x /usr/bin/objformat ; then + objformat=`/usr/bin/objformat` + else + objformat="aout" + fi PICFLAGS=-fpic - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' + if test "x$objformat" = "xelf" ; then + SHLIBVEXT='.so.$(LIBMAJOR)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,-R$(PROG_RPATH)' + else + SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' + fi SHLIBEXT=.so LDCOMBINE='ld -Bshareable' SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' PROFFLAGS=-pg |