Attachment #1299 for bug #1243

View | Details | Raw Unified | Return to bug 1243
Collapse All | Expand All




	AC_SUBST(XAUTH_PATH)
fi


AC_CHECK_DECL(_PATH_BSHELL, ,
	AC_DEFINE_UNQUOTED(_PATH_BSHELL, "/bin/sh",
	    [Define to your Bourne shell if not defined in paths.h])
	[ #include <paths.h> ]
)

AC_CHECK_DECL(_PATH_CSHELL, ,
	AC_DEFINE_UNQUOTED(_PATH_CSHELL, "/bin/csh",
	    [Define to your C shell if not defined in paths.h])
	[ #include <paths.h> ]
)

AC_CHECK_DECL(_PATH_SHELLS, ,
	AC_DEFINE_UNQUOTED(_PATH_BSHELL, "/etc/shells",
	    [Define to your shells file if not defined in paths.h])
	[ #include <paths.h> ]
)

# if _PATH_MAILDIR is in paths.h then we won't go hunting for it.
AC_CHECK_DECL(_PATH_MAILDIR,
	AC_DEFINE(PATH_MAILDIR_IN_PATHS_H, 1,
	    [Define if _PATH_MAILDIR is in paths.h]),
	,
	[ #include <paths.h> ]
)

# Check for mail directory (last resort if we cannot get it from headers)
if test ! -z "$MAIL" ; then
	maildir=`dirname $MAIL`

Lines 318-333 struct winsize { Link Here

(-)defines.h (-10 / +4 lines)
318		318
319	/* Paths */	319	/* Paths */
320		320
321	#ifndef _PATH_BSHELL
322	# define _PATH_BSHELL "/bin/sh"
323	#endif
324	#ifndef _PATH_CSHELL
325	# define _PATH_CSHELL "/bin/csh"
326	#endif
327	#ifndef _PATH_SHELLS
328	# define _PATH_SHELLS "/etc/shells"
329	#endif
330
331	#ifdef USER_PATH	321	#ifdef USER_PATH
332	# ifdef _PATH_STDPATH	322	# ifdef _PATH_STDPATH
333	# undef _PATH_STDPATH	323	# undef _PATH_STDPATH
Lines 347-352 struct winsize { Link Here
347	# define _PATH_DEVNULL "/dev/null"	337	# define _PATH_DEVNULL "/dev/null"
348	#endif	338	#endif
349		339
		340	#ifndef PATH_MAILDIR_IN_PATHS_H
		341
350	#ifndef MAIL_DIRECTORY	342	#ifndef MAIL_DIRECTORY
351	# define MAIL_DIRECTORY "/var/spool/mail"	343	# define MAIL_DIRECTORY "/var/spool/mail"
352	#endif	344	#endif
Lines 359-364 struct winsize { Link Here
359	# define _PATH_MAILDIR MAILDIR	351	# define _PATH_MAILDIR MAILDIR
360	#endif /* !defined(_PATH_MAILDIR) && defined(MAILDIR) */	352	#endif /* !defined(_PATH_MAILDIR) && defined(MAILDIR) */
361		353
		354	#endif /* PATH_MAILDIR_IN_PATHS_H */
		355
362	#ifndef _PATH_NOLOGIN	356	#ifndef _PATH_NOLOGIN
363	# define _PATH_NOLOGIN "/etc/nologin"	357	# define _PATH_NOLOGIN "/etc/nologin"
364	#endif	358	#endif

Return to bug 1243

Lines 3283-3288 else Link Here

(-)configure.ac (+27 lines)
3283	AC_SUBST(XAUTH_PATH)	3283	AC_SUBST(XAUTH_PATH)
3284	fi	3284	fi
3285		3285
		3286
		3287	AC_CHECK_DECL(_PATH_BSHELL, ,
		3288	AC_DEFINE_UNQUOTED(_PATH_BSHELL, "/bin/sh",
		3289	[Define to your Bourne shell if not defined in paths.h])
		3290	[ #include <paths.h> ]
		3291	)
		3292
		3293	AC_CHECK_DECL(_PATH_CSHELL, ,
		3294	AC_DEFINE_UNQUOTED(_PATH_CSHELL, "/bin/csh",
		3295	[Define to your C shell if not defined in paths.h])
		3296	[ #include <paths.h> ]
		3297	)
		3298
		3299	AC_CHECK_DECL(_PATH_SHELLS, ,
		3300	AC_DEFINE_UNQUOTED(_PATH_BSHELL, "/etc/shells",
		3301	[Define to your shells file if not defined in paths.h])
		3302	[ #include <paths.h> ]
		3303	)
		3304
		3305	# if _PATH_MAILDIR is in paths.h then we won't go hunting for it.
		3306	AC_CHECK_DECL(_PATH_MAILDIR,
		3307	AC_DEFINE(PATH_MAILDIR_IN_PATHS_H, 1,
		3308	[Define if _PATH_MAILDIR is in paths.h]),
		3309	,
		3310	[ #include <paths.h> ]
		3311	)
		3312
3286	# Check for mail directory (last resort if we cannot get it from headers)	3313	# Check for mail directory (last resort if we cannot get it from headers)
3287	if test ! -z "$MAIL" ; then	3314	if test ! -z "$MAIL" ; then
3288	maildir=`dirname $MAIL`	3315	maildir=`dirname $MAIL`