# HG changeset patch # User Nathan Phillip Brink # Date 2010-08-07 20:42:36 # Node ID b8ce1b31f22b9ec3e6a5e9d42fd720c259945ec0 # Parent f02df2b37b496ede315a57878a7634d1718805b6 pkg-config support for libdistren. diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 +pkgconfigdir = $(libdir)/pkgconfig + # both srcdir and builddir are needed because config.h ends up in builddir AM_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdir)"' \ -DLOCALSTATEDIR='"$(localstatedir)"' \ @@ -18,6 +20,8 @@ include_HEADERS = src/client/distren.h lib_LTLIBRARIES = libdistren.la pkglib_LTLIBRARIES = libdistrencommon.la +nodist_pkgconfig_DATA = libdistren.pc + # libdistrencommon.la: libdistrencommon_la_SOURCES = src/common/asprintf.c src/common/asprintf.h \ src/common/execio.c src/common/execio.h \ diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,9 @@ AM_CONDITIONAL([ENABLE_SERVER], dnl package dependencies: -PKG_CHECK_MODULES([DISTLIBS], [libconfuse >= 2.5 libcurl libxml-2.0 liblist >= 2.3.1 libarchive >= 2.8.0 libcrypto]) +DISTLIBS_MODULES="libconfuse >= 2.5 libcurl libxml-2.0 liblist >= 2.3.1 libarchive >= 2.8.0 libcrypto" +AC_SUBST([DISTLIBS_MODULES]) +PKG_CHECK_MODULES([DISTLIBS], [$DISTLIBS_MODULES]) AX_LIB_MYSQL AS_IF( [test "x${MYSQL_VERSION}" = "x"], [ AC_MSG_ERROR([I need mysql]) ] ) @@ -73,6 +75,7 @@ AC_DEFINE_DIR([LOCALSTATEDIR], [localsta AC_DEFINE_DIR([RUNSTATEDIR], [localstatedir/run], [Default directory for registering runtime information like pid-files]) AC_CONFIG_FILES([Makefile + libdistren.pc etc/distrendaemon.conf etc/distrenslave.conf ]) diff --git a/libdistren.pc.in b/libdistren.pc.in new file mode 100644 --- /dev/null +++ b/libdistren.pc.in @@ -0,0 +1,17 @@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ +datadir = @datadir@ +includedir = @includedir@ +libdir = @libdir@ +pkglibdir = ${libdir}/@PACKAGE@ +bindir = @bindir@ + +Name: libdistren +Description: A distren client for submitting, monitoring progress of, and retrieving distributed rendering jobs +Version: @PACKAGE_VERSION@ +URL: @PACKAGE_URL@ +Requires.private: @DISTLIBS_MODULES@ +Libs: -L${libdir} -ldistren +Libs.private: -L${pkglibdir} -ldistrencommon +Cflags: -I${includedir}