|
@@ -65,9 +65,6 @@
|
|
|
*
|
|
|
* OPT_PATCH -- if defined, build patch info into objects
|
|
|
*
|
|
|
- * OPT_BUG_SUNOS_4 -- used to flag special hacks only needed because
|
|
|
- * of bugs or quirks in SunOS 4.x.
|
|
|
- *
|
|
|
* OPT_BUG_SUNOS_5 -- used to flag special hacks only needed because
|
|
|
* of bugs or quirks in SunOS 5.x.
|
|
|
*
|
|
@@ -77,9 +74,9 @@
|
|
|
* OPT_XDR_LONG_TYPE -- used for (64-bit) architectures where
|
|
|
* <rcp/xdr.h> defines x_putlong and x_getlong to not take "long*".
|
|
|
*
|
|
|
- * OPT_POSIX_SIGNAL -- set to assume posix-style sigaction() call.
|
|
|
+ * OPT_POSIX_SIGNAL -- set to assume posix-style sigaction() call (default).
|
|
|
* OPT_BSD_SIGNAL -- set to assume bsd-style signal() call.
|
|
|
- * If *neither* OPT_POSIX_SIGNAL or OPT_BSD_SIGNAL is defined, use
|
|
|
+ * If OPT_POSIX_SIGNAL is undefined and OPT_BSD_SIGNAL is not set, use
|
|
|
* the old SVR2-style sigset().
|
|
|
*
|
|
|
* OPT_BSD_WAIT -- set to assume bsd-style wait() calls, which expect
|
|
@@ -117,9 +114,6 @@
|
|
|
* the tttarfile file will appear after extracts, a small flaw but not a
|
|
|
* fatal one.
|
|
|
*
|
|
|
- * OPT_HAS_REALPATH -- set if the system provides a realpath() library
|
|
|
- * function; otherwise we'll use our local copy.
|
|
|
- *
|
|
|
* OPT_PING_TRIES - The number of times to rpc-ping ttsession to
|
|
|
* see if ttsession is alive.
|
|
|
*
|
|
@@ -191,136 +185,50 @@
|
|
|
# define GNU_STRCAST
|
|
|
#endif
|
|
|
|
|
|
-/*
|
|
|
- * To avoid ugly cpp command-line options, we instead centralize
|
|
|
- * in the following code all knowledge about deducing the OS version
|
|
|
- * from the definitions cpp gives us.
|
|
|
- */
|
|
|
-#if defined(sun)
|
|
|
-# if !defined(OS_VERSION)
|
|
|
-# if defined(OSMajorVersion)
|
|
|
-# define OS_VERSION OSMajorVersion
|
|
|
-# define OS_MINOR_VERSION OSMinorVersion
|
|
|
-# else
|
|
|
-# if !defined(_STDIO_H) && !defined(__stdio_h)
|
|
|
-# include <stdio.h>
|
|
|
-# endif
|
|
|
-# if defined(_SIZE_T)
|
|
|
-# define OS_VERSION 5
|
|
|
-# else
|
|
|
-# define OS_VERSION 4
|
|
|
-# endif
|
|
|
-# endif
|
|
|
-# endif
|
|
|
+#undef OPT_CPP_PATH
|
|
|
+#define OPT_CPP_PATH CPP_PROGRAM
|
|
|
+
|
|
|
+#ifdef sun
|
|
|
+#define OPT_CPP_OPTIONS "-B"
|
|
|
+#else
|
|
|
+#define OPT_BUG_RPCINTR
|
|
|
+#define OPT_CPP_OPTIONS ""
|
|
|
+#define OPT_AUTOMOUNT_PATH_FIX
|
|
|
+#define OPT_DEFINE_SIG_PF
|
|
|
#endif
|
|
|
|
|
|
+#ifdef __linux__
|
|
|
+#define OPT_LOCAL_MOUNT_TYPE "ext2fs"
|
|
|
+#else
|
|
|
+#define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS
|
|
|
+#endif
|
|
|
+
|
|
|
+#define OPT_POSIX_SIGNAL
|
|
|
+#define OPT_CATGETS
|
|
|
+#define OPT_TAR_HAS_EXCLUDE_OPTION
|
|
|
+
|
|
|
#if defined(_AIX)
|
|
|
-# undef OPT_UNIX_SOCKET_RPC
|
|
|
-# undef OPT_TLI
|
|
|
-# undef OPT_DLOPEN_X11
|
|
|
-# undef OPT_DLOPEN_CE
|
|
|
-# undef OPT_ADDMSG_DIRECT
|
|
|
+# undef OPT_BUG_RPCINTR
|
|
|
+# undef OPT_LOCAL_MOUNT_TYPE
|
|
|
+# undef OPT_TAR_HAS_EXCLUDE_OPTION
|
|
|
# define OPT_BUG_AIX
|
|
|
-# undef OPT_SECURE_RPC
|
|
|
-# undef OPT_CLASSING_ENGINE
|
|
|
-# undef OPT_BSD_SIGNAL
|
|
|
-# define OPT_POSIX_SIGNAL
|
|
|
-# undef OPT_BSD_WAIT
|
|
|
-# undef OPT_DGETTEXT
|
|
|
-# define OPT_CATGETS
|
|
|
# define OPT_GETDTABLESIZE
|
|
|
-# undef OPT_SYSINFO
|
|
|
-# define OPT_CPP_PATH "/usr/ccs/lib/cpp"
|
|
|
-# define OPT_CPP_OPTIONS ""
|
|
|
-# undef OPT_SVR4_GETMNTENT
|
|
|
-# undef OPT_LOCKF_MNTENT
|
|
|
-# define OPT_DEFINE_SIG_PF
|
|
|
-# undef OPT_TAR_HAS_EXCLUDE_OPTION
|
|
|
-# undef OPT_HAS_REALPATH
|
|
|
-# define OPT_AUTOMOUNT_PATH_FIX
|
|
|
/* # define OPT_XTHREADS 1 */ /* Defaulted by -DXTHREADS */
|
|
|
|
|
|
-#elif defined(sun) && (OS_VERSION <= 4)
|
|
|
-
|
|
|
-# define OPT_UNIX_SOCKET_RPC
|
|
|
-# undef OPT_TLI
|
|
|
- /* for 4.1.1 systems turning on any dlopen features on the */
|
|
|
- /* client side would break clients with ld errors unless they */
|
|
|
- /* linked with -ldl. OPT_DLOPEN_CE is ok since clients don't */
|
|
|
- /* ever execute ce_* functions. */
|
|
|
-# undef OPT_DLOPEN_X11
|
|
|
-# undef OPT_DLOPEN_CE
|
|
|
-# undef OPT_ADDMSG_DIRECT
|
|
|
-# define OPT_SECURE_RPC
|
|
|
-# undef OPT_CLASSING_ENGINE
|
|
|
-# undef OPT_PATCH
|
|
|
-# define OPT_BSD_SIGNAL
|
|
|
-# define OPT_BSD_WAIT
|
|
|
-# define OPT_DGETTEXT
|
|
|
-# undef OPT_CATGETS
|
|
|
-# undef OPT_GETDTABLESIZE
|
|
|
-# undef OPT_SYSINFO
|
|
|
-# define OPT_CPP_PATH "/usr/lib/cpp"
|
|
|
-# define OPT_CPP_OPTIONS "-B"
|
|
|
-# undef OPT_SVR4_GETMNTENT
|
|
|
-# undef OPT_LOCKF_MNTENT
|
|
|
-# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_42
|
|
|
-# undef OPT_OLD_RPC
|
|
|
-# undef OPT_DEFINE_SIG_PF
|
|
|
-# define OPT_TAR_HAS_EXCLUDE_OPTION
|
|
|
-
|
|
|
-# define OPT_BUG_SUNOS_4
|
|
|
-
|
|
|
-# define OPT_HAS_REALPATH
|
|
|
-# undef OPT_AUTOMOUNT_PATH_FIX
|
|
|
-
|
|
|
#elif defined(sun) && (OS_VERSION >= 5)
|
|
|
-
|
|
|
-# undef OPT_UNIX_SOCKET_RPC
|
|
|
# define OPT_TLI
|
|
|
-# undef OPT_DLOPEN_X11
|
|
|
-# undef OPT_DLOPEN_CE
|
|
|
-# undef OPT_ADDMSG_DIRECT
|
|
|
# define OPT_SECURE_RPC
|
|
|
-# undef OPT_CLASSING_ENGINE
|
|
|
-# undef OPT_BSD_SIGNAL
|
|
|
-# define OPT_POSIX_SIGNAL
|
|
|
-# undef OPT_BSD_WAIT
|
|
|
-# undef OPT_DGETTEXT
|
|
|
-# define OPT_CATGETS
|
|
|
-# undef OPT_GETDTABLESIZE
|
|
|
# define OPT_SYSINFO
|
|
|
-# define OPT_CPP_PATH "/usr/ccs/lib/cpp"
|
|
|
-# define OPT_CPP_OPTIONS "-B"
|
|
|
# define OPT_SVR4_GETMNTENT
|
|
|
# define OPT_LOCKF_MNTENT
|
|
|
-# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS
|
|
|
-# undef OPT_DEFINE_SIG_PF
|
|
|
-# define OPT_TAR_HAS_EXCLUDE_OPTION
|
|
|
|
|
|
-# define OPT_HAS_REALPATH
|
|
|
-# undef OPT_AUTOMOUNT_PATH_FIX
|
|
|
-
|
|
|
-/* Does not work on X86 */
|
|
|
-# if defined(i386) && OS_MINOR_VERSION <= 4
|
|
|
-# undef OPT_GARBAGE_THREADS
|
|
|
-# undef OPT_SOLARIS_THREADED_TRIES
|
|
|
-# else
|
|
|
-# define OPT_SOLARIS_THREADS 1
|
|
|
+# define OPT_SOLARIS_THREADS 1
|
|
|
/* # define OPT_XTHREADS 1 */ /* Defaulted by -DXTHREADS */
|
|
|
-# define OPT_GARBAGE_THREADS 1
|
|
|
-# define OPT_SOLARIS_THREADED_TRIES 10
|
|
|
-# endif
|
|
|
-
|
|
|
-/* Solaris 2.5 and above, supports clnt_create_timed(3N) */
|
|
|
-# if (OS_MINOR_VERSION >= 5)
|
|
|
-# define OPT_HAS_CLNT_CREATE_TIMED 1
|
|
|
-# define OPT_CLNT_CREATE_TIMEOUT 30
|
|
|
-# endif
|
|
|
+# define OPT_GARBAGE_THREADS 1
|
|
|
+# define OPT_SOLARIS_THREADED_TRIES 10
|
|
|
|
|
|
-/* TURN THESE OFF FOR NOW */
|
|
|
-# undef OPT_GARBAGE_IN_PARALLEL
|
|
|
-# undef OPT_GARBAGE_THREADS
|
|
|
+# define OPT_HAS_CLNT_CREATE_TIMED 1
|
|
|
+# define OPT_CLNT_CREATE_TIMEOUT 30
|
|
|
|
|
|
/* Turn ON/OFF parallel threads for garbage collection */
|
|
|
# if defined(OPT_DO_AUTO_GARBAGE_COLLECT) && defined(OPT_SOLARIS_THREADS)
|
|
@@ -328,140 +236,23 @@
|
|
|
# define OPT_GARBAGE_THREADS 1
|
|
|
# else
|
|
|
# define OPT_GARBAGE_IN_PARALLEL 0 /* used as a const */
|
|
|
-# undef OPT_GARBAGE_THREADS
|
|
|
# endif
|
|
|
|
|
|
#elif defined(__linux__)
|
|
|
-
|
|
|
-# undef OPT_UNIX_SOCKET_RPC
|
|
|
-# undef OPT_TLI
|
|
|
-# undef OPT_DLOPEN_X11
|
|
|
-# undef OPT_DLOPEN_CE
|
|
|
-# undef OPT_ADDMSG_DIRECT
|
|
|
-# undef OPT_SECURE_RPC
|
|
|
-# undef OPT_CLASSING_ENGINE
|
|
|
-# undef OPT_PATCH
|
|
|
-# define OPT_POSIX_SIGNAL
|
|
|
-# undef OPT_BSD_WAIT
|
|
|
-# undef OPT_DGETTEXT
|
|
|
-# define OPT_CATGETS
|
|
|
-# undef OPT_GETDTABLESIZE
|
|
|
-# undef OPT_SYSINFO
|
|
|
-# define OPT_CPP_PATH "/usr/bin/cpp"
|
|
|
-# define OPT_CPP_OPTIONS ""
|
|
|
-# undef OPT_SVR4_GETMNTENT
|
|
|
-# undef OPT_LOCKF_MNTENT
|
|
|
-# define OPT_LOCAL_MOUNT_TYPE "ext2fs"
|
|
|
-# undef OPT_OLD_RPC
|
|
|
-# define OPT_DEFINE_SIG_PF
|
|
|
-# define OPT_TAR_HAS_EXCLUDE_OPTION
|
|
|
-# define OPT_HAS_REALPATH
|
|
|
-# define OPT_AUTOMOUNT_PATH_FIX
|
|
|
-# define OPT_BUG_RPCINTR
|
|
|
-# undef OPT_XTHREADS
|
|
|
# define OPT_CONST_CORRECT
|
|
|
|
|
|
#elif defined(__OpenBSD__)
|
|
|
|
|
|
-# undef OPT_UNIX_SOCKET_RPC
|
|
|
-# undef OPT_TLI
|
|
|
-# undef OPT_DLOPEN_X11
|
|
|
-# undef OPT_DLOPEN_CE
|
|
|
-# undef OPT_ADDMSG_DIRECT
|
|
|
-# undef OPT_SECURE_RPC
|
|
|
-# undef OPT_CLASSING_ENGINE
|
|
|
-# undef OPT_PATCH
|
|
|
-# define OPT_POSIX_SIGNAL
|
|
|
-# undef OPT_BSD_WAIT
|
|
|
-# undef OPT_DGETTEXT
|
|
|
-# define OPT_CATGETS
|
|
|
-# undef OPT_GETDTABLESIZE
|
|
|
-# undef OPT_SYSINFO
|
|
|
-# define OPT_CPP_PATH "/usr/libexec/cpp"
|
|
|
-# define OPT_CPP_OPTIONS ""
|
|
|
-# undef OPT_SVR4_GETMNTENT
|
|
|
-# undef OPT_LOCKF_MNTENT
|
|
|
-# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS
|
|
|
-# undef OPT_OLD_RPC
|
|
|
-# define OPT_DEFINE_SIG_PF
|
|
|
-# define OPT_TAR_HAS_EXCLUDE_OPTION
|
|
|
-# define OPT_HAS_REALPATH
|
|
|
-# define OPT_AUTOMOUNT_PATH_FIX
|
|
|
-# define OPT_BUG_RPCINTR
|
|
|
-# undef OPT_XTHREADS
|
|
|
-
|
|
|
#elif defined(__FreeBSD__)
|
|
|
-# undef OPT_UNIX_SOCKET_RPC
|
|
|
-# undef OPT_TLI
|
|
|
-# undef OPT_DLOPEN_X11
|
|
|
-# undef OPT_DLOPEN_CE
|
|
|
-# undef OPT_ADDMSG_DIRECT
|
|
|
-# undef OPT_SECURE_RPC
|
|
|
-# undef OPT_CLASSING_ENGINE
|
|
|
-# undef OPT_PATCH
|
|
|
-# define OPT_POSIX_SIGNAL
|
|
|
-# undef OPT_BSD_WAIT
|
|
|
-# undef OPT_DGETTEXT
|
|
|
-# define OPT_CATGETS
|
|
|
-# undef OPT_GETDTABLESIZE
|
|
|
-# undef OPT_SYSINFO
|
|
|
-# if defined(OSMAJORVERSION) && (OSMAJORVERSION >= 5)
|
|
|
-# define OPT_CPP_PATH "/usr/bin/cpp"
|
|
|
-# else
|
|
|
-# define OPT_CPP_PATH "/usr/libexec/cpp"
|
|
|
-# endif
|
|
|
-# define OPT_CPP_OPTIONS ""
|
|
|
-# undef OPT_SVR4_GETMNTENT
|
|
|
-# undef OPT_LOCKF_MNTENT
|
|
|
-# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS
|
|
|
-# undef OPT_OLD_RPC
|
|
|
-# define OPT_DEFINE_SIG_PF
|
|
|
-# define OPT_TAR_HAS_EXCLUDE_OPTION
|
|
|
-# define OPT_HAS_REALPATH
|
|
|
-# define OPT_AUTOMOUNT_PATH_FIX
|
|
|
-# define OPT_BUG_RPCINTR
|
|
|
-# undef OPT_XTHREADS
|
|
|
# define OPT_CONST_CORRECT
|
|
|
|
|
|
#elif defined(__NetBSD__)
|
|
|
-# undef OPT_UNIX_SOCKET_RPC
|
|
|
-# undef OPT_TLI
|
|
|
-# undef OPT_DLOPEN_X11
|
|
|
-# undef OPT_DLOPEN_CE
|
|
|
-# undef OPT_ADDMSG_DIRECT
|
|
|
-# undef OPT_SECURE_RPC
|
|
|
-# undef OPT_CLASSING_ENGINE
|
|
|
-# undef OPT_PATCH
|
|
|
-# define OPT_POSIX_SIGNAL
|
|
|
-# undef OPT_BSD_WAIT
|
|
|
-# undef OPT_DGETTEXT
|
|
|
-# define OPT_CATGETS
|
|
|
-# undef OPT_GETDTABLESIZE
|
|
|
-# undef OPT_SYSINFO
|
|
|
-# define OPT_CPP_PATH "/usr/bin/cpp"
|
|
|
-# define OPT_CPP_OPTIONS ""
|
|
|
-# undef OPT_SVR4_GETMNTENT
|
|
|
-# undef OPT_LOCKF_MNTENT
|
|
|
-# define OPT_LOCAL_MOUNT_TYPE MNTTYPE_UFS
|
|
|
-# undef OPT_OLD_RPC
|
|
|
-# define OPT_DEFINE_SIG_PF
|
|
|
-# define OPT_TAR_HAS_EXCLUDE_OPTION
|
|
|
-# define OPT_HAS_REALPATH
|
|
|
-# define OPT_AUTOMOUNT_PATH_FIX
|
|
|
-# define OPT_BUG_RPCINTR
|
|
|
-# undef OPT_XTHREADS
|
|
|
# define OPT_CONST_CORRECT
|
|
|
# define HAS_STATVFS
|
|
|
|
|
|
#else
|
|
|
/* Unknown configuration, complain */
|
|
|
-}}}} You must edit lib/tt_options.h and add a section defining the options for your configuration.
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifdef CPP_PROGRAM
|
|
|
-# undef OPT_CPP_PATH
|
|
|
-# define OPT_CPP_PATH CPP_PROGRAM
|
|
|
+#warning "Your system is unknown to us, things might not build properly without editing tt_options.h"
|
|
|
#endif
|
|
|
|
|
|
#endif /* _TT_OPTIONS_H */
|