mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 21:23:04 +01:00
Autoconf cleanup:
o added test for the header file mntent.h o replaced NON_MNTENT with !HAVE_MNTENT_H Removed some left-overs from Sean's DECOSF removal.
This commit is contained in:
eku
parent
905a616767
commit
40f1aad681
@ -1,4 +1,4 @@
|
||||
dnl $Id: configure.in,v 1.83 2002-11-13 10:12:27 eku Exp $
|
||||
dnl $Id: configure.in,v 1.84 2002-11-13 12:27:44 eku Exp $
|
||||
|
||||
dnl ############################# INITIALISATION ###############################
|
||||
|
||||
@ -178,6 +178,7 @@ AC_CHECK_HEADERS(varargs.h)
|
||||
AC_CHECK_HEADERS(crypt.h)
|
||||
AC_CHECK_HEADERS(netinet/in.h rpc/rpc.h netconfig.h rpc/xdr.h)
|
||||
AC_CHECK_HEADERS(aio.h)
|
||||
AC_CHECK_HEADERS(mntent.h)
|
||||
|
||||
dnl Check for libraries
|
||||
AC_CHECK_LIB(dl, main)
|
||||
@ -248,6 +249,7 @@ AC_FUNC_SETPGRP
|
||||
AC_CHECK_FUNCS(flock)
|
||||
AC_CHECK_FUNCS(initgroups)
|
||||
AC_CHECK_FUNCS(getpagesize)
|
||||
AC_CHECK_FUNCS(crypt)
|
||||
AC_CHECK_FUNCS(xdr_hyper)
|
||||
AC_CHECK_FUNCS(pread pwrite)
|
||||
|
||||
|
||||
@ -73,6 +73,7 @@
|
||||
#undef HAVE_RPC_RPC_H
|
||||
#undef HAVE_RPC_XDR_H
|
||||
#undef HAVE_AIO_H
|
||||
#undef HAVE_MNTENT_H
|
||||
|
||||
|
||||
/* Functions */
|
||||
@ -97,6 +98,7 @@
|
||||
#undef HAVE_FLOCK
|
||||
#undef HAVE_INITGROUPS
|
||||
#undef HAVE_GETPAGESIZE
|
||||
#undef HAVE_CRYPT
|
||||
#undef HAVE_XDR_HYPER
|
||||
#undef HAVE_PREAD
|
||||
#undef HAVE_PWRITE
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
*
|
||||
*/
|
||||
/*
|
||||
$Id: common.h,v 1.46 2002-11-06 07:08:44 eku Exp $
|
||||
$Id: common.h,v 1.47 2002-11-13 12:27:46 eku Exp $
|
||||
*/
|
||||
|
||||
#ifndef JRD_COMMON_H
|
||||
@ -217,7 +217,6 @@ typedef RETSIGTYPE (*SIG_FPTR) ();
|
||||
#define IEEE
|
||||
#define QUADCONST(n) (n##LL)
|
||||
#define QUADFORMAT "q"
|
||||
#define NON_MNTENT
|
||||
#define MAP_ANONYMOUS
|
||||
#define MAP_ANNON
|
||||
#define LSEEK_OFFSET_CAST (off_t)
|
||||
@ -649,31 +648,6 @@ typedef RETSIGTYPE (*SIG_FPTR) ();
|
||||
#endif /* ifndef SCO_EV */
|
||||
|
||||
|
||||
#if (defined(__osf__) && defined(__alpha))
|
||||
#include <stddef.h>
|
||||
#define NO_PYXIS
|
||||
#define KILLER_SIGNALS
|
||||
#define UNIX 1
|
||||
#define FB_ALIGN(n,b) ((n + b - 1) & ~(b - 1))
|
||||
/*#define ALIGNMENT 8*/
|
||||
/*#define DOUBLE_ALIGN 8*/
|
||||
#define IMPLEMENTATION isc_info_db_impl_alpha_osf /* 52 */
|
||||
#define IEEE
|
||||
|
||||
#define MEMMOVE(from,to,length) memmove ((void *)to, (void *)from, (size_t) length)
|
||||
#define MOVE_FAST(from,to,length) memcpy (to, from, (int) (length))
|
||||
#define MOVE_FASTER(from,to,length) memcpy (to, from, (int) (length))
|
||||
#define MOVE_CLEAR(to,length) memset (to, 0, (int) (length))
|
||||
|
||||
|
||||
#define ATOM_DEFINED
|
||||
typedef long SATOM; /* 64 bit */
|
||||
typedef unsigned long UATOM;
|
||||
|
||||
typedef RETSIGTYPE (*SIG_FPTR) ();
|
||||
#endif /* DECOSF */
|
||||
|
||||
|
||||
#ifdef UNIX
|
||||
#define NO_CHECKSUM 1
|
||||
#define SYS_ARG isc_arg_unix
|
||||
|
||||
@ -91,7 +91,7 @@ typedef struct itm {
|
||||
|
||||
/* Unix/NFS specific stuff */
|
||||
|
||||
#if (defined NFS || defined FREEBSD || defined NETBSD || defined SINIXZ)
|
||||
#ifdef HAVE_PWD_H
|
||||
#include <pwd.h>
|
||||
#endif
|
||||
|
||||
@ -107,7 +107,6 @@ typedef struct itm {
|
||||
|
||||
#ifdef SOLARIS
|
||||
#define SV_MNTENT
|
||||
#define NON_MNTENT
|
||||
#include <sys/mnttab.h>
|
||||
#define MTAB "/etc/mnttab"
|
||||
#define MTAB_OPEN(path,type) ib_fopen (path, type)
|
||||
@ -127,36 +126,26 @@ typedef struct itm {
|
||||
#endif
|
||||
|
||||
#ifdef SCO_UNIX
|
||||
#define NON_MNTENT
|
||||
#define MTAB "/etc/mount"
|
||||
#define MTAB_OPEN(path,type) popen (path, type)
|
||||
#define MTAB_CLOSE(stream) pclose (stream)
|
||||
#define GETWD(buf) getcwd (buf, MAXPATHLEN)
|
||||
#endif
|
||||
|
||||
#ifdef DECOSF
|
||||
#define NON_MNTENT
|
||||
#include <sys/types.h>
|
||||
#include <sys/mount.h>
|
||||
#endif
|
||||
|
||||
#ifdef SINIXZ
|
||||
#include <sys/mnttab.h>
|
||||
#define SV_MNTENT
|
||||
#define NON_MNTENT
|
||||
#define MTAB "/etc/mnttab"
|
||||
#define MTAB_OPEN(path,type) fopen (path, type)
|
||||
#define MTAB_CLOSE(stream) fclose (stream)
|
||||
#endif
|
||||
|
||||
#ifdef ultrix
|
||||
#define NON_MNTENT
|
||||
#include <sys/mount.h>
|
||||
#include <sys/fs_types.h>
|
||||
#endif
|
||||
|
||||
#if (defined AIX || defined AIX_PPC)
|
||||
#define NON_MNTENT
|
||||
#include <sys/vmount.h>
|
||||
#endif
|
||||
|
||||
@ -173,7 +162,7 @@ typedef struct itm {
|
||||
#define GETWD getwd
|
||||
#endif
|
||||
|
||||
#ifndef NON_MNTENT
|
||||
#ifdef HAVE_MNTENT_H
|
||||
#ifdef NFS
|
||||
#include <mntent.h>
|
||||
#define MTAB_OPEN(path,type) setmntent (path, "r")
|
||||
@ -236,7 +225,7 @@ static void share_name_from_resource(TEXT *, TEXT *, LPNETRESOURCE);
|
||||
static void share_name_from_unc(TEXT *, TEXT *, LPREMOTE_NAME_INFO);
|
||||
#endif
|
||||
|
||||
#if (defined AIX || defined AIX_PPC || defined DECOSF)
|
||||
#if (defined AIX || defined AIX_PPC)
|
||||
static BOOLEAN get_mounts(MNT *, TEXT *, TEXT **, int *);
|
||||
#else
|
||||
#ifdef ultrix
|
||||
@ -360,7 +349,7 @@ int ISC_analyze_nfs(TEXT * expanded_filename, TEXT * node_name)
|
||||
#ifdef ultrix
|
||||
while (get_mounts(&mount, mnt_buffer, &context))
|
||||
#else
|
||||
#if (defined AIX || defined AIX_PPC || defined DECOSF)
|
||||
#if (defined AIX || defined AIX_PPC)
|
||||
while (get_mounts(&mount, mnt_buffer, &temp, &context))
|
||||
#else
|
||||
if (!(mtab = MTAB_OPEN(MTAB, "r"))) {
|
||||
@ -1677,7 +1666,7 @@ static BOOLEAN get_mounts(MNT * mount, TEXT * buffer, IB_FILE * file)
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef NON_MNTENT
|
||||
#ifdef HAVE_MNTENT_H
|
||||
#define GET_MOUNTS
|
||||
static BOOLEAN get_mounts(MNT * mount, TEXT * buffer, IB_FILE * file)
|
||||
{
|
||||
@ -1724,7 +1713,7 @@ static BOOLEAN get_mounts(MNT * mount, TEXT * buffer, IB_FILE * file)
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
#endif /* HAVE_MNTENT_H */
|
||||
|
||||
|
||||
#ifndef GET_MOUNTS
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ident "$Id: config.h.in,v 1.56 2002-11-13 07:07:57 eku Exp $"
|
||||
#ident "$Id: config.h.in,v 1.57 2002-11-13 12:27:47 eku Exp $"
|
||||
|
||||
/*
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete ports:
|
||||
@ -54,6 +54,7 @@
|
||||
#undef HAVE_RPC_RPC_H
|
||||
#undef HAVE_RPC_XDR_H
|
||||
#undef HAVE_AIO_H
|
||||
#undef HAVE_MNTENT_H
|
||||
|
||||
|
||||
/* Functions */
|
||||
@ -78,6 +79,7 @@
|
||||
#undef HAVE_FLOCK
|
||||
#undef HAVE_INITGROUPS
|
||||
#undef HAVE_GETPAGESIZE
|
||||
#undef HAVE_CRYPT
|
||||
#undef HAVE_XDR_HYPER
|
||||
#undef HAVE_PREAD
|
||||
#undef HAVE_PWRITE
|
||||
|
||||
Loading…
Reference in New Issue
Block a user