diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ace.m4 | 298 | ||||
| -rw-r--r-- | m4/compiler.m4 | 8 | ||||
| -rw-r--r-- | m4/config_h.m4 | 134 | ||||
| -rw-r--r-- | m4/platform.m4 | 125 | ||||
| -rw-r--r-- | m4/subsets.m4 | 40 | ||||
| -rw-r--r-- | m4/threads.m4 | 6 |
6 files changed, 213 insertions, 398 deletions
diff --git a/m4/ace.m4 b/m4/ace.m4 index 4b8d34bfe72..c9e89b16656 100644 --- a/m4/ace.m4 +++ b/m4/ace.m4 @@ -24,108 +24,6 @@ dnl Macros that add ACE configuration options to a `configure' script. dnl ACE_CONFIGURATION_OPTIONS AC_DEFUN([ACE_CONFIGURATION_OPTIONS], [ - AC_ARG_ENABLE([ace-codecs], - AS_HELP_STRING(--enable-ace-codecs,build ACE with codecs support [[[yes]]]), - [ - case "${enableval}" in - yes) - ace_user_enable_ace_codecs=yes - ;; - no) - ace_user_enable_ace_codecs=no - ;; - *) - AC_MSG_ERROR([bad value ${enableval} for --enable-ace-codecs]) - ;; - esac - ], - [ - ace_user_enable_ace_codecs=yes - ]) - AM_CONDITIONAL([BUILD_ACE_CODECS], [test X$ace_user_enable_ace_codecs = Xyes]) - - AC_ARG_ENABLE([ace-filecache], - AS_HELP_STRING(--enable-ace-filecache,build ACE_Filecache support [[[yes]]]), - [ - case "${enableval}" in - yes) - ace_user_enable_ace_filecache=yes - ;; - no) - ace_user_enable_ace_filecache=no - ;; - *) - AC_MSG_ERROR([bad value ${enableval} for --enable-ace-filecache]) - ;; - esac - ], - [ - dnl Enable ACE_Filecache support by default since it's never turned off - dnl in the ACE lib itself. Just required for some things like JAWS. - ace_user_enable_ace_filecache=yes - ]) - AM_CONDITIONAL([BUILD_ACE_FILECACHE], [test X$ace_user_enable_ace_filecache = Xyes]) - - AC_ARG_ENABLE([ace-other], - AS_HELP_STRING(--enable-ace-other,build ACE with all misc pieces [[[yes]]]), - [ - case "${enableval}" in - yes) - ace_user_enable_ace_other=yes - ;; - no) - ace_user_enable_ace_other=no - ;; - *) - AC_MSG_ERROR([bad value ${enableval} for --enable-ace-other]) - ;; - esac - ], - [ - ace_user_enable_ace_other=yes - ]) - AM_CONDITIONAL([BUILD_ACE_OTHER], [test X$ace_user_enable_ace_other = Xyes]) - - AC_ARG_ENABLE([ace-token], - AS_HELP_STRING(--enable-ace-token,build ACE with tokens support [[[yes]]]), - [ - case "${enableval}" in - yes) - ace_user_enable_ace_token=yes - ;; - no) - ace_user_enable_ace_token=no - ;; - *) - AC_MSG_ERROR([bad value ${enableval} for --enable-ace-token]) - ;; - esac - ], - [ - ace_user_enable_ace_token=yes - ]) - AM_CONDITIONAL([BUILD_ACE_TOKEN], [test X$ace_user_enable_ace_token = Xyes]) - - AC_ARG_ENABLE([ace-uuid], - AS_HELP_STRING(--enable-ace-uuid,build ACE with UUID support [[[yes]]]), - [ - case "${enableval}" in - yes) - ace_user_enable_ace_uuid=yes - ;; - no) - ace_user_enable_ace_uuid=no - ;; - *) - AC_MSG_ERROR([bad value ${enableval} for --enable-ace-uuid]) - ;; - esac - ], - [ - ace_user_enable_ace_uuid=yes - ]) - AM_CONDITIONAL([BUILD_ACE_UUID], [test X$ace_user_enable_ace_uuid = Xyes]) - AC_ARG_ENABLE([alloca], AS_HELP_STRING(--enable-alloca,compile with alloca() support [[[no]]]), [ @@ -147,23 +45,6 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS], ace_user_enable_alloca=no ]) - AC_ARG_ENABLE([rwho], - AS_HELP_STRING(--enable-rwho,build the distributed rwho program [[[no]]]), - [ - case "${enableval}" in - yes) - ace_user_enable_rwho=yes - ;; - no) - ace_user_enable_rwho=no - ;; - *) - AC_MSG_ERROR([bad value ${enableval} for --enable-rwho]) - ;; - esac - ],) - AM_CONDITIONAL([BUILD_RWHO], [test X$ace_user_enable_rwho = Xyes]) - AC_ARG_ENABLE([ipv4-ipv6], AS_HELP_STRING(--enable-ipv4-ipv6,compile with IPv4/IPv6 migration support [[[no]]]), [ @@ -314,7 +195,6 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS], [ ace_user_enable_threads=yes ]) - AM_CONDITIONAL([BUILD_THREADS], [test X$ace_user_enable_threads = Xyes]) AC_ARG_ENABLE([verb-not-sup], AS_HELP_STRING(--enable-verb-not-sup,enable verbose ENOTSUP reports [[[no]]]), @@ -350,60 +230,6 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS], AC_DEFINE([ACE_NTRACE]) ]) - AC_ARG_ENABLE([wfmo], - AS_HELP_STRING(--enable-wfmo,build WFMO-using examples [[[no]]]), - [ - case "${enableval}" in - yes) - ace_user_enable_wfmo=yes - ;; - no) - ace_user_enable_wfmo=no - ;; - *) - AC_MSG_ERROR([bad value ${enableval} for --enable-rtti]) - ;; - esac - ], - [ - case "$host" in - *win*) - ace_user_enable_wfmo=yes - ;; - *) - ace_user_enable_wfmo=no - ;; - esac - ]) - AM_CONDITIONAL([BUILD_WFMO], [test X$ace_user_enable_wfmo = Xyes]) - - AC_ARG_ENABLE([winregistry], - AS_HELP_STRING(--enable-winregistry,build Windows registry-using examples [[[no]]]), - [ - case "${enableval}" in - yes) - ace_user_enable_winregistry=no - ;; - no) - ace_user_enable_winregistry=no - ;; - *) - AC_MSG_ERROR([bad value ${enableval} for --enable-rtti]) - ;; - esac - ], - [ - case "$host" in - *win*) - ace_user_enable_winregistry=yes - ;; - *) - ace_user_enable_winregistry=no - ;; - esac - ]) - AM_CONDITIONAL([BUILD_WINREGISTRY], [test X$ace_user_enable_winregistry = Xyes]) - AC_ARG_ENABLE([xt-reactor], AS_HELP_STRING(--enable-xt-reactor,build support for the XtReactor [[[no]]]), [ @@ -484,9 +310,65 @@ dnl line, then "no_x" is set to "yes." ]) AM_CONDITIONAL([COMPILE_GPERF], [test X$ace_user_with_gperf = Xyes]) - ACE_WITH_RMCAST - ACE_WITH_QOS - ACE_WITH_SSL + AC_ARG_WITH([rmcast], + AS_HELP_STRING(--with-rmcast,compile the ACE_RMCast library [[[yes]]]), + [ + case "${withval}" in + yes) + ace_user_with_rmcast=yes + ;; + no) + ace_user_with_rmcast=no + ;; + *) + AC_MSG_ERROR([bad value ${withval} for --with-rmcast]) + ;; + esac + ], + [ + ace_user_with_rmcast=yes + ]) + AM_CONDITIONAL([BUILD_RMCAST], [test X$ace_user_with_rmcast = Xyes]) + + AC_ARG_WITH([qos], + AS_HELP_STRING(--with-qos,compile the ACE_QoS library [[[no]]]), + [ + case "${withval}" in + yes) + ace_user_with_qos=yes + ;; + no) + ace_user_with_qos=no + ;; + *) + AC_MSG_ERROR([bad value ${withval} for --with-qos]) + ;; + esac + ], + [ + ace_user_with_qos=no + ]) + AM_CONDITIONAL([BUILD_QOS], [test X$ace_user_with_qos = Xyes]) + + AC_ARG_WITH([ssl], + AS_HELP_STRING(--with-ssl,compile the ACE_SSL library [[[yes]]]), + [ + case "${withval}" in + yes) + ace_user_with_ssl=yes + ;; + no) + ace_user_with_ssl=no + ;; + *) + AC_MSG_ERROR([bad value ${withval} for --with-ssl]) + ;; + esac + ], + [ + ace_user_with_ssl=yes + ]) +AM_CONDITIONAL([BUILD_SSL], [test X$ace_user_with_ssl = Xyes]) AC_ARG_WITH([tao], AS_HELP_STRING(--with-tao,build TAO (the ACE ORB) [[[yes]]]), @@ -601,7 +483,7 @@ dnl ACE_CXXFLAGS="$ACE_CXXFLAGS -fno-exceptions" dnl fi dnl fi ]) - AM_CONDITIONAL([BUILD_EXCEPTIONS], [test X$ace_user_enable_exceptions = Xyes]) + AC_ARG_ENABLE([fast], AS_HELP_STRING(--enable-fast,enable -fast flag (e.g. Sun C++) [[[no]]]), @@ -829,63 +711,3 @@ dnl fi ]) ]) - -AC_DEFUN([ACE_WITH_RMCAST], -[AC_ARG_WITH([rmcast], - AS_HELP_STRING([--with-rmcast], - [compile/use the ACE_RMCast library [[yes]]]), - [case "${withval}" in - yes) - ace_user_with_rmcast=yes - ;; - no) - ace_user_with_rmcast=no - ;; - *) - AC_MSG_ERROR(bad value ${withval} for --with-rmcast) - ;; - esac]) -AC_CACHE_CHECK([whether to compile/use the ACE_RMCast library], - [ace_user_with_rmcast],[ace_user_with_rmcast=yes]) -AM_CONDITIONAL([BUILD_RMCAST], [test X$ace_user_with_rmcast = Xyes]) -]) - -AC_DEFUN([ACE_WITH_QOS], -[AC_ARG_WITH([qos], - AS_HELP_STRING([--with-qos], - [compile/use the ACE_QoS library [[no]]]), - [case "${withval}" in - yes) - ace_user_with_qos=yes - ;; - no) - ace_user_with_qos=no - ;; - *) - AC_MSG_ERROR(bad value ${withval} for --with-qos) - ;; - esac]) -AC_CACHE_CHECK([whether to compile/use the ACE_QoS library], - [ace_user_with_qos],[ace_user_with_qos=no]) -AM_CONDITIONAL([BUILD_QOS], [test X$ace_user_with_qos = Xyes]) -]) - -AC_DEFUN([ACE_WITH_SSL], -[AC_ARG_WITH([ssl], - AS_HELP_STRING([--with-ssl], - [compile/use the ACE_SSL library [[yes]]]), - [case "${withval}" in - yes) - ace_user_with_ssl=yes - ;; - no) - ace_user_with_ssl=no - ;; - *) - AC_MSG_ERROR(bad value ${withval} for --with-ssl) - ;; - esac]) -AC_CACHE_CHECK([whether to compile/use the ACE_SSL library], - [ace_user_with_ssl], [ace_user_with_ssl=yes]) -AM_CONDITIONAL([BUILD_SSL], [test X$ace_user_with_ssl = Xyes]) -]) diff --git a/m4/compiler.m4 b/m4/compiler.m4 index 721af9ac6cf..603112d53f9 100644 --- a/m4/compiler.m4 +++ b/m4/compiler.m4 @@ -38,6 +38,14 @@ dnl AC_BEFORE([$0], [AC_PROG_LIBTOOL]) AC_REQUIRE([ACE_COMPILATION_OPTIONS]) if test "$GXX" = yes; then +dnl Temporarily change M4 quotes to prevent "regex []" from being eaten + if $CXX --version | $EGREP -v '^2\.[[0-7]]' > /dev/null; then + : # Do nothing + else + AC_DEFINE([ACE_HAS_GNUG_PRE_2_8]) + AC_DEFINE([ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS]) + fi + case `$CXX --version` in 2.9* | 3*) if test "$ace_user_enable_exceptions" != yes; then diff --git a/m4/config_h.m4 b/m4/config_h.m4 index d7662bdabdc..8acf5a0b942 100644 --- a/m4/config_h.m4 +++ b/m4/config_h.m4 @@ -62,8 +62,14 @@ AH_TEMPLATE([ACE_LACKS_SYSTIMES_H],[The `sys/times.h' header is unavailable]) AH_TEMPLATE([ACE_LACKS_UNBUFFERED_STREAMBUF],[]) AH_TEMPLATE([ACE_HAS_STDCPP_STL_INCLUDES],[]) +AH_TEMPLATE([ACE_HAS_LIBC_H],[]) +AH_TEMPLATE([ACE_HAS_OSFCN_H],[]) AH_TEMPLATE([ACE_HAS_NEW_NO_H],[Platform provides new style C++ <new> header]) +AH_TEMPLATE([ACE_HAS_NEW_H],[Platform provides C++ <new.h> header]) AH_TEMPLATE([ACE_HAS_STDEXCEPT_NO_H],[Platform provides C++ <stdexcept> header]) +AH_TEMPLATE([ACE_HAS_EXCEPTION_H],[Platform provides C++ <exception.h> header]) + +AH_TEMPLATE([ACE_HAS_SYS_IOCTL_H],[Platform provides <sys/ioctl.h> header.]) dnl Deprecated! (or soon to be?) AH_TEMPLATE([ACE_HAS_OSF1_GETTIMEOFDAY], @@ -125,7 +131,7 @@ dnl MVS specific configuration parameters dnl Nothing yet dnl NetBSD specific configuration parameters -dnl Nothing yet +AH_TEMPLATE([ACE_NETBSD],[Configure for use on NetBSD]) dnl OSF/1 and Digital Unix specific configuration parameters AH_TEMPLATE([DEC_CXX],[]) @@ -189,6 +195,7 @@ AH_TEMPLATE([ACE_HAS_DLL],[Build ACE using the frigging PC DLL nonsense...]) AH_TEMPLATE([ACE_HAS_STRICT],[Use the STRICT compilation mode on Win32.]) AH_TEMPLATE([CYGWIN32], [GNU Win32 environement]) +AH_TEMPLATE([ACE_HAS_CYGWIN32_SOCKET_H],[Platform has cygwin32 socket.h.]) dnl ACE internals @@ -201,6 +208,7 @@ AH_TEMPLATE([ACE_MALLOC_ALIGN],[]) AH_TEMPLATE([ACE_MAP_PRIVATE],[]) AH_TEMPLATE([ACE_THR_PRI_FIFO_DEF],[]) AH_TEMPLATE([ACE_TIMER_SKEW],[]) +AH_TEMPLATE([ACE_UINT64_FORMAT_SPECIFIER],[The format specifier (e.g. "%Lu") for the 64 bit unsigned integer type]) AH_TEMPLATE([ACE_USE_RCSID],[Enable embedding of global RCS ID strings into compiled object file]) AH_TEMPLATE([IP_ADD_MEMBERSHIP],[]) AH_TEMPLATE([IP_DROP_MEMBERSHIP],[]) @@ -209,7 +217,6 @@ AH_TEMPLATE([IP_DROP_MEMBERSHIP],[]) dnl Specify sizes of given built-in types. If a size isn't defined here, dnl then ace/Basic_Types.h will attempt to deduce the size. dnl AH_TEMPLATE([ACE_SIZEOF_CHAR],[Size of native "char" type]) -AH_TEMPLATE([ACE_SIZEOF_WCHAR],[Size of native "wchar_t" type]) AH_TEMPLATE([ACE_SIZEOF_SHORT],[Size of the native "short" type]) AH_TEMPLATE([ACE_SIZEOF_INT],[Size of the native "int" type]) AH_TEMPLATE([ACE_SIZEOF_LONG],[Size of the native "long" type]) @@ -261,6 +268,9 @@ AH_TEMPLATE([ACE_THREADS_DONT_INHERIT_LOG_MSG], [Specify this if you don't want threads to inherit parent thread's ACE_Log_Msg properties.]) +AH_TEMPLATE([ACE_HAS_ONE_DEFINITION_RULE], +[Compiler enforces C++ One Definition Rule]) + AH_TEMPLATE([ACE_HAS_PRIOCNTL],[OS has priocntl (2)]) AH_TEMPLATE([ACE_HAS_RLIMIT_RESOURCE_ENUM], @@ -359,9 +369,19 @@ AH_TEMPLATE([ACE_HAS_BROKEN_RANDR], [OS/compiler's header files are inconsistent with libC definition of rand_r().]) +AH_TEMPLATE([ACE_HAS_BROKEN_READV], +[OS/Compiler's header files are not consistent with readv() definition.]) + AH_TEMPLATE([ACE_HAS_BROKEN_SAP_ANY], [Compiler can't handle the static ACE_Addr::sap_any construct.]) +AH_TEMPLATE([ACE_HAS_BROKEN_SENDMSG], +[OS/compiler omits the const from the sendmsg() prototype.]) + +AH_TEMPLATE([ACE_HAS_BROKEN_SETRLIMIT], +[OS/compiler omits the const from the rlimit parameter in the +setrlimit() prototype.]) + AH_TEMPLATE([ACE_HAS_BROKEN_T_ERROR], [Compiler/platform has the wrong prototype for t_error(), i.e., t_error(char *) rather than t_error(const char *).]) @@ -371,9 +391,15 @@ AH_TEMPLATE([ACE_HAS_BROKEN_TIMESPEC_MEMBERS], instead of tv_sec and tv_nsec. This is highly non-portable. Currently only FreeBSD 2.1.x uses it.]) +AH_TEMPLATE([ACE_HAS_BROKEN_WRITEV], +[OS/compiler omits the const from the iovec parameter in the +writev() prototype.]) + AH_TEMPLATE([ACE_HAS_BSTRING], [Platform has <bstring.h> (which contains bzero() prototype)]) +AH_TEMPLATE([ACE_HAS_BYTESEX_H],[Platform has <bytesex.h>.]) + AH_TEMPLATE([ACE_HAS_CHARPTR_DL], [OS/platform uses char * for dlopen/dlsym args, rather than const char *.]) @@ -404,10 +430,21 @@ AH_TEMPLATE([ACE_HAS_EXCEPTIONS],[Compiler supports C++ exception handling.]) AH_TEMPLATE([ACE_HAS_FL],[Platform has Fast-Light (FL) toolkit installed.]) +AH_TEMPLATE([ACE_HAS_GETIFADDRS], +[Platform supports getifaddrs() / freeifaddrs().]) + AH_TEMPLATE([ACE_HAS_GETPAGESIZE], [Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be defined, except on Win32).]) +AH_TEMPLATE([ACE_HAS_GETRUSAGE_PROTO], +[Platform has a getrusage () prototype in sys/resource.h that + differs from the one in ace/OS.i.]) + +AH_TEMPLATE([ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS], +[GNUC 2.7.3 mistakenly takes the template definition as the place + where an inline function of an argument class is first used.]) + AH_TEMPLATE([ACE_HAS_GNU_CSTRING_H], [Denotes that GNU has cstring.h as standard which redefines memchr()]) @@ -487,23 +524,13 @@ AH_TEMPLATE([ACE_HAS_NONCONST_GETBY], AH_TEMPLATE([ACE_HAS_NONCONST_MSGSND], [Platform has a non-const parameter to msgsnd() (e.g., SCO).]) -AH_TEMPLATE([ACE_HAS_NONCONST_READV], -[Platform omits const qualifier from iovec parameter in readv() prototype.]) - AH_TEMPLATE([ACE_HAS_NONCONST_SELECT_TIMEVAL], [Platform's select() uses non-const timeval* (only found on Linux right now)]) -AH_TEMPLATE([ACE_HAS_NONCONST_SENDMSG], -[Platform omits const qualifier from msghdr parameter in sendmsg() - prototype.]) - -AH_TEMPLATE([ACE_HAS_NONCONST_SETRLIMIT], -[Platform omits const qualifier from rlimit parameter in setrlimit() - prototype.]) - -AH_TEMPLATE([ACE_HAS_NONCONST_WRITEV], -[Platform omits const qualifier from iovec parameter in writev() prototype.]) +AH_TEMPLATE([ACE_HAS_GNUG_PRE_2_8], +[Platform has "old" GNU compiler, i.e. does not completely support + standard C++. (compiling with g++ prior to version 2.8.0)]) AH_TEMPLATE([ACE_HAS_OLD_MALLOC], [Compiler/platform uses old malloc()/free() prototypes (ugh)]) @@ -552,6 +579,8 @@ AH_TEMPLATE([ACE_HAS_POWERPC_TIMER], AH_TEMPLATE([ACE_HAS_PRUSAGE_T],[Platform supports the prusage_t struct]) +AH_TEMPLATE([ACE_HAS_PTHREADS],[Platform supports POSIX Threads]) + AH_TEMPLATE([ACE_HAS_PTHREADS_DRAFT4], [Platform supports POSIX Threads .4a Draft 4]) @@ -634,6 +663,12 @@ AH_TEMPLATE([ACE_LACKS_NETDB_REENTRANT_FUNCTIONS], AH_TEMPLATE([ACE_HAS_REGEX], [Platform supports the POSIX regular expression library]) +AH_TEMPLATE([ACE_HAS_SCANDIR], +[Platform supports the scandir() function.]) + +AH_TEMPLATE([ACE_HAS_SELECT_H], +[Platform has special header for select().]) + AH_TEMPLATE([ACE_HAS_SEMUN], [Compiler/platform defines a union semun for SysV shared memory ]) @@ -670,6 +705,9 @@ AH_TEMPLATE([ACE_HAS_SOCKADDR_MSG_NAME], [Platform requires (struct sockaddr *) for msg_name field of struct msghdr.]) +AH_TEMPLATE([ACE_HAS_SOCKIO_H], +[Compiler/platform provides the sys/sockio.h file]) + AH_TEMPLATE([ACE_HAS_SOCKLEN_T], [Platform provides socklen_t type, such as Linux with glibc2.]) @@ -678,6 +716,8 @@ AH_TEMPLATE([ACE_HAS_SPARCWORKS_401_SIGNALS], AH_TEMPLATE([ACE_HAS_SSIZE_T],[Compiler supports the ssize_t typedef]) +AH_TEMPLATE([ACE_HAS_STHREADS],[Platform supports UNIX International Threads]) + AH_TEMPLATE([ACE_HAS_THR_YIELD],[Platform has thr_yield()]) AH_TEMPLATE([ACE_HAS_STANDARD_CPP_LIBRARY], @@ -727,6 +767,8 @@ AH_TEMPLATE([ACE_HAS_SYSCALL_GETRUSAGE], AH_TEMPLATE([ACE_HAS_SYSCALL_H], [Compiler/platform contains the <sys/syscall.h> file.]) +AH_TEMPLATE([ACE_HAS_SYSENT_H],[Platform provides <sysent.h> header]) + AH_TEMPLATE([ACE_HAS_SYSINFO], [Platform supports system configuration information.]) @@ -736,6 +778,8 @@ AH_TEMPLATE([ACE_HAS_SYSV_IPC], AH_TEMPLATE([ACE_HAS_SYS_ERRLIST], [Platform/compiler supports _sys_errlist symbol]) +AH_TEMPLATE([ACE_HAS_SYS_FILIO_H],[Platform provides <sys/filio.h> header]) + AH_TEMPLATE([ACE_HAS_SYS_SIGLIST], [Compiler/platform supports _sys_siglist array]) @@ -810,6 +854,8 @@ AH_TEMPLATE([ACE_HAS_UNIXWARE_SVR4_SIGNAL_T], AH_TEMPLATE([ACE_HAS_WCHAR],[Platform/compiler supports wchar_t]) +AH_TEMPLATE([ACE_HAS_UTIME],[Platform has <utime.h> header file]) + AH_TEMPLATE([ACE_HAS_TYPENAME_KEYWORD], [Compiler supports the C++ typename keyword]) @@ -821,7 +867,7 @@ AH_TEMPLATE([ACE_HAS_VERBOSE_NOTSUP], origin of ACE_NOTSUP.]) AH_TEMPLATE([ACE_HAS_VOIDPTR_GETTIMEOFDAY], -[Platform/compiler supports void * as second parameter to +[Platform/compiler supports void * as second parameter to gettimeofday() and has a prototype.]) AH_TEMPLATE([ACE_HAS_VOIDPTR_MMAP],[Platform requires void * for mmap().]) @@ -887,6 +933,16 @@ AH_TEMPLATE([ACE_LACKS_FILELOCKS],[Platform lacks file locking mechanism]) AH_TEMPLATE([ACE_LACKS_FLOATING_POINT], [Platform does not support floating point operations]) +AH_TEMPLATE([ACE_LACKS_GETOPT_PROTO], +[Platform lacks the getopt() prototype (e.g., LynxOS)]) + +AH_TEMPLATE([ACE_LACKS_GETPGID], +[Platform lacks getpgid() call (e.g., Win32, Chorus, and FreeBSD).]) + +AH_TEMPLATE([ACE_LACKS_SETREGID],[Platform lacks setregid() call.]) + +AH_TEMPLATE([ACE_LACKS_SETREUID],[Platform lacks setreuid() call.]) + AH_TEMPLATE([ACE_LACKS_GETSERVBYNAME], [Platforms lacks getservbyname() (e.g., VxWorks and Chorus).]) @@ -902,6 +958,19 @@ AH_TEMPLATE([ACE_LACKS_LONGLONG_T], AH_TEMPLATE([ACE_LACKS_U_LONGLONG_T], [Platform does not have u_longlong_t typedef]) +AH_TEMPLATE([ACE_LACKS_MALLOC_H],[Platform lacks malloc.h]) + +AH_TEMPLATE([ACE_LACKS_MEMORY_H], +[Platform lacks memory.h (e.g., VxWorks and Chorus)]) + +AH_TEMPLATE([ACE_LACKS_STDINT_H], +[Platform lacks stdint.h (e.g., UnixWare)]) + +AH_TEMPLATE([ACE_LACKS_INTTYPES_H], +[Platform lacks inittypes.h (e.g. Unixware)]) + +AH_TEMPLATE([ACE_LACKS_MKTEMP],[ACE has no mktemp()]) + AH_TEMPLATE([ACE_LACKS_MMAP], [The platform doesn't have mmap(2) (e.g., SCO UNIX).]) @@ -923,6 +992,8 @@ AH_TEMPLATE([ACE_LACKS_NULL_PTHREAD_STATUS], AH_TEMPLATE([ACE_HAS_MUTEX_TIMEOUTS], [Compiler supports timed mutex acquisitions (e.g. pthread_mutex_timedlock()).]) +AH_TEMPLATE([ACE_LACKS_PARAM_H],[Platform lacks <sys/param.h> (e.g., MVS)]) + AH_TEMPLATE([ACE_LACKS_NAMED_POSIX_SEM], [Platform lacks named POSIX semaphores (e.g., Chorus)]) @@ -933,6 +1004,9 @@ AH_TEMPLATE([ACE_LACKS_RLIMIT], [Platform/compiler lacks {get,set}rlimit() function (e.g., VxWorks, Chorus, and SCO UNIX)]) +AH_TEMPLATE([ACE_LACKS_RLIMIT_PROTOTYPE], +[Platform/compiler lacks {get,set}rlimit() prototypes (e.g., Tandem)]) + AH_TEMPLATE([ACE_LACKS_RWLOCKATTR_PSHARED], [Platform lacks pthread_rwlockattr_setpshared().]) @@ -1001,6 +1075,9 @@ AH_TEMPLATE([ACE_LACKS_SI_ADDR], AH_TEMPLATE([ACE_LACKS_SYSV_SHMEM], [Platform lacks System V shared memory (e.g., Win32 and VxWorks)]) +AH_TEMPLATE([ACE_LACKS_SIGINFO_H], +[Platform lacks the siginfo.h include file (e.g., MVS)]) + AH_TEMPLATE([ACE_LACKS_SOCKET_BUFSIZ], [Platform doesn't support SO_SNDBUF/SO_RCVBUF (used in TAO)]) @@ -1009,6 +1086,11 @@ AH_TEMPLATE([ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES], AH_TEMPLATE([ACE_LACKS_STRRECVFD],[Platform doesn't define struct strrecvfd.]) +AH_TEMPLATE([ACE_LACKS_SYS_SELECT_H], +[Platform lacks <sys/select.h> header file]) + +AH_TEMPLATE([ACE_LACKS_SYS_TYPES_H],[Platform lacks <sys/types.h> header file]) + AH_TEMPLATE([ACE_LACKS_T_ERRNO],[Header files lack t_errno for TLI]) AH_TEMPLATE([ACE_LACKS_TCP_H],[Platform doesn't have netinet/tcp.h]) @@ -1021,9 +1103,21 @@ AH_TEMPLATE([ACE_LACKS_THREAD_PROCESS_SCOPING], AH_TEMPLATE([ACE_LACKS_THREAD_STACK_SIZE], [Platform lacks pthread_attr_setstacksize() (e.g., Linux pthreads)]) +AH_TEMPLATE([ACE_LACKS_TIMEDWAIT_PROTOTYPES], +[MIT pthreads platform lacks the timedwait prototypes]) + AH_TEMPLATE([ACE_LACKS_TIMESPEC_T], [Platform does not define timepec_t as a typedef for struct timespec.]) +AH_TEMPLATE([ACE_LACKS_GETPGID_PROTOTYPE], +[Platform/compiler lacks the getpgid() prototype]) + +AH_TEMPLATE([ACE_LACKS_SETREGID_PROTOTYPE], +[Platform/compiler lacks the setregid() prototype]) + +AH_TEMPLATE([ACE_LACKS_SETREUID_PROTOTYPE], +[Platform/compiler lacks the setreuid() prototype]) + AH_TEMPLATE([ACE_LACKS_STRPTIME_PROTOTYPE], [Platform/compiler lacks the strptime() prototype]) @@ -1041,6 +1135,9 @@ AH_TEMPLATE([ACE_LACKS_LLSEEK_PROTOTYPE], AH_TEMPLATE([ACE_LACKS_PREAD_PROTOTYPE], [Platform/compiler lacks the pread() and pwrite() prototypes]) +AH_TEMPLATE([ACE_LACKS_UALARM_PROTOTYPE], +[Platform/compiler lacks the ualarm() prototype (e.g., Solaris)]) + AH_TEMPLATE([ACE_LACKS_CHAR_RIGHT_SHIFTS], [Compiler does not have any istream operator>> for chars, u_chars, or signed chars.]) @@ -1049,6 +1146,11 @@ AH_TEMPLATE([ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS], [Compiler does not have operator>> (istream &, u_char *) or operator>> (istream &, signed char *)]) +AH_TEMPLATE([ACE_LACKS_UCONTEXT_H],[Platform lacks the ucontext.h file]) + +AH_TEMPLATE([ACE_LACKS_UNISTD_H], +[Platform lacks the unistd.h file (e.g., VxWorks and Win32) ]) + AH_TEMPLATE([ACE_LACKS_UNIX_DOMAIN_SOCKETS], [ACE platform has no UNIX domain sockets]) diff --git a/m4/platform.m4 b/m4/platform.m4 index c0e477f5695..d39dfeea0f1 100644 --- a/m4/platform.m4 +++ b/m4/platform.m4 @@ -104,6 +104,8 @@ dnl */ AC_DEFINE([IP_DROP_MEMBERSHIP], [0x14]) ACE_CPPFLAGS="$ACE_CPPFLAGS -D_POSIX4A_DRAFT10_SOURCE -D_POSIX4_DRAFT_SOURCE" ;; + *freebsd*) + ;; *fsu*) dnl FIXME: "FSU" isn't a platform! We need to move this somewhere. AC_DEFINE([PTHREAD_STACK_MIN], [(1024*10)]) @@ -187,6 +189,9 @@ dnl FIXME: "FSU" isn't a platform! We need to move this somewhere. *mvs*) ACE_CPPFLAGS="$ACE_CPPFLAGS -D_ALL_SOURCE" ;; + *netbsd*) + AC_DEFINE([ACE_NETBSD]) + ;; *osf3.2*) AC_EGREP_CPP([ACE_DEC_CXX], [ @@ -345,125 +350,5 @@ dnl AC_DEFINE(ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) ;; esac -ACE_FUNC_IOCTL_ARGTYPES - -ACE_CHECK_FORMAT_SPECIFIERS -ACE_CHECK_LACKS_PERFECT_MULTICAST_FILTERING - dnl End ACE_SET_PLATFORM_MACROS ]) - - - -# ACE_CHECK_FORMAT_SPECIFIERS -# -# Override default *printf format specifiers for size_t, ssize_t, ACE_INT64, -# and ACE_UINT64 -# -# FIXME: Is it possible to write a portable feature test, or is checking -# the the target OS / target CPU the best we can do? -# -#--------------------------------------------------------------------------- -AC_DEFUN([ACE_CHECK_FORMAT_SPECIFIERS], -[dnl -AH_TEMPLATE([ACE_SIZE_T_FORMAT_SPECIFIER], -[Define to the *printf format specifier (e.g. "%u") for size_t])dnl -AH_TEMPLATE([ACE_SSIZE_T_FORMAT_SPECIFIER], -[Define to the *printf format specifier (e.g. "%d") for ssize_t])dnl -AH_TEMPLATE([ACE_INT64_FORMAT_SPECIFIER], -[Define to the *printf format specifier (e.g. "%lld") for the 64 bit signed integer type])dnl -AH_TEMPLATE([ACE_UINT64_FORMAT_SPECIFIER], -[Define to the *printf format specifier (e.g. "%llu") for the 64 bit signed integer type])dnl - -case "$target_os" in -darwin*) - AC_DEFINE([ACE_SIZE_T_FORMAT_SPECIFIER], ["%lu"]) - ;; -netbsd*) - case "$target_cpu" in - x86_64) - AC_DEFINE([ACE_SIZE_T_FORMAT_SPECIFIER], ["%lu"]) - AC_DEFINE([ACE_SSIZE_T_FORMAT_SPECIFIER], ["%ld"]) - ;; - *) - ;; - esac - ;; - -*) - ;; -esac]) - - -# ACE_CHECK_PERFECT_MULTICAST_FILTERING -# -# Checks whether platform lacks "perfect" multicast filtering. -# -# FIXME: Is it possible to write a portable feature test, or is checking -# the the target OS the best we can do? -# -#--------------------------------------------------------------------------- -AC_DEFUN([ACE_CHECK_LACKS_PERFECT_MULTICAST_FILTERING], -[AC_CACHE_CHECK([whether platform lacks perfect multicast filtering], - [ace_cv_lacks_perfect_multicast_filtering], - [case "$target_os" in - darwin* | freebsd* | netbsd* | openbsd* | qnx*) - ace_cv_lacks_perfect_multicast_filtering=yes ;; - *) - ace_cv_lacks_perfect_multicast_filtering=no ;; - esac]) - -if test $ace_cv_lacks_perfect_multicast_filtering = yes; then - AC_DEFINE([ACE_LACKS_PERFECT_MULTICAST_FILTERING], 1, -[Define to 1 if platform lacks IGMPv3 "perfect" filtering of multicast -datagrams at the socket level. If defined, ACE_SOCK_Dgram_Mcast will bind -the first joined multicast group to the socket, and all future joins on that -socket will fail with an error.]) -fi -]) - - -# ACE_FUNC_IOCTL_ARGTYPES -# -# Determine the correct type to be passed to ioctl's second argument and -# define the types in ACE_IOCTL_TYPE_ARG2. -# -# FIXME: Should we support ioctl's third argument as well...? -# -# FIXME: Is it possible to write a portable feature test, or is checking -# the the target OS the best we can do? -# -#--------------------------------------------------------------------------- -AC_DEFUN([ACE_FUNC_IOCTL_ARGTYPES], -[AC_CACHE_CHECK([types of arguments for ioctl()], - [ace_cv_func_ioctl_arg2], - [case "$target_os" in - darwin* | freebsd* | netbsd* | openbsd*) - ace_cv_func_ioctl_arg2="unsigned long" ;; - *) - ace_cv_func_ioctl_arg2="int" ;; - esac]) - -AC_DEFINE_UNQUOTED(ACE_IOCTL_TYPE_ARG2, $ace_cv_func_ioctl_arg2, - [Define to the type of arg 2 for `ioctl'.]) -]) - - -# ACE_VAR_TIMEZONE -# -# Checks whether platform has global "timezone" variable. -# -#--------------------------------------------------------------------------- -AC_DEFUN([ACE_VAR_TIMEZONE], -[AC_CACHE_CHECK([for timezone variable], - [ace_cv_var_timezone], - [AC_TRY_LINK([#include <time.h>], - [return (int)timezone;], - [ace_cv_var_timezone=yes], - [ace_cv_var_timezone=no]) - ]) -if test "$ace_cv_var_timezone" = yes; then - AC_DEFINE([ACE_HAS_TIMEZONE], 1, - [Define to 1 if platform has global timezone variable]) -fi -]) diff --git a/m4/subsets.m4 b/m4/subsets.m4 index afcd471b25f..276a204278f 100644 --- a/m4/subsets.m4 +++ b/m4/subsets.m4 @@ -30,7 +30,7 @@ dnl Assume all subsets will be built, including the full ACE library. dnl If any of the components is explicitly enabled or disabled by the user dnl then do NOT build the full ACE library. AC_ARG_ENABLE([lib-all], - AS_HELP_STRING([--enable-lib-all],[build all ACE components [[no]]]), + AC_HELP_STRING([--enable-lib-all],[build all ACE components [[no]]]), [ case "${enableval}" in yes) @@ -49,7 +49,7 @@ AC_ARG_ENABLE([lib-all], ]) AC_ARG_ENABLE([lib-full], - AS_HELP_STRING([--enable-lib-full],[build the full ACE library [[yes]]]), + AC_HELP_STRING([--enable-lib-full],[build the full ACE library [[yes]]]), [ case "${enableval}" in yes) @@ -68,7 +68,7 @@ AC_ARG_ENABLE([lib-full], ]) AC_ARG_ENABLE([lib-os], - AS_HELP_STRING([--enable-lib-os],[build ACE_OS library]), + AC_HELP_STRING([--enable-lib-os],[build ACE_OS library]), [ case "${enableval}" in yes) @@ -87,7 +87,7 @@ AC_ARG_ENABLE([lib-os], ],) AC_ARG_ENABLE([lib-codecs], - AS_HELP_STRING([--enable-lib-codecs],[build ACE_Codecs library]), + AC_HELP_STRING([--enable-lib-codecs],[build ACE_Codecs library]), [ case "${enableval}" in yes) @@ -107,7 +107,7 @@ AC_ARG_ENABLE([lib-codecs], ],) AC_ARG_ENABLE([lib-connection], - AS_HELP_STRING([--enable-lib-connection],[build ACE_Connection library ]), + AC_HELP_STRING([--enable-lib-connection],[build ACE_Connection library ]), [ case "${enableval}" in yes) @@ -126,7 +126,7 @@ AC_ARG_ENABLE([lib-connection], ],) AC_ARG_ENABLE([lib-demux], - AS_HELP_STRING([--enable-lib-demux],[build ACE_Demux library]), + AC_HELP_STRING([--enable-lib-demux],[build ACE_Demux library]), [ case "${enableval}" in yes) @@ -145,7 +145,7 @@ AC_ARG_ENABLE([lib-demux], ],) AC_ARG_ENABLE([lib-filecache], - AS_HELP_STRING([--enable-lib-filecache],[build ACE_Filecache library]), + AC_HELP_STRING([--enable-lib-filecache],[build ACE_Filecache library]), [ case "${enableval}" in yes) @@ -164,7 +164,7 @@ AC_ARG_ENABLE([lib-filecache], ],) AC_ARG_ENABLE([lib-ipc], - AS_HELP_STRING([--enable-lib-ipc],[build ACE_IPC library]), + AC_HELP_STRING([--enable-lib-ipc],[build ACE_IPC library]), [ case "${enableval}" in yes) @@ -183,7 +183,7 @@ AC_ARG_ENABLE([lib-ipc], ],) AC_ARG_ENABLE([lib-logging], - AS_HELP_STRING([--enable-lib-logging],[build ACE_Logging library]), + AC_HELP_STRING([--enable-lib-logging],[build ACE_Logging library]), [ case "${enableval}" in yes) @@ -202,7 +202,7 @@ AC_ARG_ENABLE([lib-logging], ],) AC_ARG_ENABLE([lib-memory], - AS_HELP_STRING([--enable-lib-memory],[build ACE_Memory library]), + AC_HELP_STRING([--enable-lib-memory],[build ACE_Memory library]), [ case "${enableval}" in yes) @@ -221,7 +221,7 @@ AC_ARG_ENABLE([lib-memory], ],) AC_ARG_ENABLE([lib-metrics], - AS_HELP_STRING([--enable-lib-metrics],[build ACE_Metrics library]), + AC_HELP_STRING([--enable-lib-metrics],[build ACE_Metrics library]), [ case "${enableval}" in yes) @@ -240,7 +240,7 @@ AC_ARG_ENABLE([lib-metrics], ],) AC_ARG_ENABLE([lib-sockets], - AS_HELP_STRING([--enable-lib-sockets],[build ACE_Sockets library]), + AC_HELP_STRING([--enable-lib-sockets],[build ACE_Sockets library]), [ case "${enableval}" in yes) @@ -259,7 +259,7 @@ AC_ARG_ENABLE([lib-sockets], ],) AC_ARG_ENABLE([lib-streams], - AS_HELP_STRING([--enable-lib-streams],[build ACE_Streams library]), + AC_HELP_STRING([--enable-lib-streams],[build ACE_Streams library]), [ case "${enableval}" in yes) @@ -278,7 +278,7 @@ AC_ARG_ENABLE([lib-streams], ],) AC_ARG_ENABLE([lib-svcconf], - AS_HELP_STRING([--enable-lib-svcconf],[build ACE_Svcconf library]), + AC_HELP_STRING([--enable-lib-svcconf],[build ACE_Svcconf library]), [ case "${enableval}" in yes) @@ -298,7 +298,7 @@ AC_ARG_ENABLE([lib-svcconf], ],) AC_ARG_ENABLE([lib-threads], - AS_HELP_STRING([--enable-lib-threads],[build ACE_Threads library]), + AC_HELP_STRING([--enable-lib-threads],[build ACE_Threads library]), [ case "${enableval}" in yes) @@ -317,7 +317,7 @@ AC_ARG_ENABLE([lib-threads], ],) AC_ARG_ENABLE([lib-timer], - AS_HELP_STRING([--enable-lib-timer],[build ACE_Timer library]), + AC_HELP_STRING([--enable-lib-timer],[build ACE_Timer library]), [ case "${enableval}" in yes) @@ -336,7 +336,7 @@ AC_ARG_ENABLE([lib-timer], ],) AC_ARG_ENABLE([lib-token], - AS_HELP_STRING([--enable-lib-token],[build ACE_Token library]), + AC_HELP_STRING([--enable-lib-token],[build ACE_Token library]), [ case "${enableval}" in yes) @@ -356,7 +356,7 @@ AC_ARG_ENABLE([lib-token], ],) AC_ARG_ENABLE([lib-utils], - AS_HELP_STRING([--enable-lib-utils],[build ACE_Utils library]), + AC_HELP_STRING([--enable-lib-utils],[build ACE_Utils library]), [ case "${enableval}" in yes) @@ -375,7 +375,7 @@ AC_ARG_ENABLE([lib-utils], ],) AC_ARG_ENABLE([lib-uuid], - AS_HELP_STRING([--enable-lib-uuid],[build ACE_UUID library]), + AC_HELP_STRING([--enable-lib-uuid],[build ACE_UUID library]), [ case "${enableval}" in yes) @@ -395,7 +395,7 @@ AC_ARG_ENABLE([lib-uuid], ],) AC_ARG_ENABLE([lib-other], - AS_HELP_STRING([--enable-lib-other],[build ACE_Other library]), + AC_HELP_STRING([--enable-lib-other],[build ACE_Other library]), [ case "${enableval}" in yes) diff --git a/m4/threads.m4 b/m4/threads.m4 index bfffd5ac02a..f6cd6cba36d 100644 --- a/m4/threads.m4 +++ b/m4/threads.m4 @@ -71,8 +71,7 @@ dnl AC_REQUIRE([AC_LANG]) AC_SEARCH_LIBS([thr_create], [thread], [ ace_has_sthreads=yes - AC_DEFINE([ACE_HAS_STHREADS], 1, - [Define to 1 if platform has UNIX International Threads]) + AC_DEFINE([ACE_HAS_STHREADS]) ], [ ace_has_sthreads=no @@ -93,8 +92,7 @@ dnl AC_REQUIRE([AC_LANG]) ACE_CHECK_POSIX_THREADS( [ ace_has_pthreads=yes - AC_DEFINE([ACE_HAS_PTHREADS], 1, - [Define to 1 if platform has POSIX threads]) + AC_DEFINE([ACE_HAS_PTHREADS]) AC_MSG_RESULT([none required]) ], []) |