[PATCH app-sessreg 1/1] config: use AC_CHECK_MEMBERS rather than AC_CHECK_MEMBER
Gaetan Nadon
memsize at videotron.ca
Wed Jan 19 15:36:08 PST 2011
Let Autoconf do the work of setting up the #define in config.h.
Apply and comment standard sections layout.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
configure.ac | 11 ++++-------
sessreg.c | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index f3c9f4e..c7e5e90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,17 +42,14 @@ XORG_WITH_LINT
# Checks for header files.
AC_CHECK_HEADERS([lastlog.h utmp.h utmpx.h sys/param.h])
-AC_CHECK_MEMBER([struct utmpx.ut_syslen],
- HAVE_SYSLEN=1,
- HAVE_SYSLEN=0,
- [#include <utmpx.h>])
-AC_DEFINE_UNQUOTED(HAVE_UTMPX_UT_SYSLEN,$HAVE_SYSLEN,
- [utmpx structure includes ut_syslen field])
# Checks for typedefs, structures, and compiler characteristics.
+AC_CHECK_MEMBERS([struct utmpx.ut_syslen], [], [], [#include <utmpx.h>])
+
+# Checks for library functions.
AC_CHECK_FUNCS([updwtmpx utmpxname])
-# Checks for pkg-config packages
+# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(SESSREG, xproto)
AC_CONFIG_FILES([
diff --git a/sessreg.c b/sessreg.c
index 809bed4..40ec450 100644
--- a/sessreg.c
+++ b/sessreg.c
@@ -477,7 +477,7 @@ set_utmpx (struct utmpx *u, const char *line, const char *user,
(void) strncpy (u->ut_line, line, sizeof (u->ut_line));
strncpy(u->ut_host, line, sizeof(u->ut_host));
-#if HAVE_UTMPX_UT_SYSLEN
+#ifdef HAVE_STRUCT_UTMPX_UT_SYSLEN
u->ut_syslen = strlen(line);
#endif
}
--
1.6.0.4
More information about the xorg-devel
mailing list