Mercurial > octave
changeset 2155:85fd0a6f3c97
[project @ 1996-05-13 09:02:48 by jwe]
| author | jwe |
|---|---|
| date | Mon, 13 May 1996 09:05:19 +0000 |
| parents | ab768ddb4e60 |
| children | be6e76ca8a84 |
| files | Makeconf.in configure.in octMakefile.in octave-bug.in |
| diffstat | 4 files changed, 39 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makeconf.in Mon May 13 08:55:03 1996 +0000 +++ b/Makeconf.in Mon May 13 09:05:19 1996 +0000 @@ -123,6 +123,9 @@ LIBPLPLOT = @LIBPLPLOT@ LIBDLFCN = @LIBDLFCN@ +# The arguments passed to configure. +config_opts = @config_opts + # A shell command to extract the version number from version.h. getversion = sed -e '/VERSION/!d' -e 's/.*"\(.*\)".*$$/\1/' -e q
--- a/configure.in Mon May 13 08:55:03 1996 +0000 +++ b/configure.in Mon May 13 09:05:19 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.197 $) +AC_REVISION($Revision: 1.198 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -104,6 +104,11 @@ AC_SUBST(imagedir) AC_SUBST(imagepath) +### Make configure args available for other uses. + +config_opts=$ac_configure_args +AC_SUBST(config_opts) + ### Path separator. AC_DEFINE(SEPCHAR, [':'])
--- a/octMakefile.in Mon May 13 08:55:03 1996 +0000 +++ b/octMakefile.in Mon May 13 09:05:19 1996 +0000 @@ -60,6 +60,7 @@ echo making $@ from $(srcdir)/$@.in sed < $(srcdir)/$@.in > $@.tmp \ -e "s;%VERSION%;${version};" \ + -e "s;%config_opts%;${config_opts};" \ -e "s;%TARGET_HOST_TYPE%;${target_host_type};" \ -e "s;%F77%;${F77};" \ -e "s;%FFLAGS%;${FFLAGS};" \
--- a/octave-bug.in Mon May 13 08:55:03 1996 +0000 +++ b/octave-bug.in Mon May 13 09:05:19 1996 +0000 @@ -10,22 +10,37 @@ # University of Wisconsin-Madison # Department of Chemical Engineering -# Configuration: these variables are filled in at configuration time. +# Configuration: these variables are filled in when running make to +# compile Octave. +config_opts="%config_opts%" VERSION="%VERSION%" MACHINE="%TARGET_HOST_TYPE%" F77="%F77%" FFLAGS="%FFLAGS%" +FPICFLAG="%FPICFLAG%" FLIBS="%FLIBS%" F2C="%F2C%" F2CFLAGS="%F2CFLAGS%" +CPPFLAGS="%CPPFLAGS%" +INCFLAGS="%INCFLAGS%" CC="%CC%" CC_VERSION="%CC_VERSION%" CFLAGS="%CFLAGS%" +CPICFLAG="%CPICFLAG%" CXX="%CXX%" CXX_VERSION="%CXX_VERSION%" CXXFLAGS="%BUG_CXXFLAGS%" +CXXPICFLAG="%CXXPICFLAG%" LDFLAGS="%LDFLAGS%" +LIBFLAGS="%LIBFLAGS%" +RLD_FLAG="%RLD_FLAG%" +CXXLIBS="%CXXLIBS%" +TERMLIBS="%TERMLIBS%" +LIBS="%LIBS%" +LEXLIB="%LEXLIB%" +LIBPLPLOT="%LIBPLPLOT%" +LIBDLFCN="%LIBDLFCN%" DEFS="%DEFS%" CC_AND_VERSION= @@ -117,16 +132,29 @@ ----------------------------------------------- uname output: $UN +configure opts: $config_opts Fortran compiler: $F77 FFLAGS: $FFLAGS F2C: $F2C F2CFLAGS: $F2CFLAGS FLIBS: $FLIBS +CPPFLAGS: $CPPFLAGS +INCFLAGS: $INCFLAGS C compiler: $CC_AND_VERSION CFLAGS: $CFLAGS +CPICFLAG: $CPICFLAG C++ compiler: $CXX_AND_VERSION CXXFLAGS: $CXXFLAGS +CXXPICFLAG: $CXXPICFLAG LDFLAGS: $LDFLAGS +LIBFLAGS: $LIBFLAGS +RLD_FLAG: $RLD_FLAG +CXXLIBS: $CXXLIBS +TERMLIBS: $TERMLIBS +LIBS: $LIBS +LEXLIB: $LEXLIB +LIBPLPLOT: $LIBPLPLOT +LIBDLFCN: $LIBDLFCN DEFS: EOF