Mercurial > hg > octave-nkf
changeset 4286:0e427b227329
[project @ 2003-01-04 19:30:09 by jwe]
author | jwe |
---|---|
date | Sat, 04 Jan 2003 19:30:09 +0000 |
parents | b20d6c838416 |
children | 48d5b36ba35a |
files | kpathsea/ChangeLog kpathsea/acklibtool.m4 liboctave/ChangeLog liboctave/Makefile.in |
diffstat | 4 files changed, 25 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/kpathsea/ChangeLog +++ b/kpathsea/ChangeLog @@ -1,3 +1,7 @@ +2003-01-04 John W. Eaton <jwe@bevo.che.wisc.edu> + + * acklibtool.m4: Enable shared/static lib options again. + 2002-12-26 John W. Eaton <jwe@bevo.che.wisc.edu> * pathsearch.c (path_find_first_of, find_first_of,
--- a/kpathsea/acklibtool.m4 +++ b/kpathsea/acklibtool.m4 @@ -1,5 +1,5 @@ dnl Autoconf support for Klibtool. -dnl $Id: acklibtool.m4,v 1.5 1998-05-18 20:33:34 jwe Exp $ +dnl $Id: acklibtool.m4,v 1.6 2003-01-04 19:30:09 jwe Exp $ dnl dnl dnl Find the script, check for subprogs, etc. @@ -20,18 +20,18 @@ exit 1 fi # -## For use with Octave, ignore these options and only build static libraries. -## ## Argument parsing: we support --enable-shared and --enable-static. -#AC_ARG_ENABLE(shared, -#[ --enable-shared build shared libraries [default=no]],, -# enable_shared=no) -## -#AC_ARG_ENABLE(static, -#[ --enable-static build static libraries [default=yes]],, -# enable_static=yes) -enable_shared=no -enable_static=yes +AC_ARG_ENABLE(shared, +[ --enable-shared build shared libraries [default=no]],, + [if test "$enableval" = no; then enable_shared=no; + else enable_shared=yes; fi], + enable_shared=no) +# +AC_ARG_ENABLE(static, +[ --enable-static build static libraries [default=yes]],, + [if test "$enableval" = no; then enable_static=no; + else enable_static=yes; fi], + enable_static=yes) # # If they explicitly --enable-static, make that the link type. # More commonly, they will just --enable-shared; make that the link type.
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,9 @@ +2003-01-04 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (liboctave.$(LIBEXT)): Link directly to + ../kpathsea/STATIC/*.o. + (liboctave.$(SHLEXT)): Link directly to ../kpathsea/SHARED/*.o. + 2003-01-03 John W. Eaton <jwe@bevo.che.wisc.edu> * dMatrix.cc (read_int, write_int): Avoid warnings about
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -216,11 +216,8 @@ liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS) libkpathsea-target rm -f $@ - rm -rf kpse-tmp - mkdir kpse-tmp - ( cd kpse-tmp; $(AR) x ../$(LIBKPATHSEA) ) - $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS) kpse-tmp/*.o - rm -rf kpse-tmp + $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS) \ + ../kpathsea/STATIC/*.o $(RANLIB) $@ liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT) @@ -230,7 +227,7 @@ liboctave.$(SHLEXT): $(LIBOCTAVE_PICOBJ) libkpathsea-target rm -f $@ $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ \ - $(LIBOCTAVE_PICOBJ) $(LINK_DEPS) $(LIBKPATHSEA) + $(LIBOCTAVE_PICOBJ) ../kpathsea/SHARED/*.o $(LINK_DEPS) $(LIBOCTAVE_PICOBJ): stmp-pic