summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2010-02-23 23:35:36 -0500
committerTavian Barnes <tavianator@gmail.com>2010-02-23 23:35:36 -0500
commitac2890f762db13b35b1f8bd37b0c07855a21c9d8 (patch)
tree4c8efe20f014d341ea36cdcdb2b5a2f1bf7561ea
parent64294f4ac5b1b41e95f20a827c2aead301becb92 (diff)
downloaddimension-ac2890f762db13b35b1f8bd37b0c07855a21c9d8.tar.xz
Use pkg-config for libsandglass.
-rw-r--r--bench/libdimension/Makefile.am10
-rw-r--r--configure.ac10
2 files changed, 10 insertions, 10 deletions
diff --git a/bench/libdimension/Makefile.am b/bench/libdimension/Makefile.am
index 0ca7a19..4937e5d 100644
--- a/bench/libdimension/Makefile.am
+++ b/bench/libdimension/Makefile.am
@@ -21,14 +21,12 @@ INCLUDES = -I$(top_srcdir)/libdimension
EXTRA_PROGRAMS = bench-array bench-geometry bench-bvst
-bench_array_SOURCES = array.c
-bench_array_LDADD = -lsandglass $(top_builddir)/libdimension/libdimension.la
+AM_CFLAGS = $(SANDGLASS_CFLAGS)
+AM_LDFLAGS = $(SANDGLASS_LIBS) $(top_builddir)/libdimension/libdimension.la
+bench_array_SOURCES = array.c
bench_geometry_SOURCES = geometry.c
-bench_geometry_LDADD = -lsandglass $(top_builddir)/libdimension/libdimension.la
-
-bench_bvst_SOURCES = bvst.c
-bench_bvst_LDADD = -lsandglass $(top_builddir)/libdimension/libdimension.la
+bench_bvst_SOURCES = bvst.c
bench: bench-array$(EXEEXT) bench-geometry$(EXEEXT) bench-bvst$(EXEEXT)
./bench-array$(EXEEXT)
diff --git a/configure.ac b/configure.ac
index f43dc47..ea454e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
-AC_PREREQ(2.64)
+AC_PREREQ(2.65)
AC_INIT(Dimension, 0.0.0, tavianator@gmail.com, dimension)
AM_INIT_AUTOMAKE([parallel-tests])
@@ -40,9 +40,11 @@ AC_ARG_ENABLE([pgo],
AM_CONDITIONAL([PGO], [test "$enable_pgo" != "no"])
dnl Timing library for benchmarks
-AC_CHECK_LIB([sandglass], [sandglass_create],
- [],
- [AC_MSG_WARN([libsandglass not found - benchmarking suite will not work])])
+PKG_CHECK_MODULES([SANDGLASS], [libsandglass],
+ [],
+ [AC_MSG_WARN([libsandglass not found - benchmarking suite will not work])])
+AC_SUBST(SANDGLASS_CFLAGS)
+AC_SUBST(SANDGLASS_LIBS)
dnl Ensure compilation in C99 mode
AC_DEFINE([_XOPEN_SOURCE], [600])