Mercurial > octave
changeset 4199:35ec3b95a3ca
[project @ 2002-11-21 20:47:49 by jwe]
| author | jwe |
|---|---|
| date | Thu, 21 Nov 2002 20:47:49 +0000 |
| parents | af1d77a5e44d |
| children | 1f04df06e1a6 |
| files | ChangeLog Makeconf.in configure.in mkoctfile.in src/ChangeLog src/oct-conf.h.in src/toplev.cc |
| diffstat | 7 files changed, 57 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Nov 21 20:03:31 2002 +0000 +++ b/ChangeLog Thu Nov 21 20:47:49 2002 +0000 @@ -1,3 +1,19 @@ +2002-11-21 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in (do-subst-config-vals): Substitute OCTAVE_BINDIR. + + * configure.in (MKOCTFILE_SH_LDFLAGS): New variable. + * Makeconf.in (do-subst-config-vals): Substitute + OCTAVE_CONF version of this variable. + + * mkoctfile.in: Set SH_LDFLAGS from MKOCTFILE_SH_LDFLAGS, not + SH_LDFLAGS. + (VERSION): Substitute value of OCTAVE_CONF_VERSION. + + * configure.in (NO_OCT_FILE_STRIP): New variable. + * Makeconf.in (do-subst-config-vals): Substitute it. + * mkoctfile.in (no_oct_file_strip_on_this_platform): New variable. + 2002-11-20 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in (OCTAVE_CXX_PRAGMA_INTERFACE_IMPLEMENTATION):
--- a/Makeconf.in Thu Nov 21 20:03:31 2002 +0000 +++ b/Makeconf.in Thu Nov 21 20:47:49 2002 +0000 @@ -285,6 +285,10 @@ # The -L flags to use for the mkoctfile scrip (for --link-stand-alone) MKOCTFILE_LFLAGS = -L$(octlibdir) +MKOCTFILE_SH_LDFLAGS = @MKOCTFILE_SH_LDFLAGS@ + +NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@ + # The following pattern rules and the substitution functions require # GNU make. If you don't have it, get it! @@ -354,6 +358,8 @@ define do-subst-config-vals echo "making $@ from $<" $(SED) < $< \ + -e "s;%NO_OCT_FILE_STRIP%;${NO_OCT_FILE_STRIP};" \ + -e "s;%OCTAVE_BINDIR%;\"${bindir}\";" \ -e "s;%OCTAVE_CONF_ALL_CFLAGS%;\"${ALL_CFLAGS}\";" \ -e "s;%OCTAVE_CONF_ALL_CXXFLAGS%;\"${ALL_CXXFLAGS}\";" \ -e "s;%OCTAVE_CONF_ALL_FFLAGS%;\"${ALL_FFLAGS}\";" \ @@ -408,6 +414,7 @@ -e "s;%OCTAVE_CONF_LN_S%;\"${LN_S}\";" \ -e "s;%OCTAVE_CONF_MKOCTFILE_INCFLAGS%;\"${MKOCTFILE_INCFLAGS}\";" \ -e "s;%OCTAVE_CONF_MKOCTFILE_LFLAGS%;\"${MKOCTFILE_LFLAGS}\";" \ + -e "s;%OCTAVE_CONF_MKOCTFILE_SH_LDFLAGS%;\"${MKOCTFILE_SH_LDFLAGS}\";" \ -e "s;%OCTAVE_CONF_RANLIB%;\"${RANLIB}\";" \ -e "s;%OCTAVE_CONF_RDYNAMIC_FLAG%;\"${RDYNAMIC_FLAG}\";" \ -e "s;%OCTAVE_CONF_RLD_FLAG%;\"${RLD_FLAG}\";" \
--- a/configure.in Thu Nov 21 20:03:31 2002 +0000 +++ b/configure.in Thu Nov 21 20:47:49 2002 +0000 @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.394 $) +AC_REVISION($Revision: 1.395 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -629,8 +629,10 @@ SHLLINKEXT= SH_LD="$CXX" SH_LDFLAGS=-shared +MKOCTFILE_SH_LDFLAGS='$(SH_LDFLAGS)' SONAME_FLAGS= RLD_FLAG= +NO_OCT_FILE_STRIP=false INCLUDE_LINK_DEPS=false TEMPLATE_AR="$AR" TEMPLATE_ARFLAGS="$ARFLAGS" @@ -650,10 +652,12 @@ ;; *-*-darwin*) SH_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave' + MKOCTFILE_SH_LDFLAGS='-bundle -bundle_loader $BINDIR/octave-$VERSION$EXEEXT' CXXPICFLAG= CPICFLAG= FPICFLAG= INCLUDE_LINK_DEPS=true + NO_OCT_FILE_STRIP=true ;; *-*-cygwin* | *-*-mingw*) CXXPICFLAG= @@ -757,7 +761,9 @@ AC_MSG_RESULT([defining DLFCN_DIR to be $DLFCN_DIR]) AC_MSG_RESULT([defining SH_LD to be $SH_LD]) AC_MSG_RESULT([defining SH_LDFLAGS to be $SH_LDFLAGS]) +AC_MSG_RESULT([defining MKOCTFILE_SH_LDFLAGS to be $MKOCTFILE_SH_LDFLAGS]) AC_MSG_RESULT([defining SONAME_FLAGS to be $SONAME_FLAGS]) +AC_MSG_RESULT([defining NO_OCT_FILE_STRIP to be $NO_OCT_FILE_STRIP]) AC_MSG_RESULT([defining RLD_FLAG to be $RLD_FLAG]) AC_MSG_RESULT([defining TEMPLATE_AR to be $TEMPLATE_AR]) AC_MSG_RESULT([defining TEMPLATE_ARFLAGS to be $TEMPLATE_ARFLAGS]) @@ -776,7 +782,9 @@ AC_SUBST(DLFCN_DIR) AC_SUBST(SH_LD) AC_SUBST(SH_LDFLAGS) +AC_SUBST(MKOCTFILE_SH_LDFLAGS) AC_SUBST(SONAME_FLAGS) +AC_SUBST(NO_OCT_FILE_STRIP) AC_SUBST(RLD_FLAG) AC_SUBST(TEMPLATE_AR) AC_SUBST(TEMPLATE_ARFLAGS)
--- a/mkoctfile.in Thu Nov 21 20:03:31 2002 +0000 +++ b/mkoctfile.in Thu Nov 21 20:47:49 2002 +0000 @@ -7,6 +7,13 @@ set -e +# These need to be set first, but you shouldn't change them unless +# you are sure you know what you are doing. + +VERSION=%OCTAVE_CONF_VERSION% +EXEEXT=%OCTAVE_CONF_EXEEXT% +BINDIR=%OCTAVE_BINDIR% + # Default values for these variables are filled in when Octave is # compiled. @@ -32,7 +39,7 @@ : ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%} : ${SH_LD=%OCTAVE_CONF_SH_LD%} -: ${SH_LDFLAGS=%OCTAVE_CONF_SH_LDFLAGS%} +: ${SH_LDFLAGS=%OCTAVE_CONF_MKOCTFILE_SH_LDFLAGS%} : ${RLD_FLAG=%OCTAVE_CONF_RLD_FLAG%} : ${RDYNAMIC_FLAG=%OCTAVE_CONF_RDYNAMIC_FLAG%} @@ -76,6 +83,7 @@ ldflags= dbg=: strip=false +no_oct_file_strip_on_this_platform=%NO_OCT_FILE_STRIP% link=true link_stand_alone=false depend=false @@ -207,7 +215,11 @@ fi ;; -s | --strip) - strip=true + if $no_oct_file_strip_on_this_platform; then + echo "mkoctfile: stripping disabled on this platform" 1>&2 + else + strip=true + fi ;; -c | --compile) link=false
--- a/src/ChangeLog Thu Nov 21 20:03:31 2002 +0000 +++ b/src/ChangeLog Thu Nov 21 20:47:49 2002 +0000 @@ -1,5 +1,11 @@ 2002-11-21 John W. Eaton <jwe@bevo.che.wisc.edu> + * oct-conf.h.in (OCTAVE_CONF_MKOCTFILE_SH_LDFLAGS): New macro. + * toplev.cc (octave_config_info): Add it to the struct. + + * lex.l (<TEXT_FCN>): If yytext begins with # or %, don't + recognize it as a string. + * oct-map.h (Octave_map::operator[]): New const version. * oct-map.cc (equiv_keys): New function. (assign (const idx_vector&, const Octave_map&)): New function.
--- a/src/oct-conf.h.in Thu Nov 21 20:03:31 2002 +0000 +++ b/src/oct-conf.h.in Thu Nov 21 20:47:49 2002 +0000 @@ -228,6 +228,10 @@ #define OCTAVE_CONF_MKOCTFILE_LFLAGS %OCTAVE_CONF_MKOCTFILE_LFLAGS% #endif +#ifndef OCTAVE_CONF_MKOCTFILE_SH_LDFLAGS +#define OCTAVE_CONF_MKOCTFILE_SH_LDFLAGS %OCTAVE_CONF_MKOCTFILE_SH_LDFLAGS% +#endif + #ifndef OCTAVE_CONF_RANLIB #define OCTAVE_CONF_RANLIB %OCTAVE_CONF_RANLIB% #endif
--- a/src/toplev.cc Thu Nov 21 20:03:31 2002 +0000 +++ b/src/toplev.cc Thu Nov 21 20:47:49 2002 +0000 @@ -727,6 +727,7 @@ m ["LN_S"] = OCTAVE_CONF_LN_S; m ["MKOCTFILE_INCFLAGS"] = OCTAVE_CONF_MKOCTFILE_INCFLAGS; m ["MKOCTFILE_LFLAGS"] = OCTAVE_CONF_MKOCTFILE_LFLAGS; + m ["MKOCTFILE_SH_LDFLAGS"] = OCTAVE_CONF_MKOCTFILE_SH_LDFLAGS; m ["RANLIB"] = OCTAVE_CONF_RANLIB; m ["RDYNAMIC_FLAG"] = OCTAVE_CONF_RDYNAMIC_FLAG; m ["RLD_FLAG"] = OCTAVE_CONF_RLD_FLAG;