[ViewVC] Diff of: cvs/libptytty/ptytty.m4

Comparing libptytty/ptytty.m4 (file contents):
Revision 1.25 by sf-exg, Thu May 12 16:43:47 2011 UTC vs.
Revision 1.36 by sf-exg, Thu Jan 19 13:30:58 2012 UTC

…		…
1	dnl this file is part of libptytty, do not make local modifications
2	dnl http://software.schmorp.de/pkg/libptytty
3
4	AC_DEFUN([PT_FIND_FILE],	1	AC_DEFUN([PT_FIND_FILE],
5	[AC_CACHE_CHECK(where $1 is located, pt_cv_path_$1,	2	[AC_CACHE_CHECK(for a fallback location of $1, pt_cv_path_$1, [
6	[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>	3	if test "$cross_compiling" != yes; then
7	#include <stdlib.h>	4	for file in $3; do
8	#include <sys/stat.h>	5	if test -f "$file"; then
9	$5	6	pt_cv_path_$1=$file
10	int main()
11	{
12	char *path, list[] = { $4, NULL };
13	FILE *f = fopen("conftestval", "w");
14	if (!f) return 1;
15	#ifdef $2
16	fprintf(f, "%s\n", $2);
17	#elif defined($3)
18	fprintf(f, "%s\n", $3);
19	#else
20	for (path = list; *path; path++) {
21	struct stat st;
22	if (stat(*path, &st) == 0) {
23	fprintf(f, "%s\n", *path);
24	break;	7	break
25	}	8	fi
26	}	9	done
27	#endif	10	fi])
28	return fclose(f) != 0;
29	}]])],[pt_cv_path_$1=`cat conftestval`],[pt_cv_path_$1=],
30	[AC_MSG_WARN(Define $2 in config.h manually)])])
31	if test x$pt_cv_path_$1 != x; then	11	if test x$pt_cv_path_$1 != x; then
32	AC_DEFINE_UNQUOTED($2, "$pt_cv_path_$1", Define location of $1)	12	AC_DEFINE_UNQUOTED($2, "$pt_cv_path_$1", Define to a fallback location of $1)
		13	elif test "$cross_compiling" = yes; then
		14	AC_MSG_WARN(Define $2 in config.h manually)
33	fi])	15	fi])
34		16
35	AC_DEFUN([PTY_CHECK],	17	AC_DEFUN([PTY_CHECK],
36	[	18	[
37	AC_CHECK_HEADERS( \	19	AC_CHECK_HEADERS( \
53	seteuid \	35	seteuid \
54	setreuid \	36	setreuid \
55	setresuid \	37	setresuid \
56	)	38	)
57		39
58	have_clone=no
59
60	AC_MSG_CHECKING(for /dev/ptc)
61	if test -e /dev/ptc; then
62	AC_MSG_RESULT(yes)
63	AC_DEFINE(CLONE_DEVICE, "/dev/ptc", [clone device filename])
64	have_clone=yes
65	else
66	AC_MSG_RESULT(no)
67	fi
68
69	case $host in
70	--cygwin*)
71	have_clone=yes
72	AC_DEFINE(CLONE_DEVICE, "/dev/ptmx", [clone device filename])
73	;;
74	*)
75	AC_MSG_CHECKING(for /dev/ptmx)
76	if test -e /dev/ptmx; then
77	AC_MSG_RESULT(yes)
78	AC_DEFINE(HAVE_DEV_PTMX, 1, [Define to 1 if you have /dev/ptmx])
79	AC_DEFINE(CLONE_DEVICE, "/dev/ptmx", [clone device filename])
80	have_clone=yes
81	else
82	AC_MSG_RESULT(no)
83	fi
84	;;
85	esac
86
87	if test x$ac_cv_func_getpt = xyes -o x$ac_cv_func_posix_openpt = xyes -o x$have_clone = xyes; then
88	AC_MSG_CHECKING(for UNIX98 ptys)	40	AC_MSG_CHECKING(for UNIX98 ptys)
89	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],	41	AC_LINK_IFELSE(
		42	[AC_LANG_PROGRAM(
		43	[[#include <stdlib.h>]],
90	[[grantpt(0);unlockpt(0);ptsname(0);]])],	44	[[grantpt(0);unlockpt(0);ptsname(0);]])],
91	[unix98_pty=yes	45	[unix98_pty=yes
92	AC_DEFINE(UNIX98_PTY, 1, "")	46	AC_DEFINE(UNIX98_PTY, 1, "")
93	AC_MSG_RESULT(yes)],	47	AC_MSG_RESULT(yes)],
94	[AC_MSG_RESULT(no)])	48	[AC_MSG_RESULT(no)])
95	fi
96		49
97	if test -z "$unix98_pty"; then	50	if test -z "$unix98_pty"; then
98	AC_SEARCH_LIBS(openpty, util, AC_DEFINE(HAVE_OPENPTY, 1, ""))	51	AC_SEARCH_LIBS(openpty, util, AC_DEFINE(HAVE_OPENPTY, 1, ""))
99	fi	52	fi
100	])	53	])
…		…
139	updlastlogx \	92	updlastlogx \
140	)	93	)
141		94
142	AC_CHECK_HEADERS(lastlog.h)	95	AC_CHECK_HEADERS(lastlog.h)
143		96
		97	case $host in
		98	--solaris*)
		99	AC_DEFINE(__EXTENSIONS__, 1, Enable declarations in utmp.h on Solaris when the XPG4v2 namespace is active)
		100	;;
		101	esac
		102
