summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-10-05 04:06:35 +0000
committerKevin E Martin <kem@kem.org>2005-10-05 04:06:35 +0000
commite33c62dfa7641e8e37a2ef64d98aa5171f2ef705 (patch)
tree8e0369bcc494569b0c5bb6f88a8a6ed96fe20cc2
parentaf48c05e4b8639935e8e0738dc0269708c2e929c (diff)
Get sessreg.man from $(srcdir) to fix make distcheck
Add check for utmpx.ut_syslen structure member
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac5
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e69de29..0ea3ed2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,7 @@
+2005-10-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * Makefile.am:
+ Get sessreg.man from $(srcdir) to fix make distcheck
+
+ * configure.ac:
+ Add check for utmpx.ut_syslen structure member
diff --git a/Makefile.am b/Makefile.am
index 7389323..2159c4c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,9 +29,9 @@ sessreg_SOURCES = \
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
-sessreg.1: sessreg.man
+sessreg.1: $(srcdir)/sessreg.man
sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- < sessreg.man > sessreg.1
+ < $(srcdir)/sessreg.man > sessreg.1
man1_MANS = sessreg.1
CLEANFILES = $(man1_MANS)
diff --git a/configure.ac b/configure.ac
index c8468bf..1ed6d3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,11 @@ AC_PROG_CC
AC_PROG_INSTALL
AC_CHECK_HEADERS([lastlog.h utmpx.h sys/param.h])
+AC_CHECK_MEMBER([struct utmpx.ut_syslen],
+ HAVE_SYSLEN=1,
+ HAVE_SYSLEN=0)
+AC_DEFINE_UNQUOTED(HAVE_UTMPX_UT_SYSLEN,$HAVE_SYSLEN,
+ [utmpx structure includes ut_syslen field])
AC_SYS_LARGEFILE