Re: runit on AIX

[Gerrit Pape <pape@smarden.org>]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

On Mon, Jun 25, 2007 at 08:27:39AM -0400, Daniel Clark wrote:
> Yay! - runit seems to be working fine on AIX 5.2 ML1 and AIX 5.3 ML5.
> The only required change was to rename some defines in
> "compile/uw_tmp.h1":
> 
> -#define UW_TMP_UFILE _PATH_UTMP
> -#define UW_TMP_WFILE _PATH_WTMP
> +#define UW_TMP_UFILE UTMP_FILE
> +#define UW_TMP_WFILE WTMP_FILE

Hi Daniel, simply falling back to UTMP_FILE if _PATH_UTMP isn't defined
should do it, see the patch below.

Thanks, Gerrit.

[-- Attachment #2: diff --]
[-- Type: text/plain, Size: 464 bytes --]

diff --git a/src/uw_tmp.h1 b/src/uw_tmp.h1
index 57231fb..2d5e994 100644
--- a/src/uw_tmp.h1
+++ b/src/uw_tmp.h1
@@ -3,7 +3,17 @@
 
 /* sysdep: -utmpx */
 
+#ifdef _PATH_UTMP
 #define UW_TMP_UFILE _PATH_UTMP
 #define UW_TMP_WFILE _PATH_WTMP
+#else
+/* AIX only has UTMP_FILE */
+#ifdef UTMP_FILE
+#define UW_TMP_UFILE UTMP_FILE
+#define UW_TMP_WFILE WTMP_FILE
+#else
+#error neither _PATH_UTMP nor UTMP_FILE defined.
+#endif
+#endif
 
 typedef struct utmp uw_tmp;