Attachment #74175 for bug #114544




dnl
dnl ====================================================================
dnl
AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],
[changequote(<<, >>)dnl 
dnl The name to #define. 
define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl 

dnl
dnl --------------------------------------------------------------------
dnl OpenLDAP version of STDC header check w/ EBCDIC support
AC_DEFUN([OL_HEADER_STDC],
[AC_REQUIRE_CPP()dnl
AC_REQUIRE([OL_CPP_EBCDIC])dnl
AC_CACHE_CHECK([for ANSI C header files], ol_cv_header_stdc,

dnl Early MIPS compilers (used in Ultrix 4.2) don't like
dnl "int x; int *volatile a = &x; *a = 0;"
dnl 	-- borrowed from PDKSH
AC_DEFUN([OL_C_VOLATILE],
 [AC_CACHE_CHECK(if compiler understands volatile, ol_cv_c_volatile,
    [AC_TRY_COMPILE([int x, y, z;],
      [volatile int a; int * volatile b = x ? &y : &z;

dnl
dnl ====================================================================
dnl Define sig_atomic_t if not defined in signal.h
AC_DEFUN([OL_TYPE_SIG_ATOMIC_T],
 [AC_CACHE_CHECK(for sig_atomic_t, ol_cv_type_sig_atomic_t,
    [AC_TRY_COMPILE([#include <signal.h>], [sig_atomic_t atomic;],
		ol_cv_type_sig_atomic_t=yes, ol_cv_type_sig_atomic_t=no)])

dnl
dnl ====================================================================
dnl Define socklen_t if not defined in sys/types.h or sys/socket.h
AC_DEFUN([OL_TYPE_SOCKLEN_T],
 [AC_CACHE_CHECK(for socklen_t, ol_cv_type_socklen_t,
    [AC_TRY_COMPILE([
#ifdef HAVE_SYS_TYPES_H

dnl
dnl ====================================================================
dnl Define inet_aton is available
AC_DEFUN([OL_FUNC_INET_ATON],
 [AC_CACHE_CHECK([for inet_aton()], ol_cv_func_inet_aton,
    [AC_TRY_LINK([
#ifdef HAVE_SYS_TYPES_H

dnl
dnl ====================================================================
dnl check no of arguments for ctime_r
AC_DEFUN([OL_FUNC_CTIME_R_NARGS],
 [AC_CACHE_CHECK(number of arguments of ctime_r, ol_cv_func_ctime_r_nargs,
   [AC_TRY_COMPILE([#include <time.h>],
		[time_t ti; char *buffer; ctime_r(&ti,buffer,32);],

dnl
dnl --------------------------------------------------------------------
dnl check return type of ctime_r()
AC_DEFUN([OL_FUNC_CTIME_R_TYPE],
 [AC_CACHE_CHECK(return type of ctime_r, ol_cv_func_ctime_r_type,
   [AC_TRY_COMPILE([#include <time.h>],
		[extern int (ctime_r)();],

])dnl
dnl ====================================================================
dnl check no of arguments for gethostbyname_r
AC_DEFUN([OL_FUNC_GETHOSTBYNAME_R_NARGS],
 [AC_CACHE_CHECK(number of arguments of gethostbyname_r,
	ol_cv_func_gethostbyname_r_nargs,
	[AC_TRY_COMPILE([#include <sys/types.h>

])dnl
dnl
dnl check no of arguments for gethostbyaddr_r
AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS],
 [AC_CACHE_CHECK(number of arguments of gethostbyaddr_r,
	[ol_cv_func_gethostbyaddr_r_nargs],
	[AC_TRY_COMPILE([#include <sys/types.h>

])
dnl ====================================================================
dnl check for msg_accrights in msghdr
AC_DEFUN([OL_MSGHDR_MSG_ACCRIGHTS],
 [AC_CACHE_CHECK(for msg_accrights in msghdr, ol_cv_msghdr_msg_accrights,
   [AC_TRY_COMPILE([#include <sys/socket.h>],
		[struct msghdr m; m.msg_accrightslen=0],

Return to bug 114544

Lines 65-71 Link Here

(-)openldap.m4.orig (-11 / +11 lines)
65	dnl	65	dnl
66	dnl ====================================================================	66	dnl ====================================================================
67	dnl	67	dnl
68	AC_DEFUN(AC_COMPILE_CHECK_SIZEOF,	68	AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],
69	[changequote(<<, >>)dnl	69	[changequote(<<, >>)dnl
70	dnl The name to #define.	70	dnl The name to #define.
71	define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl	71	define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
Lines 173-179 Link Here
173	dnl	173	dnl
174	dnl --------------------------------------------------------------------	174	dnl --------------------------------------------------------------------
175	dnl OpenLDAP version of STDC header check w/ EBCDIC support	175	dnl OpenLDAP version of STDC header check w/ EBCDIC support
176	AC_DEFUN(OL_HEADER_STDC,	176	AC_DEFUN([OL_HEADER_STDC],
177	[AC_REQUIRE_CPP()dnl	177	[AC_REQUIRE_CPP()dnl
178	AC_REQUIRE([OL_CPP_EBCDIC])dnl	178	AC_REQUIRE([OL_CPP_EBCDIC])dnl
179	AC_CACHE_CHECK([for ANSI C header files], ol_cv_header_stdc,	179	AC_CACHE_CHECK([for ANSI C header files], ol_cv_header_stdc,
Lines 1016-1022 Link Here
1016	dnl Early MIPS compilers (used in Ultrix 4.2) don't like	1020	dnl Early MIPS compilers (used in Ultrix 4.2) don't like
1017	dnl "int x; int volatile a = &x; a = 0;"	1021	dnl "int x; int volatile a = &x; a = 0;"
1018	dnl -- borrowed from PDKSH	1022	dnl -- borrowed from PDKSH
1019	AC_DEFUN(OL_C_VOLATILE,	1023	AC_DEFUN([OL_C_VOLATILE],
1020	[AC_CACHE_CHECK(if compiler understands volatile, ol_cv_c_volatile,	1024	[AC_CACHE_CHECK(if compiler understands volatile, ol_cv_c_volatile,
1021	[AC_TRY_COMPILE([int x, y, z;],	1025	[AC_TRY_COMPILE([int x, y, z;],
1022	[volatile int a; int * volatile b = x ? &y : &z;	1026	[volatile int a; int * volatile b = x ? &y : &z;
Lines 1052-1058 Link Here
1052	dnl	1056	dnl
1053	dnl ====================================================================	1057	dnl ====================================================================
1054	dnl Define sig_atomic_t if not defined in signal.h	1058	dnl Define sig_atomic_t if not defined in signal.h
1055	AC_DEFUN(OL_TYPE_SIG_ATOMIC_T,	1059	AC_DEFUN([OL_TYPE_SIG_ATOMIC_T],
1056	[AC_CACHE_CHECK(for sig_atomic_t, ol_cv_type_sig_atomic_t,	1060	[AC_CACHE_CHECK(for sig_atomic_t, ol_cv_type_sig_atomic_t,
1057	[AC_TRY_COMPILE([#include <signal.h>], [sig_atomic_t atomic;],	1061	[AC_TRY_COMPILE([#include <signal.h>], [sig_atomic_t atomic;],
1058	ol_cv_type_sig_atomic_t=yes, ol_cv_type_sig_atomic_t=no)])	1062	ol_cv_type_sig_atomic_t=yes, ol_cv_type_sig_atomic_t=no)])
Lines 1064-1070 Link Here
1064	dnl	1068	dnl
1065	dnl ====================================================================	1069	dnl ====================================================================
1066	dnl Define socklen_t if not defined in sys/types.h or sys/socket.h	1070	dnl Define socklen_t if not defined in sys/types.h or sys/socket.h
1067	AC_DEFUN(OL_TYPE_SOCKLEN_T,	1071	AC_DEFUN([OL_TYPE_SOCKLEN_T],
1068	[AC_CACHE_CHECK(for socklen_t, ol_cv_type_socklen_t,	1072	[AC_CACHE_CHECK(for socklen_t, ol_cv_type_socklen_t,
1069	[AC_TRY_COMPILE([	1073	[AC_TRY_COMPILE([
1070	#ifdef HAVE_SYS_TYPES_H	1074	#ifdef HAVE_SYS_TYPES_H
Lines 1083-1089 Link Here
1083	dnl	1087	dnl
1084	dnl ====================================================================	1088	dnl ====================================================================
1085	dnl Define inet_aton is available	1089	dnl Define inet_aton is available
1086	AC_DEFUN(OL_FUNC_INET_ATON,	1090	AC_DEFUN([OL_FUNC_INET_ATON],
1087	[AC_CACHE_CHECK([for inet_aton()], ol_cv_func_inet_aton,	1091	[AC_CACHE_CHECK([for inet_aton()], ol_cv_func_inet_aton,
1088	[AC_TRY_LINK([	1092	[AC_TRY_LINK([
1089	#ifdef HAVE_SYS_TYPES_H	1093	#ifdef HAVE_SYS_TYPES_H
Lines 1110-1116 Link Here
1110	dnl	1114	dnl
1111	dnl ====================================================================	1115	dnl ====================================================================
1112	dnl check no of arguments for ctime_r	1116	dnl check no of arguments for ctime_r
1113	AC_DEFUN(OL_FUNC_CTIME_R_NARGS,	1117	AC_DEFUN([OL_FUNC_CTIME_R_NARGS],
1114	[AC_CACHE_CHECK(number of arguments of ctime_r, ol_cv_func_ctime_r_nargs,	1118	[AC_CACHE_CHECK(number of arguments of ctime_r, ol_cv_func_ctime_r_nargs,
1115	[AC_TRY_COMPILE([#include <time.h>],	1119	[AC_TRY_COMPILE([#include <time.h>],
1116	[time_t ti; char *buffer; ctime_r(&ti,buffer,32);],	1120	[time_t ti; char *buffer; ctime_r(&ti,buffer,32);],
Lines 1145-1151 Link Here
1145	dnl	1149	dnl
1146	dnl --------------------------------------------------------------------	1150	dnl --------------------------------------------------------------------
1147	dnl check return type of ctime_r()	1151	dnl check return type of ctime_r()
1148	AC_DEFUN(OL_FUNC_CTIME_R_TYPE,	1152	AC_DEFUN([OL_FUNC_CTIME_R_TYPE],
1149	[AC_CACHE_CHECK(return type of ctime_r, ol_cv_func_ctime_r_type,	1153	[AC_CACHE_CHECK(return type of ctime_r, ol_cv_func_ctime_r_type,
1150	[AC_TRY_COMPILE([#include <time.h>],	1154	[AC_TRY_COMPILE([#include <time.h>],
1151	[extern int (ctime_r)();],	1155	[extern int (ctime_r)();],
Lines 1157-1163 Link Here
1157	])dnl	1161	])dnl
1158	dnl ====================================================================	1162	dnl ====================================================================
1159	dnl check no of arguments for gethostbyname_r	1163	dnl check no of arguments for gethostbyname_r
1160	AC_DEFUN(OL_FUNC_GETHOSTBYNAME_R_NARGS,	1164	AC_DEFUN([OL_FUNC_GETHOSTBYNAME_R_NARGS],
1161	[AC_CACHE_CHECK(number of arguments of gethostbyname_r,	1165	[AC_CACHE_CHECK(number of arguments of gethostbyname_r,
1162	ol_cv_func_gethostbyname_r_nargs,	1166	ol_cv_func_gethostbyname_r_nargs,
1163	[AC_TRY_COMPILE([#include <sys/types.h>	1167	[AC_TRY_COMPILE([#include <sys/types.h>
Lines 1207-1213 Link Here
1207	])dnl	1211	])dnl
1208	dnl	1212	dnl
1209	dnl check no of arguments for gethostbyaddr_r	1213	dnl check no of arguments for gethostbyaddr_r
1210	AC_DEFUN(OL_FUNC_GETHOSTBYADDR_R_NARGS,	1214	AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS],
1211	[AC_CACHE_CHECK(number of arguments of gethostbyaddr_r,	1215	[AC_CACHE_CHECK(number of arguments of gethostbyaddr_r,
1212	[ol_cv_func_gethostbyaddr_r_nargs],	1216	[ol_cv_func_gethostbyaddr_r_nargs],
1213	[AC_TRY_COMPILE([#include <sys/types.h>	1217	[AC_TRY_COMPILE([#include <sys/types.h>
Lines 1283-1289 Link Here
1283	])	1287	])
1284	dnl ====================================================================	1288	dnl ====================================================================
1285	dnl check for msg_accrights in msghdr	1289	dnl check for msg_accrights in msghdr
1286	AC_DEFUN(OL_MSGHDR_MSG_ACCRIGHTS,	1290	AC_DEFUN([OL_MSGHDR_MSG_ACCRIGHTS],
1287	[AC_CACHE_CHECK(for msg_accrights in msghdr, ol_cv_msghdr_msg_accrights,	1291	[AC_CACHE_CHECK(for msg_accrights in msghdr, ol_cv_msghdr_msg_accrights,
1288	[AC_TRY_COMPILE([#include <sys/socket.h>],	1292	[AC_TRY_COMPILE([#include <sys/socket.h>],
1289	[struct msghdr m; m.msg_accrightslen=0],	1293	[struct msghdr m; m.msg_accrightslen=0],