144	dnl# --------------------------------------------------------------------------	103	dnl# --------------------------------------------------------------------------
145	dnl# DO ALL UTMP AND WTMP CHECKING	104	dnl# DO ALL UTMP AND WTMP CHECKING
146	dnl# --------------------------------------------------------------------------	105	dnl# --------------------------------------------------------------------------
147	dnl# check for host field in utmp structure	106	dnl# check for host field in utmp structure
148		107
149	dnl# --------------------------------------------	108	dnl# --------------------------------------------
150	AC_CHECK_HEADERS(utmp.h,	109	AC_CHECK_HEADERS(utmp.h,
151	[AC_CACHE_CHECK([for struct utmp], pt_cv_struct_utmp,	110	AC_CHECK_TYPES([struct utmp], [], [], [
152	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>	111	#include <sys/types.h>
153	#include <utmp.h>]], [[struct utmp ut;]])],[pt_cv_struct_utmp=yes],[pt_cv_struct_utmp=no])])	112	#include <utmp.h>
154	if test x$pt_cv_struct_utmp = xyes; then	113	])
155	AC_DEFINE(HAVE_STRUCT_UTMP, 1, Define if utmp.h has struct utmp)
156	fi
157	]
158		114
159	AC_CACHE_CHECK(for ut_host in utmp struct, pt_cv_struct_utmp_host,	115	AC_CHECK_MEMBER([struct utmp.ut_host],
160	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
161	#include <utmp.h>]], [[struct utmp ut; ut.ut_host;]])],[pt_cv_struct_utmp_host=yes],[pt_cv_struct_utmp_host=no])])
162	if test x$pt_cv_struct_utmp_host = xyes; then
163	AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host)	116	[AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host)], [], [
164	fi	117	#include <sys/types.h>
		118	#include <utmp.h>
		119	])
165		120
166	AC_CACHE_CHECK(for ut_pid in utmp struct, pt_cv_struct_utmp_pid,	121	AC_CHECK_MEMBER([struct utmp.ut_pid],
167	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
168	#include <utmp.h>]], [[struct utmp ut; ut.ut_pid;]])],[pt_cv_struct_utmp_pid=yes],[pt_cv_struct_utmp_pid=no])])
169	if test x$pt_cv_struct_utmp_pid = xyes; then
170	AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid)	122	[AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid)], [], [
171	fi	123	#include <sys/types.h>
		124	#include <utmp.h>
		125	])
172	) dnl# AC_CHECK_HEADERS(utmp.h	126	) dnl# AC_CHECK_HEADERS(utmp.h
173		127
174	dnl# --------------------------------------------	128	dnl# --------------------------------------------
175		129
176	AC_CHECK_HEADERS(utmpx.h,	130	AC_CHECK_HEADERS(utmpx.h,
177	[AC_CACHE_CHECK([for struct utmpx], pt_cv_struct_utmpx,	131	AC_CHECK_TYPES([struct utmpx], [], [], [
178	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>	132	#include <sys/types.h>
179	#include <utmpx.h>]], [[struct utmpx ut;]])],[pt_cv_struct_utmpx=yes],[pt_cv_struct_utmpx=no])])	133	#include <utmpx.h>
180	if test x$pt_cv_struct_utmpx = xyes; then	134	])
181	AC_DEFINE(HAVE_STRUCT_UTMPX, 1, Define if utmpx.h has struct utmpx)
182	fi
183	]
184		135
185	AC_CACHE_CHECK(for host in utmpx struct, pt_cv_struct_utmpx_host,	136	AC_CHECK_MEMBER([struct utmpx.ut_host],
186	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
187	#include <utmpx.h>]], [[struct utmpx utx; utx.ut_host;]])],[pt_cv_struct_utmpx_host=yes],[pt_cv_struct_utmpx_host=no])])
188	if test x$pt_cv_struct_utmpx_host = xyes; then
189	AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)	137	[AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)], [], [
190	fi	138	#include <sys/types.h>
191		139	#include <utmpx.h>
192	AC_CACHE_CHECK(for session in utmpx struct, pt_cv_struct_utmpx_session,	140	])
193	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
194	#include <utmpx.h>]], [[struct utmpx utx; utx.ut_session;]])],[pt_cv_struct_utmpx_session=yes],[pt_cv_struct_utmpx_session=no])])
195	if test x$pt_cv_struct_utmpx_session = xyes; then
196	AC_DEFINE(HAVE_UTMPX_SESSION, 1, Define if struct utmpx contains ut_session)
197	fi
198	) dnl# AC_CHECK_HEADERS(utmpx.h	141	) dnl# AC_CHECK_HEADERS(utmpx.h
199		142
200	dnl# --------------------------------------------------------------------------	143	dnl# --------------------------------------------------------------------------
201	dnl# check for struct lastlog	144	dnl# check for struct lastlog
202	AC_CACHE_CHECK(for struct lastlog, pt_cv_struct_lastlog,	145	AC_CHECK_TYPES([struct lastlog], [], [], [
203	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>	146	#include <sys/types.h>
204	#include <utmp.h>	147	#include <utmp.h>
205	#ifdef HAVE_LASTLOG_H	148	#ifdef HAVE_LASTLOG_H
206	#include <lastlog.h>	149	#include <lastlog.h>
207	#endif	150	#endif
208	]], [[struct lastlog ll;]])],[pt_cv_struct_lastlog=yes],[pt_cv_struct_lastlog=no])])	151	])
209	if test x$pt_cv_struct_lastlog = xyes; then
210	AC_DEFINE(HAVE_STRUCT_LASTLOG, 1, Define if utmp.h or lastlog.h has struct lastlog)
211	fi
212		152
213	dnl# check for struct lastlogx	153	dnl# check for struct lastlogx
214	AC_CACHE_CHECK(for struct lastlogx, pt_cv_struct_lastlogx,	154	AC_CHECK_TYPES([struct lastlogx], [], [], [
215	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>	155	#include <sys/types.h>
216	#include <utmpx.h>	156	#include <utmpx.h>
217	#ifdef HAVE_LASTLOG_H	157	#ifdef HAVE_LASTLOG_H
218	#include <lastlog.h>	158	#include <lastlog.h>
219	#endif	159	#endif
220	]], [[struct lastlogx ll;]])],[pt_cv_struct_lastlogx=yes],[pt_cv_struct_lastlogx=no])])	160	])
221	if test x$pt_cv_struct_lastlogx = xyes; then
222	AC_DEFINE(HAVE_STRUCT_LASTLOGX, 1, Define if utmpx.h or lastlog.h has struct lastlogx)
223	fi
224		161
225	dnl# --------------------------------------------------------------------------	162	dnl# --------------------------------------------------------------------------
226	dnl# FIND FILES	163	dnl# FIND FILES
227	dnl# --------------------------------------------------------------------------	164	dnl# --------------------------------------------------------------------------
228		165
229	dnl# find utmp	166	dnl# find utmp
230	PT_FIND_FILE([utmp], [UTMP_FILE], [_PATH_UTMP],	167	PT_FIND_FILE([utmp], [PT_UTMP_FILE],
231	["/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp"],[	168	["/var/run/utmp" "/var/adm/utmp" "/etc/utmp" "/usr/etc/utmp" "/usr/adm/utmp"])
232	#include <sys/types.h>
233	#include <utmp.h>
234	])
235		169
236	dnl# --------------------------------------------------------------------------	170	dnl# --------------------------------------------------------------------------
237		171
238	dnl# find wtmp	172	dnl# find wtmp
239	PT_FIND_FILE([wtmp], [WTMP_FILE], [_PATH_WTMP],	173	PT_FIND_FILE([wtmp], [PT_WTMP_FILE],
240	["/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp"],[	174	["/var/log/wtmp" "/var/adm/wtmp" "/etc/wtmp" "/usr/etc/wtmp" "/usr/adm/wtmp"])
241	#include <sys/types.h>
242	#ifdef HAVE_UTMP_H
243	#include <utmp.h>
244	#endif
245	])
246	dnl# --------------------------------------------------------------------------	175	dnl# --------------------------------------------------------------------------
247		176
248	dnl# find wtmpx	177	dnl# find wtmpx
249	PT_FIND_FILE([wtmpx], [WTMPX_FILE], [_PATH_WTMPX],	178	PT_FIND_FILE([wtmpx], [PT_WTMPX_FILE],
250	["/var/log/wtmpx", "/var/adm/wtmpx"],[	179	["/var/log/wtmpx" "/var/adm/wtmpx"])
251	#ifdef HAVE_UTMPX_H
252	#include <utmpx.h>
253	#endif
254	])
255	dnl# --------------------------------------------------------------------------	180	dnl# --------------------------------------------------------------------------
256		181
257	dnl# find lastlog	182	dnl# find lastlog
258	PT_FIND_FILE([lastlog], [LASTLOG_FILE], [_PATH_LASTLOG],	183	PT_FIND_FILE([lastlog], [PT_LASTLOG_FILE],
259	["/var/log/lastlog"],[	184	["/var/log/lastlog" "/var/adm/lastlog"])
260	#include <sys/types.h>
261	#ifdef HAVE_UTMP_H
262	#include <utmp.h>
263	#endif
264	#ifdef HAVE_LASTLOG_H
265	#include <lastlog.h>
266	#endif
267	])
268	dnl# --------------------------------------------------------------------------	185	dnl# --------------------------------------------------------------------------
269		186
270	dnl# find lastlogx	187	dnl# find lastlogx
271	PT_FIND_FILE([lastlogx], [LASTLOGX_FILE], [_PATH_LASTLOGX],	188	PT_FIND_FILE([lastlogx], [PT_LASTLOGX_FILE],
272	["/var/log/lastlogx", "/var/adm/lastlogx"],[	189	["/var/log/lastlogx" "/var/adm/lastlogx"])
273	#ifdef HAVE_UTMPX_H
274	#include <utmpx.h>
275	#endif
276	])
277	])	190	])
278		191
279	AC_DEFUN([SCM_RIGHTS_CHECK],	192	AC_DEFUN([SCM_RIGHTS_CHECK],
280	[	193	[
		194	case $host in
		195	--solaris*)
		196	AC_DEFINE(_XOPEN_SOURCE, 500, Enable declarations of msg_control and msg_controllen on Solaris)
		197	AC_SEARCH_LIBS(sendmsg, socket)
		198	;;
		199	esac
		200
281	AC_CACHE_CHECK(for unix-compliant filehandle passing ability, pt_cv_can_pass_fds,	201	AC_CACHE_CHECK(for unix-compliant filehandle passing ability, pt_cv_can_pass_fds,
282	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[	202	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[
283	#include <cstddef> // broken bsds (is that redundant?) need this	203	#include <stddef.h> // broken bsds (is that redundant?) need this
284	#include <sys/types.h>	204	#include <sys/types.h>
285	#include <sys/socket.h>	205	#include <sys/socket.h>
286	#include <sys/uio.h>	206	#include <sys/uio.h>
287	]], [[	207	]], [[
288	{	208	{

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libptytty/ptytty.m4 (file contents): Revision 1.25 by sf-exg, Thu May 12 16:43:47 2011 UTC vs. Revision 1.36 by sf-exg, Thu Jan 19 13:30:58 2012 UTC

Diff Legend

Comparing libptytty/ptytty.m4 (file contents):
Revision 1.25 by sf-exg, Thu May 12 16:43:47 2011 UTC vs.
Revision 1.36 by sf-exg, Thu Jan 19 13:30:58 2012 UTC