Commit d4fa9422 authored by Lorenz Huedepohl's avatar Lorenz Huedepohl
Browse files

Cleanup of libraries that end-up in pkgconfig files

parent ca09f34c
......@@ -67,7 +67,7 @@ ftimings_@FCNAME@_example_LDFLAGS = -static
ftimings_c_example_SOURCES = \
examples/c_example.c
ftimings_c_example_LDADD = libftimings-@FCNAME@.la
ftimings_c_example_LINK = $(FCLINK) -static
ftimings_c_example_LDFLAGS = $(FCLIBS)
# Small test programs:
......
......@@ -9,6 +9,14 @@ AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_PROG_EGREP
AC_LANG([Fortran])
AC_PROG_FC
AC_FC_LIBRARY_LDFLAGS
AC_FC_FREEFORM
AC_OPENMP
AC_LANG([C])
AM_PROG_CC_C_O
AC_OPENMP
......@@ -17,14 +25,10 @@ AC_ARG_ENABLE([papi],
[AS_HELP_STRING([--disable-papi],[Do not use PAPI to also measure flop count])],
[want_papi=$enableval],[want_papi="yes"])
if test "$want_papi" = "yes" ; then
AC_CHECK_LIB([papi],[PAPI_library_init],[papi_found="yes"],[papi_found="no"])
if test "$papi_found" = "no" ; then
AC_MSG_ERROR(["Could not find usable PAPI installation, please adjust CFLAGS, LDFLAGS"])
fi
AC_DEFINE([HAVE_LIBPAPI], [1], [Use the PAPI library])
LIBS="-lpapi $LIBS"
AC_CHECK_LIB([papi],[PAPI_library_init],[],
[AC_MSG_ERROR(["Could not find usable PAPI installation, please adjust CFLAGS, LDFLAGS"])])
fi
AM_CONDITIONAL([HAVE_LIBPAPI],[test "$want_papi" = "yes"])
AM_CONDITIONAL([HAVE_LIBPAPI],[test "$ac_cv_lib_papi_PAPI_library_init" = "yes"])
AC_ARG_ENABLE([perf],
[AS_HELP_STRING([--disable-perf],[Do not use the Linux perf API to measure amount of DRAM memory accesses])],
......@@ -64,15 +68,6 @@ if test "$can_compile_avx" = "yes" ; then
fi
AC_MSG_RESULT([$can_compile_avx])
AC_PROG_EGREP
AC_LANG([Fortran])
AC_PROG_FC
AC_FC_LIBRARY_LDFLAGS
AC_FC_FREEFORM
AC_OPENMP
LT_INIT
AC_ENABLE_SHARED
AC_ENABLE_STATIC
......
......@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@-@API_VERSION@-@FC@
Description: ftimings, API version @API_VERSION@ for Fortran compiler @FC@
Version: @PACKAGE_VERSION@
URL: @PACKAGE_URL@
Libs: -L${libdir} -lftimings-@API_VERSION@-@FC@
Libs: -L${libdir} -lftimings-@API_VERSION@-@FC@ @LIBS@
fcflags= -I${includedir}/ftimings-@API_VERSION@-@FC@
......@@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@
Name: @PACKAGE_NAME@_perflib-@API_VERSION@-@FC@
Description: FTIMINGS wrapper for programs instrumented with PERFLIB
Description: ftimings wrapper for programs instrumented with PERFLIB, API version @API_VERSION@ for Fortran compiler @FC@
Version: @PACKAGE_VERSION@
URL: @PACKAGE_URL@
Requires: @PACKAGE_NAME@-@API_VERSION@-@FC@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment