Mercurial > octave-nkf
changeset 2259:22893e3c7fbf
[project @ 1996-05-22 22:00:47 by jwe]
| author | jwe |
|---|---|
| date | Wed, 22 May 1996 22:01:05 +0000 |
| parents | 9dc512bdc19b |
| children | 8b60a00802b9 |
| files | Makeconf.in configure.in src/resource.cc |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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.