[mathicgb] 10/14: disable the use of pkg-config so we can use memtailor and pathic even if they are not installed

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.

commit 691edb29747d85ce30c6fce3eb0073d381ed8ec7
Author: Daniel R. Grayson <dan at math.uiuc.edu>
Date:   Wed Nov 19 19:00:32 2014 -0500

    disable the use of pkg-config so we can use memtailor and pathic even if they are not installed
---
 Makefile.am  | 4 ++--
 configure.ac | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f41e8f5..d9fbc26 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,7 @@ mgb_SOURCES = src/cli/GBMain.cpp src/cli/CommonParams.hpp		\
   src/cli/MatrixAction.cpp src/cli/MatrixAction.hpp			\
   src/cli/SigGBAction.hpp src/cli/SigGBAction.cpp			\
   src/cli/HelpAction.hpp src/cli/HelpAction.cpp
-mgb_LDADD = $(top_builddir)/libmathicgb.a $(DEPS_LIBS) -lpthread
+mgb_LDADD = $(top_builddir)/libmathicgb.a $(DEPS_LIBS) -lmathic -lmemtailor -lpthread
 
 # set up tests to run on "make check"
 if with_gtest
@@ -93,7 +93,7 @@ check_PROGRAMS=$(TESTS)
 # this prevents g++ 4.8.2 from crashing and churning through memory when compiling under Ubuntu 64 14.04.1
 src/test/MonoMonoid.o src/test/Range.o : CXXFLAGS += -O0
 
-unittest_LDADD = $(DEPS_LIBS) $(top_builddir)/libmathicgb.a $(DEPS_LIBS) -lpthread
+unittest_LDADD = $(DEPS_LIBS) $(top_builddir)/libmathicgb.a $(DEPS_LIBS) -lmathic -lmemtailor -lpthread
 
 test_LIBS=
 unittest_SOURCES=src/test/Range.cpp src/test/gtestInclude.cpp			\
diff --git a/configure.ac b/configure.ac
index 6b6590c..9b24d85 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl AC_INIT sets up autoconf and must be first macro.
 AC_INIT([mathicgb], [1.0]) # package, version, bug-report-email
 
 # Check availability and location of dependencies
-PKG_CHECK_MODULES([MEMTAILOR], [memtailor])
-PKG_CHECK_MODULES([MATHIC], [mathic])
+# PKG_CHECK_MODULES([MEMTAILOR], [memtailor])
+# PKG_CHECK_MODULES([MATHIC], [mathic])
 
 # Locate the C++ compiler.
 AC_PROG_CXX

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