# HG changeset patch
# User jwe
# Date 832802465 0
# Node ID 22893e3c7fbf9550a3379d3a085f74b90b279c5b
# Parent  9dc512bdc19b8b1c9262af9a955b789bf217e783
[project @ 1996-05-22 22:00:47 by jwe]

diff -r 9dc512bdc19b -r 22893e3c7fbf Makeconf.in
--- a/Makeconf.in	Wed May 22 21:07:35 1996 +0000
+++ b/Makeconf.in	Wed May 22 22:01:05 1996 +0000
@@ -57,6 +57,8 @@
 
 DLFCN_INCFLAGS = @DLFCN_INCFLAGS@
 
+UCB_INCFLAGS = @UCB_INCFLAGS@
+
 # Clean up INCFLAGS a bit if we are not compiling in a separate
 # directory.
 ifeq ($(srcdir),.)
@@ -72,7 +74,7 @@
 	-I$(TOPDIR)/glob -I$(top_srcdir) -I$(top_srcdir)/liboctave \
 	-I$(top_srcdir)/src -I$(top_srcdir)/glob
 endif
-INCFLAGS = $(TMP_IF_1) $(TMP_IF_2) $(DLFCN_INCFLAGS)
+INCFLAGS = $(TMP_IF_1) $(TMP_IF_2) $(DLFCN_INCFLAGS) $(UCB_INCFLAGS)
 
 LIBFLAGS = -L$(TOPDIR)
 
diff -r 9dc512bdc19b -r 22893e3c7fbf configure.in
--- a/configure.in	Wed May 22 21:07:35 1996 +0000
+++ b/configure.in	Wed May 22 22:01:05 1996 +0000
@@ -20,7 +20,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-AC_REVISION($Revision: 1.205 $)
+AC_REVISION($Revision: 1.206 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -888,17 +888,21 @@
 
 ### Try to make it possible to find getrusage on Solaris systems.
 
+XCFLAGS="$CFLAGS"
 case "$canonical_host_type" in
   *-*-solaris2*)
     UCBLIB=/usr/ucblib/libucb.a
+    UCB_INCFLAGS=-I/usr/ucbinclude
     if test -f $UCBLIB; then
       LIBS="-lc $UCBLIB $LIBS"
       AC_MSG_RESULT([adding $UCBLIB to LIBS])
+      AC_MSG_RESULT([defining UCB_INCFLAGS to be $UCB_INCFLAGS])
     fi
   ;;
 esac
-
+AC_SUBST(UCB_INCFLAGS)
 AC_CHECK_FUNCS(getrusage times)
+CFLAGS="$XCFLAGS"
 
 ### Checks for other programs used for building, testing, installing,
 ### and running Octave.
diff -r 9dc512bdc19b -r 22893e3c7fbf src/resource.cc
--- a/src/resource.cc	Wed May 22 21:07:35 1996 +0000
+++ b/src/resource.cc	Wed May 22 22:01:05 1996 +0000
@@ -32,7 +32,6 @@
 
 #if defined (HAVE_TIMES) && defined (HAVE_SYS_TIMES_H)
 
-#include <sys/types.h>
 #if defined (HAVE_SYS_PARAM_H)
 #include <sys/param.h>
 #endif