# HG changeset patch
# User jwe
# Date 1041710896 0
# Node ID 48d5b36ba35acac0dc81bc10d5dd78b947cbca75
# Parent  0e427b2273298ad458bda0b66744130d6a121fc3
[project @ 2003-01-04 20:07:21 by jwe]

diff -r 0e427b227329 -r 48d5b36ba35a kpathsea/ChangeLog
--- a/kpathsea/ChangeLog	Sat Jan 04 19:30:09 2003 +0000
+++ b/kpathsea/ChangeLog	Sat Jan 04 20:08:16 2003 +0000
@@ -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>
 
diff -r 0e427b227329 -r 48d5b36ba35a kpathsea/Makefile.in
--- a/kpathsea/Makefile.in	Sat Jan 04 19:30:09 2003 +0000
+++ b/kpathsea/Makefile.in	Sat Jan 04 20:08:16 2003 +0000
@@ -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
diff -r 0e427b227329 -r 48d5b36ba35a kpathsea/acklibtool.m4
--- a/kpathsea/acklibtool.m4	Sat Jan 04 19:30:09 2003 +0000
+++ b/kpathsea/acklibtool.m4	Sat Jan 04 20:08:16 2003 +0000
@@ -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.
diff -r 0e427b227329 -r 48d5b36ba35a src/version.h
--- a/src/version.h	Sat Jan 04 19:30:09 2003 +0000
+++ b/src/version.h	Sat Jan 04 20:08:16 2003 +0000
@@ -23,7 +23,7 @@
 #if !defined (octave_version_h)
 #define octave_version_h 1
 
-#define OCTAVE_VERSION "2.1.42"
+#define OCTAVE_VERSION "2.1.43"
 
 #define OCTAVE_COPYRIGHT \
   "Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 John W. Eaton."