Mercurial > hg > octave-lyh
changeset 4287:48d5b36ba35a
[project @ 2003-01-04 20:07:21 by jwe]
| author | jwe |
|---|---|
| date | Sat, 04 Jan 2003 20:08:16 +0000 |
| parents | 0e427b227329 |
| children | 3788d56fea50 |
| files | kpathsea/ChangeLog kpathsea/Makefile.in kpathsea/acklibtool.m4 src/version.h |
| diffstat | 4 files changed, 28 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/kpathsea/ChangeLog +++ b/kpathsea/ChangeLog @@ -1,6 +1,9 @@ 2003-01-04 John W. Eaton <jwe@bevo.che.wisc.edu> + * Makefile.in ($(kpathsea)): Build object files only. + * acklibtool.m4: Enable shared/static lib options again. + Build only the type of objects we ask for (default is static). 2002-12-26 John W. Eaton <jwe@bevo.che.wisc.edu>
--- a/kpathsea/Makefile.in +++ b/kpathsea/Makefile.in @@ -252,9 +252,13 @@ readlink: readlink.o $(link_command) readlink.o +## For Octave, just make the object files. + $(kpathsea): $(objects) klibtool.version - $(LIBTOOL) archive $(AR) $(ARFLAGS) $@ $(objects) - $(INSTALL_LIBTOOL_LIBS) . lib$(library).la + +##$(kpathsea): $(objects) klibtool.version +## $(LIBTOOL) archive $(AR) $(ARFLAGS) $@ $(objects) +## $(INSTALL_LIBTOOL_LIBS) . lib$(library).la # All the objects depend on the klibtool configuration file. $(objects): klibtool.config
--- a/kpathsea/acklibtool.m4 +++ b/kpathsea/acklibtool.m4 @@ -1,5 +1,5 @@ dnl Autoconf support for Klibtool. -dnl $Id: acklibtool.m4,v 1.6 2003-01-04 19:30:09 jwe Exp $ +dnl $Id: acklibtool.m4,v 1.7 2003-01-04 20:07:21 jwe Exp $ dnl dnl dnl Find the script, check for subprogs, etc. @@ -22,27 +22,25 @@ # ## Argument parsing: we support --enable-shared and --enable-static. 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) +[ --enable-shared build shared libraries [default=no]], + [if test "$enableval" = no; then BUILD_SHARED_LIBS=no; + else BUILD_SHARED_LIBS=yes; fi], + BUILD_SHARED_LIBS=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. -# If they --disable-static, implicitly --enable-shared. -# In any case, prepend to any existing LIBTOOL_OBJTYPES. -# If they really want to build both and link statically, -# then they set LIBTOOL_OBJTYPES to SHARED and --enable-static. -test "$enable_static" = yes && LIBTOOL_OBJTYPES=STATIC:$LIBTOOL_OBJTYPES -(test "$enable_shared" = yes \ - || test "$enable_static" = no) \ -&& LIBTOOL_OBJTYPES=SHARED:$LIBTOOL_OBJTYPES +[ --enable-static build static libraries [default=yes]], + [if test "$enableval" = no; then BUILD_STATIC_LIBS=no; + else BUILD_STATIC_LIBS=yes; fi], + BUILD_STATIC_LIBS=yes) +## +## For Octave, only build the kinds of objects we ask for. +## +if test "$BUILD_STATIC_LIBS" = yes; then + LIBTOOL_OBJTYPES=STATIC:$LIBTOOL_OBJTYPES +fi +if test "$BUILD_SHARED_LIBS" = yes; then + LIBTOOL_OBJTYPES=SHARED:$LIBTOOL_OBJTYPES +fi # Don't bother to remove the trailing :, it'll be ignored. # ## Finally: Run the klibtool configure command.