Attachment 1299 Details for Bug 1243 – Have configure figure out whether paths.h defines.

[patch] Have configure figure out whether paths.h defines.

openssh-paths.patch (text/plain), 2.22 KB, created by Darren Tucker on 2007-05-31 17:58:26 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2007-05-31 17:58:26 AEST

Size: 2.22 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/configure.ac,v
>retrieving revision 1.361
>diff -u -p -r1.361 configure.ac
>--- configure.ac	7 Sep 2006 01:11:29 -0000	1.361
>+++ configure.ac	7 Sep 2006 21:03:14 -0000
>@@ -3283,6 +3283,33 @@ else
> 	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`
>Index: defines.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/defines.h,v
>retrieving revision 1.137
>diff -u -p -r1.137 defines.h
>--- defines.h	18 Aug 2006 22:38:24 -0000	1.137
>+++ defines.h	7 Sep 2006 05:00:52 -0000
>@@ -318,16 +318,6 @@ struct winsize {
> 
> /* Paths */
> 
>-#ifndef _PATH_BSHELL
>-# define _PATH_BSHELL "/bin/sh"
>-#endif
>-#ifndef _PATH_CSHELL
>-# define _PATH_CSHELL "/bin/csh"
>-#endif
>-#ifndef _PATH_SHELLS
>-# define _PATH_SHELLS "/etc/shells"
>-#endif
>-
> #ifdef USER_PATH
> # ifdef _PATH_STDPATH
> #  undef _PATH_STDPATH
>@@ -347,6 +337,8 @@ struct winsize {
> # define _PATH_DEVNULL "/dev/null"
> #endif
> 
>+#ifndef PATH_MAILDIR_IN_PATHS_H
>+
> #ifndef MAIL_DIRECTORY
> # define MAIL_DIRECTORY "/var/spool/mail"
> #endif
>@@ -359,6 +351,8 @@ struct winsize {
> # define _PATH_MAILDIR MAILDIR
> #endif /* !defined(_PATH_MAILDIR) && defined(MAILDIR) */
> 
>+#endif /* PATH_MAILDIR_IN_PATHS_H */
>+
> #ifndef _PATH_NOLOGIN
> # define _PATH_NOLOGIN "/etc/nologin"
> #endif

Actions: View | Diff

Attachments on bug 1243: 1299