merge sessreg 1.0.3

4 files changed, 15 insertions, 28 deletions

diff --git a/app/sessreg/Makefile.am b/app/sessreg/Makefile.am
index 83f4b58c4..f3d41a784 100644
--- a/app/sessreg/Makefile.am
+++ b/app/sessreg/Makefile.am
@@ -20,7 +20,7 @@
 
 bin_PROGRAMS = sessreg
 
-sessreg_CFLAGS = $(SESSREG_CFLAGS)
+AM_CFLAGS = $(SESSREG_CFLAGS)
 
 sessreg_SOURCES =	\
 	sessreg.h	\
diff --git a/app/sessreg/Makefile.in b/app/sessreg/Makefile.in
index fa1af0bbd..a92804ab5 100644
--- a/app/sessreg/Makefile.in
+++ b/app/sessreg/Makefile.in
@@ -75,7 +75,7 @@ CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_sessreg_OBJECTS = sessreg-sessreg.$(OBJEXT)
+am_sessreg_OBJECTS = sessreg.$(OBJEXT)
 sessreg_OBJECTS = $(am_sessreg_OBJECTS)
 sessreg_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
@@ -210,7 +210,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-sessreg_CFLAGS = $(SESSREG_CFLAGS)
+AM_CFLAGS = $(SESSREG_CFLAGS)
 sessreg_SOURCES = \
 	sessreg.h	\
         sessreg.c
@@ -331,7 +331,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sessreg-sessreg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sessreg.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -346,20 +346,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-sessreg-sessreg.o: sessreg.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sessreg_CFLAGS) $(CFLAGS) -MT sessreg-sessreg.o -MD -MP -MF "$(DEPDIR)/sessreg-sessreg.Tpo" -c -o sessreg-sessreg.o `test -f 'sessreg.c' || echo '$(srcdir)/'`sessreg.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/sessreg-sessreg.Tpo" "$(DEPDIR)/sessreg-sessreg.Po"; else rm -f "$(DEPDIR)/sessreg-sessreg.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sessreg.c' object='sessreg-sessreg.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sessreg_CFLAGS) $(CFLAGS) -c -o sessreg-sessreg.o `test -f 'sessreg.c' || echo '$(srcdir)/'`sessreg.c
-
-sessreg-sessreg.obj: sessreg.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sessreg_CFLAGS) $(CFLAGS) -MT sessreg-sessreg.obj -MD -MP -MF "$(DEPDIR)/sessreg-sessreg.Tpo" -c -o sessreg-sessreg.obj `if test -f 'sessreg.c'; then $(CYGPATH_W) 'sessreg.c'; else $(CYGPATH_W) '$(srcdir)/sessreg.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/sessreg-sessreg.Tpo" "$(DEPDIR)/sessreg-sessreg.Po"; else rm -f "$(DEPDIR)/sessreg-sessreg.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sessreg.c' object='sessreg-sessreg.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sessreg_CFLAGS) $(CFLAGS) -c -o sessreg-sessreg.obj `if test -f 'sessreg.c'; then $(CYGPATH_W) 'sessreg.c'; else $(CYGPATH_W) '$(srcdir)/sessreg.c'; fi`
 uninstall-info-am:
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
diff --git a/app/sessreg/configure b/app/sessreg/configure
index bc72bff72..2f4a2f6ab 100644
--- a/app/sessreg/configure
+++ b/app/sessreg/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for sessreg 1.0.2.
+# Generated by GNU Autoconf 2.59 for sessreg 1.0.3.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sessreg'
 PACKAGE_TARNAME='sessreg'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='sessreg 1.0.2'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='sessreg 1.0.3'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 # Factoring default headers for most tests.
@@ -791,7 +791,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sessreg 1.0.2 to adapt to many kinds of systems.
+\`configure' configures sessreg 1.0.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -857,7 +857,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sessreg 1.0.2:";;
+     short | recursive ) echo "Configuration of sessreg 1.0.3:";;
    esac
   cat <<\_ACEOF
 
@@ -991,7 +991,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-sessreg configure 1.0.2
+sessreg configure 1.0.3
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1005,7 +1005,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sessreg $as_me 1.0.2, which was
+It was created by sessreg $as_me 1.0.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1648,7 +1648,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sessreg'
- VERSION='1.0.2'
+ VERSION='1.0.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4955,7 +4955,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by sessreg $as_me 1.0.2, which was
+This file was extended by sessreg $as_me 1.0.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5018,7 +5018,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sessreg config.status 1.0.2
+sessreg config.status 1.0.3
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/app/sessreg/sessreg.h b/app/sessreg/sessreg.h
index 84f8babca..9765e1753 100644
--- a/app/sessreg/sessreg.h
+++ b/app/sessreg/sessreg.h
@@ -55,6 +55,7 @@
 
 #include "config.h"
 
+#include <sys/types.h>
 #include <time.h>
 #include <utmp.h>