remove check-utmp.m4 (copied it to libzvt, which is the only thing using

2003-02-19  James Henstridge  <james@daa.com.au>

    * Makefile.am (GNOME2_MACROS): remove check-utmp.m4 (copied it to
    libzvt, which is the only thing using it).

svn path=/trunk/; revision=2776

3 files changed, 3 insertions, 244 deletions

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index 952031cb..d3a95135 100644
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,5 +1,8 @@
 2003-02-19  James Henstridge  <james@daa.com.au>
 
+	* Makefile.am (GNOME2_MACROS): remove check-utmp.m4 (copied it to
+	libzvt, which is the only thing using it).
+
 	* gnome-deprecated-macros.m4(GNOME_CHECK_CXX): AC_REQUIRE does not
 	work within AU_DEFUN, so change to a simple call to AC_PROG_CXX.
 
diff --git a/macros2/Makefile.am b/macros2/Makefile.am
index 0b067d59..705d73d6 100644
--- a/macros2/Makefile.am
+++ b/macros2/Makefile.am
@@ -4,7 +4,6 @@ GNOME2_MACROS = \
   compiler-flags.m4 \
   curses.m4 \
   gnome-common.m4 \
-  check-utmp.m4 \
   gnome-deprecated-macros.m4
 
 EXTRA_DIST = $(GNOME2_MACROS) autogen.sh
diff --git a/macros2/check-utmp.m4 b/macros2/check-utmp.m4
deleted file mode 100644
index 5653923d..00000000
--- a/macros2/check-utmp.m4
+++ /dev/null
@@ -1,243 +0,0 @@
-# Checks for availability of various utmp fields
-#
-# Original code by Bernhard Rosenkraenzer (bero@linux.net.eu.org), 1998.
-# Modifications by Timur Bakeyev (timur@gnu.org), 1999.
-#
-
-dnl AC_CHECK_UTMP()
-dnl Test for presence of the field and define HAVE_UT_UT_field macro
-dnl
-
-AC_DEFUN(AC_CHECK_UTMP,[
-
-AC_CHECK_HEADERS(sys/time.h utmp.h utmpx.h)
-AC_HEADER_TIME
-
-if test "$ac_cv_header_utmpx_h" = "yes"; then
-    AC_DEFINE(UTMP,[struct utmpx])
-else
-    AC_DEFINE(UTMP,[struct utmp])
-fi
-
-dnl some systems (BSD4.4-like) require time.h to be included before utmp.h :/
-AC_MSG_CHECKING(for ut_host field in the utmp structure)
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif],[UTMP ut; char *p; p=ut.ut_host;],result=yes,result=no)
-if test "$result" = "yes"; then
-  AC_DEFINE(HAVE_UT_UT_HOST)
-fi
-AC_MSG_RESULT($result)
-
-AC_MSG_CHECKING(for ut_pid field in the utmp structure)
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif],[UTMP ut; int i; i=ut.ut_pid;],result=yes,result=no)
-if test "$result" = "yes"; then
-  AC_DEFINE(HAVE_UT_UT_PID)
-fi
-AC_MSG_RESULT($result)
-
-AC_MSG_CHECKING(for ut_id field in the utmp structure)
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif],[UTMP ut; char *p; p=ut.ut_id;],result=yes,result=no)
-if test "$result" = "yes"; then
-  AC_DEFINE(HAVE_UT_UT_ID)
-fi
-AC_MSG_RESULT($result)
-
-AC_MSG_CHECKING(for ut_name field in the utmp structure)
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif],[UTMP ut; char *p; p=ut.ut_name;],result=yes,result=no)
-if test "$result" = "yes"; then
-  AC_DEFINE(HAVE_UT_UT_NAME)
-fi
-AC_MSG_RESULT($result)
-
-AC_MSG_CHECKING(for ut_type field in the utmp structure)
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif],[UTMP ut; int i; i=(int) ut.ut_type;],result=yes,result=no)
-if test "$result" = "yes"; then
-  AC_DEFINE(HAVE_UT_UT_TYPE)
-fi
-AC_MSG_RESULT($result)
-
-AC_MSG_CHECKING(for ut_exit.e_termination field in the utmp structure)
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif],[UTMP ut; ut.ut_exit.e_termination=0;],result=yes,result=no)
-if test "$result" = "yes"; then
-  AC_DEFINE(HAVE_UT_UT_EXIT_E_TERMINATION)
-fi
-AC_MSG_RESULT($result)
-
-AC_MSG_CHECKING(for ut_user field in the utmp structure)
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif],[UTMP ut; char *p; p=ut.ut_user;],result=yes,result=no)
-if test "$result" = "yes"; then
-  AC_DEFINE(HAVE_UT_UT_USER)
-fi
-AC_MSG_RESULT($result)
-
-AC_MSG_CHECKING(for ut_time field in the utmp structure)
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif],[UTMP ut; ut.ut_time=0;],result=yes,result=no)
-if test "$result" = "yes"; then
-  AC_DEFINE(HAVE_UT_UT_TIME)
-fi
-AC_MSG_RESULT($result)
-
-AC_MSG_CHECKING(for ut_tv field in the utmp structure)
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif],[UTMP ut; ut.ut_tv.tv_sec=0; ut.ut_tv.tv_usec=0;],result=yes,result=no)
-if test "$result" = "yes"; then
-  AC_DEFINE(HAVE_UT_UT_TV)
-fi
-AC_MSG_RESULT($result)
-
-AC_MSG_CHECKING(for ut_syslen field in the utmp structure)
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif],[UTMP ut; ut.ut_syslen=0;],result=yes,result=no)
-if test "$result" = "yes"; then
-  AC_DEFINE(HAVE_UT_UT_SYSLEN)
-fi
-AC_MSG_RESULT($result)
-
-])