Mercurial > hg > octave-terminal
changeset 2064:424b95481a85
[project @ 1996-04-07 22:25:33 by jwe]
author | jwe |
---|---|
date | Sun, 07 Apr 1996 22:30:30 +0000 |
parents | 219cf611ff70 |
children | fdad1594039e |
files | Makeconf.in configure.in src/Makefile.in |
diffstat | 3 files changed, 14 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Makeconf.in +++ b/Makeconf.in @@ -55,6 +55,8 @@ # cc and associated flags. +DLFCN_INCFLAGS = @DLFCN_INCFLAGS@ + # Clean up INCFLAGS a bit if we are not compiling in a separate # directory. ifeq ($(srcdir),.) @@ -70,7 +72,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) +INCFLAGS = $(TMP_IF_1) $(TMP_IF_2) $(DLFCN_INCFLAGS) LIBFLAGS = -L$(TOPDIR)
--- a/configure.in +++ b/configure.in @@ -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.190 $) +AC_REVISION($Revision: 1.192 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -678,13 +678,13 @@ OCTAVE_SMART_PUTENV OCTAVE_PROGRAM_INVOCATION_NAME -DLFCN_LIB= -DLFCN_INCLUDE= +LIBDLFCN= +DLFCN_INCFLAGS= if test "$WITH_DL" = yes || test "$WITH_DL" = maybe; then case "$canonical_host_type" in rs6000-ibm-aix* | powerpc-ibm-aix*) - DLFCN_LIB='$TOPDIR/dlfcn/dlfcn.a' - DLFCN_INCLUDE='-L$top_srcdir/dlfcn -L$TOPDIR/dlfcn' + LIBDLFCN=-ldlfcn + DLFCN_INCFLAGS='-I$(top_srcdir)/dlfcn -I$(TOPDIR)/dlfcn' WITH_DL=true ;; *) @@ -710,8 +710,8 @@ WITH_DL=false fi AC_SUBST(WITH_DL) -AC_SUBST(DLFCN_LIB) -AC_SUBST(DLFCN_INCLUDE) +AC_SUBST(LIBDLFCN) +AC_SUBST(DLFCN_INCFLAGS) if test "$WITH_SHL" = yes || test "$WITH_SHL" = maybe; then AC_CHECK_LIB(dld, shl_load) @@ -1016,12 +1016,11 @@ export CXX export F77 -AC_CONFIG_SUBDIRS(glob kpathsea scripts $INFO_DIR $PLPLOT_DIR - $READLINE_DIR $DLFCN_DIR) +AC_CONFIG_SUBDIRS(glob kpathsea scripts $INFO_DIR $PLPLOT_DIR $READLINE_DIR) ### Do the substitutions in all the Makefiles. -AC_OUTPUT(Makefile octMakefile Makeconf test/Makefile +AC_OUTPUT(Makefile octMakefile Makeconf test/Makefile dlfcn/Makefile doc/Makefile doc/faq/Makefile doc/interpreter/Makefile doc/liboctave/Makefile doc/refcard/Makefile liboctave/Makefile src/Makefile src/mk-oct-links
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -150,10 +150,10 @@ DEF_FILES := $(patsubst %.cc, %.def, $(DEF_FILES_1)) OCTAVE_LFLAGS = -L../liboctave -L../libcruft -L../readline \ - -L../kpathsea -L../glob -L. $(RLD_FLAG) + -L../kpathsea -L../glob -L../dlfcn -L. $(RLD_FLAG) OCTAVE_LIBS = -loctinterp -loctave -ltinst -lcruft \ - @LIBPLPLOT@ -lreadline -lkpathsea -lglob + @LIBPLPLOT@ -lreadline -lkpathsea -lglob @LIBDLFCN@ LIBS_TO_INSTALL = liboctinterp.a libtinst.a \ liboctinterp.$(SHLEXT) libtinst.$(SHLEXT)