[Apcupsd-commits] apcupsd/autoconf aclocal.m4, 1.11.2.2, 1.11.2.3 configure.in, 1.129.2.7, 1.129.2.8

[Adam K. <ad...@us...>]

Update of /cvsroot/apcupsd/apcupsd/autoconf
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv3141/autoconf

Modified Files:
      Tag: Branch-3_14
	aclocal.m4 configure.in 
Log Message:
Revert ctime_r() change. It is not actually necessary.


Index: aclocal.m4
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/autoconf/aclocal.m4,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -d -r1.11.2.2 -r1.11.2.3
--- aclocal.m4	3 Feb 2008 20:48:14 -0000	1.11.2.2
+++ aclocal.m4	3 Feb 2008 21:37:00 -0000	1.11.2.3
@@ -721,36 +721,3 @@
 
 ]) dnl end AC_DEFUN
 
-
-AC_DEFUN([FUNC_WHICH_CTIME_R], [
-
-    AC_MSG_CHECKING(for ctime_r)
-     if test -z "$ac_cv_ctime_args"; then
-         AC_TRY_COMPILE(
-         [#include <time.h>],
-         [
-             time_t clock;
-             char buf[26];
-             ctime_r(&clock, buf);
-         ], ac_cv_ctime_args=2)
-
-         AC_TRY_COMPILE(
-         [#include <time.h>],
-         [
-             time_t clock;
-             char buf[26];
-             ctime_r(&clock, buf, 26);
-         ], ac_cv_ctime_args=3)
-     fi
-     if test -z "$ac_cv_ctime_args"; then
-         AC_MSG_RESULT(no)
-     else
-         if test "$ac_cv_ctime_args" = 2; then
-             AC_DEFINE(HAVE_FUNC_CTIME_R_2)
-         elif test "$ac_cv_ctime_args" = 3; then
-             AC_DEFINE(HAVE_FUNC_CTIME_R_3)
-         fi
-         AC_MSG_RESULT([yes, and it takes $ac_cv_ctime_args arguments])
-     fi 
- 
-]) dnl end AC_DEFUN

Index: configure.in
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/autoconf/configure.in,v
retrieving revision 1.129.2.7
retrieving revision 1.129.2.8
diff -u -d -r1.129.2.7 -r1.129.2.8
--- configure.in	3 Feb 2008 20:48:14 -0000	1.129.2.7
+++ configure.in	3 Feb 2008 21:37:00 -0000	1.129.2.8
@@ -967,24 +967,6 @@
          ;;
       esac
 
-      dnl
-      dnl Figure out which ctime_r() variant we have
-      dnl
-      FUNC_WHICH_CTIME_R
-      case "$ac_cv_ctime_args" in
-         2)
-         GAPCMON_CFLAGS="$GAPCMON_CFLAGS -DHAVE_FUNC_CTIME_R_2"
-         ;;
-
-         3)
-         GAPCMON_CFLAGS="$GAPCMON_CFLAGS -DHAVE_FUNC_CTIME_R_3"
-         ;;
-
-         *)
-         AC_MSG_ERROR([gapcmon requires ctime_r])
-         ;;
-      esac
-
    fi],
   [])
 AC_SUBST(GAPCMON)