[mathic] 14/30: Restore libtool; use disable-shared as default.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository mathic.

commit 9c92b26822d6059055658d60f81f7891fa43f8ac
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sat Mar 12 22:11:20 2016 -0500

    Restore libtool; use disable-shared as default.
    
    However, if the configure script is called with the enable-shared option,
    then shared libraries will be built.  This is useful building the
    Debian package, which includes the shared libraries.
    
    See [1] and [2] for similar commits to memtailor and mathicgb, resp.
    
    [1] https://github.com/Macaulay2/memtailor/commit/835cca2
    [2] https://github.com/Macaulay2/mathicgb/commit/427e61f
---
 Makefile.am  | 15 +++++++++------
 configure.ac |  3 ++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6291716..8d06472 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,16 +4,19 @@ ACLOCAL_AMFLAGS = -I build/autotools/m4
 
 # Options passed to the C and C++ PreProcessor (CPP) and compiler
 AM_CPPFLAGS = -I${top_srcdir}/
-libmathic_a_CPPFLAGS = $(DEPS_CFLAGS)
+libmathic_la_CPPFLAGS = $(DEPS_CFLAGS)
 
 # tell Libtool what the name of the library is.
-lib_LIBRARIES = libmathic.a
+lib_LTLIBRARIES = libmathic.la
 
 # set the C++ compiler to include src/
 AM_CXXFLAGS=-I$(top_srcdir)/src/ -std=gnu++0x
 
+# libraries that are needed by this library
+libmathic_la_LIBADD= $(DEPS_LIBS)
+
 # the sources that are built to make libmathic.
-libmathic_a_SOURCES = src/mathic/Timer.cpp	\
+libmathic_la_SOURCES = src/mathic/Timer.cpp	\
   src/mathic/ColumnPrinter.cpp src/mathic/DivMask.cpp				\
   src/mathic/Action.cpp src/mathic/BoolParameter.cpp				\
   src/mathic/CliParameter.cpp src/mathic/CliParser.cpp				\
@@ -63,7 +66,7 @@ divsim_SOURCES = src/divsim/divMain.cpp src/divsim/Simulation.cpp	\
   src/divsim/DivListModel.h src/divsim/KDTreeModel.h			\
   src/divsim/Simulation.h src/divsim/divMain.h src/divsim/Monomial.h	\
   src/divsim/stdinc.h
-divsim_LDADD = $(top_builddir)/libmathic.a -lmemtailor -lpthread
+divsim_LDADD = $(top_builddir)/libmathic.la -lmemtailor -lpthread
 
 # set up the priority queue simulation. Listing the headers in sources
 # ensure that those files are included in distributions.
@@ -73,7 +76,7 @@ pqsim_SOURCES = src/pqsim/Item.cpp src/pqsim/Model.cpp			\
   src/pqsim/GeobucketModel.h src/pqsim/Model.h src/pqsim/stdinc.h	\
   src/pqsim/HeapModel.h src/pqsim/pqMain.h src/pqsim/StlSetModel.h	\
   src/pqsim/Item.h src/pqsim/Simulator.h src/pqsim/TourTreeModel.h
-pqsim_LDADD = $(top_builddir)/libmathic.a -lmemtailor -lpthread
+pqsim_LDADD = $(top_builddir)/libmathic.la -lmemtailor -lpthread
 
 
 # set up tests to run on "make check"
@@ -83,7 +86,7 @@ TESTS=unittest
 check_PROGRAMS=$(TESTS)
 
 unittest_CXXFLAGS = -I$(top_srcdir)/src/ -std=gnu++0x
-unittest_LDADD = $(top_builddir)/libmathic.a $(DEPS_LIBS) -lmemtailor -lpthread
+unittest_LDADD = $(top_builddir)/libmathic.la $(DEPS_LIBS) -lmemtailor -lpthread
 unittest_CPPFLAGS = $(DEPS_CFLAGS)
 
 test_LIBS=
diff --git a/configure.ac b/configure.ac
index 5039c1d..0fc7e0d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,8 @@ AC_PROG_INSTALL
 # Locate the C++ compiler.
 AC_PROG_CXX
 
-AC_PROG_RANLIB
+# Set up LibTool
+LT_INIT([disable-shared])
 
 dnl Set the version for the library -- this concerns compatibility of the
 dnl source and binary interface of the library and is not the same as the

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathic.git