From bcf55c6912f0a1f54df5b42f8b6690ba534f8f9a Mon Sep 17 00:00:00 2001
From: Phil Carns <carns@mcs.anl.gov>
Date: Sun, 4 Sep 2016 15:01:13 -0400
Subject: [PATCH] finish libtool conversion in margo

---
 Makefile.am         | 8 +++-----
 configure.ac        | 7 +++----
 src/Makefile.subdir | 2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 92e2595..3ed7af8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,9 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 bin_PROGRAMS =
 bin_SCRIPTS =
-noinst_LIBRARIES =
 noinst_PROGRAMS =
-lib_LIBRARIES =
 noinst_HEADERS =
 TESTS =
 XFAIL_TESTS = 
@@ -29,10 +27,10 @@ AM_LIBS =
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
-lib_LIBRARIES += src/libmargo.a
-src_libmargo_a_SOURCES =
+lib_LTLIBRARIES = src/libmargo.la
+src_libmargo_la_SOURCES =
 
-LDADD = src/libmargo.a
+LDADD = src/libmargo.la
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = maint/margo.pc
diff --git a/configure.ac b/configure.ac
index acad93b..66da8dd 100755
--- a/configure.ac
+++ b/configure.ac
@@ -57,21 +57,20 @@ dnl
 dnl Verify pkg-config
 dnl
 PKG_PROG_PKG_CONFIG
-PKG_CONFIG="pkg-config --static"
 
-PKG_CHECK_MODULES_STATIC([MERCURY],[mercury],[],
+PKG_CHECK_MODULES([MERCURY],[mercury],[],
    [AC_MSG_ERROR([Could not find working mercury installation!])])
 LIBS="$MERCURY_LIBS $LIBS"
 CPPFLAGS="$MERCURY_CFLAGS $CPPFLAGS"
 CFLAGS="$MERCURY_CFLAGS $CFLAGS"
 
-PKG_CHECK_MODULES_STATIC([ARGOBOTS],[argobots],[],
+PKG_CHECK_MODULES([ARGOBOTS],[argobots],[],
    [AC_MSG_ERROR([Could not find working argobots installation!])])
 LIBS="$ARGOBOTS_LIBS $LIBS"
 CPPFLAGS="$ARGOBOTS_CFLAGS $CPPFLAGS"
 CFLAGS="$ARGOBOTS_CFLAGS $CFLAGS"
 
-PKG_CHECK_MODULES_STATIC([ABT_SNOOZER],[abt-snoozer],[],
+PKG_CHECK_MODULES([ABT_SNOOZER],[abt-snoozer],[],
    [AC_MSG_ERROR([Could not find working abt-snoozer installation!])])
 LIBS="$ABT_SNOOZER_LIBS $LIBS"
 CPPFLAGS="$ABT_SNOOZER_CFLAGS $CPPFLAGS"
diff --git a/src/Makefile.subdir b/src/Makefile.subdir
index 00043c8..922b485 100644
--- a/src/Makefile.subdir
+++ b/src/Makefile.subdir
@@ -1,4 +1,4 @@
-src_libmargo_a_SOURCES += \
+src_libmargo_la_SOURCES += \
  src/margo.c \
  src/margo-timer.h \
  src/margo-timer.c
-- 
GitLab