diff options
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | m4macros/Makefile.am | 3 | ||||
| -rw-r--r-- | m4macros/typecheck.m4 | 103 |
3 files changed, 1 insertions, 118 deletions
diff --git a/configure.ac b/configure.ac index f9b9891..39e303f 100644 --- a/configure.ac +++ b/configure.ac @@ -164,19 +164,6 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([sys/ioctl.h alloca.h memory.h malloc.h sysexits.h \ values.h]) -dnl Checks for types -AC_TYPE_SIZE_T -AC_TYPE_PID_T -AC_UNP_CHECK_TYPE(uint8_t, unsigned char) -AC_UNP_CHECK_TYPE(int16_t, short) -AC_UNP_CHECK_TYPE(uint16_t, unsigned short) -AC_UNP_CHECK_TYPE(int32_t, int) -AC_UNP_CHECK_TYPE(uint32_t, unsigned int) -AC_UNP_CHECK_TYPE(ssize_t, int) -AC_UNP_CHECK_TYPE(socklen_t, unsigned int) -AC_UNP_CHECK_TYPE(in_addr_t, uint32_t) - - dnl Checks for libary functions AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK AC_FUNC_MALLOC diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am index de54db6..b9a2ac2 100644 --- a/m4macros/Makefile.am +++ b/m4macros/Makefile.am @@ -1,4 +1,3 @@ EXTRA_DIST = \ as-compiler-flag.m4 \ - argenable.m4 \ - typecheck.m4 + argenable.m4 diff --git a/m4macros/typecheck.m4 b/m4macros/typecheck.m4 deleted file mode 100644 index a8a88b4..0000000 --- a/m4macros/typecheck.m4 +++ /dev/null @@ -1,103 +0,0 @@ -dnl Taken from Unix Network Programming, W. Richard Stevens - -dnl ################################################################## -dnl We cannot use the AC_CHECK_TYPE macros becasue AC_CHECK_TYPE -dnl #includes only <sys/types.h>, <stdlib.h>, and <stddef.h>. -dnl Unfortunately, many implementations today hide typedefs in wierd -dnl locations: Solaris 2.5.1 has uint8_t and uint32_t in <pthread.h>. -dnl SunOS 4.1.x has int8_t in <sys/bittypes.h>. -dnl So we define our own macro AC_UNP_CHECK_TYPE that does the same -dnl #includes as "unp.h", and then looks for the typedef. -dnl -dnl This macro should be invoked after all the header checks have been -dnl performed, since we #include "confdefs.h" below, and then use the -dnl HAVE_foo_H values that is can #define. -dnl -AC_DEFUN([AC_UNP_CHECK_TYPE], - [AC_MSG_CHECKING(if $1 defined) - AC_CACHE_VAL(ac_cv_type_$1, - [AC_TRY_COMPILE( -[ -#include "confdefs.h" /* the header built by configure so far */ -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif -#ifdef HAVE_ERRNO_H -# include <errno.h> -#endif -#ifdef HAVE_FCNTL_H -# include <fcntl.h> -#endif -#ifdef HAVE_NETDB_H -# include <netdb.h> -#endif -#ifdef HAVE_SIGNAL_H -# include <signal.h> -#endif -#ifdef HAVE_STDIO_H -# include <stdio.h> -#endif -#ifdef HAVE_STDLIB_H -# include <stdlib.h> -#endif -#ifdef HAVE_STRING_H -# include <string.h> -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#ifdef HAVE_SYS_UIO_H -# include <sys/uio.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#ifdef HAVE_SYS_WAIT_H -# include <sys/wait.h> -#endif -#ifdef HAVE_SYS_UN_H -# include <sys/un.h> -#endif -#ifdef HAVE_SYS_SELECT_H -# include <sys/select.h> -#endif -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif -#ifdef HAVE_SYS_FILIO_H -# include <sys/filio.h> -#endif -#ifdef HAVE_SYS_SOCKIO_H -# include <sys/sockio.h> -#endif -#ifdef HAVE_PTHREAD_H -# include <pthread.h> -#endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -], - [ $1 foo ], - [ac_cv_type_$1=yes], - [ac_cv_type_$1=no])]) - AC_MSG_RESULT([$ac_cv_type_$1]) - if test $ac_cv_type_$1 = no ; then - AH_TEMPLATE([$1], [Defined with the proper type.]) - AC_DEFINE($1, $2) - fi -])
\ No newline at end of file |