# HG changeset patch
# User jwe
# Date 799356010 0
# Node ID 4d86fe3f634e74c6da5f63f8cdc2815e49c4b1a2
# Parent  484e9457918252c228e323ea8ceaa68ce2df4cef
[project @ 1995-05-01 19:18:03 by jwe]

diff -r 484e94579182 -r 4d86fe3f634e acconfig.h
--- a/acconfig.h	Mon May 01 18:53:09 1995 +0000
+++ b/acconfig.h	Mon May 01 19:20:10 1995 +0000
@@ -20,6 +20,9 @@
 /* Define if you don't have FSQP. */
 #undef FSQP_MISSING
 
+/* Define if your system has a single-arg prototype for gettimeofday. */
+#undef GETTIMEOFDAY_NO_TZ
+
 /* Define if you have finite.  */
 #undef HAVE_FINITE
 
@@ -50,6 +53,9 @@
 /* Define if this is Octave. */
 #undef OCTAVE_SOURCE
 
+/* Define if you don't have QPSOL. */
+#undef QPSOL_MISSING
+
 /* Define this to be the path separator for your system, as a
    character constant */
 #undef SEPCHAR
@@ -58,8 +64,11 @@
    character string */
 #undef SEPCHAR_STR
 
-/* Define if you don't have QPSOL. */
-#undef QPSOL_MISSING
+/* Define if math.h declares signgam. */
+#undef SIGNGAM_DECLARED
+
+/* To quiet autoheader. */
+#undef SMART_PUTENV
 
 /* Use GNU info for extended help system. */
 #undef USE_GNU_INFO
@@ -67,12 +76,6 @@
 /* Use GNU readline for command line editing and history. */
 #undef USE_READLINE
 
-/* Define if math.h declares signgam. */
-#undef SIGNGAM_DECLARED
-
-/* To quiet autoheader. */
-#undef SMART_PUTENV
-
 /* Define if using dld for dynamic linking of object files. */
 #undef WITH_DLD
 
diff -r 484e94579182 -r 4d86fe3f634e configure.in
--- a/configure.in	Mon May 01 18:53:09 1995 +0000
+++ b/configure.in	Mon May 01 19:20:10 1995 +0000
@@ -20,7 +20,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_REVISION($Revision: 1.121 $)
+AC_REVISION($Revision: 1.122 $)
 AC_PREREQ(2.0)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -188,15 +188,16 @@
 if $use_dld; then
   DLD_DIR=dld
   LIBDLD='../dld/libdld.a'
-# don't link them in only if doing dynamic linking and small kernel
-# requested.
-  if $lite_kernel; then
-    LIBOCTDLD=
-  fi
   LD_STATIC_FLAG=-static
   AC_DEFINE(WITH_DLD, 1)
 fi
 
+### Don't link these functions if small kernel option requested.
+
+if $lite_kernel; then
+  LIBOCTDLD=
+fi
+
 ### Also use -static if compiling on Alpha OSF/1 1.3 systems.
 
 case "$canonical_host_type" in
@@ -572,7 +573,15 @@
 
 AC_CHECK_FUNCS(setvbuf getcwd gethostname bzero bcopy rindex vfprintf vsprintf)
 AC_CHECK_FUNCS(stricmp strnicmp strcasecmp strncasecmp strerror atexit)
-AC_CHECK_FUNCS(on_exit tempnam memmove putenv gettimeofday getrusage)
+AC_CHECK_FUNCS(on_exit tempnam memmove putenv getrusage)
+
+### There is more than one possible prototype for gettimeofday.  See
+### which one (if any) appears in sys/time.h.
+
+AC_CHECK_FUNC(gettimeofday,
+  AC_TRY_COMPILE([#include <sys/time.h>],
+  [gettimeofday ((struct timeval *) 0,(struct timezone *) 0);],
+  [], AC_DEFINE(GETTIMEOFDAY_NO_TZ)))
 
 dnl Would like to get rid of this cruft, and just have
 dnl
diff -r 484e94579182 -r 4d86fe3f634e src/timefns.cc
--- a/src/timefns.cc	Mon May 01 18:53:09 1995 +0000
+++ b/src/timefns.cc	Mon May 01 19:20:10 1995 +0000
@@ -99,7 +99,11 @@
 
   struct timeval tp;
 
+#ifdef GETTIMEOFDAY_NO_TZ
+  gettimeofday (&tp);
+#else
   gettimeofday (&tp, 0);
+#endif
 
   now = tp.tv_sec;