DistRen Changeset - b8ce1b31f22b · protofusion repositories

Changeset - b8ce1b31f22b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 1

Nathan Brink (binki) - 15 years ago 2010-08-07 20:42:36
ohnobinki@ohnopublishing.net

pkg-config support for libdistren.

3 files changed with 25 insertions and 1 deletions:

Makefile.am

configure.ac

libdistren.pc.in

0 comments (0 inline, 0 general)

Makefile.am

➞

Show inline comments

 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)"' \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src
 AM_CFLAGS = $(DISTLIBS_CFLAGS)
@@ @@ -15,12 +17,14 @@ endif @@
 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 \
 	src/common/misc.c src/common/misc.h \
 	src/common/multiio.c src/common/multiio.h \
 	src/common/options.c src/common/options.h \

configure.ac

➞

Show inline comments

@@ @@ -45,13 +45,15 @@ AC_ARG_ENABLE([server], @@
 	[enable_server=yes])
 AM_CONDITIONAL([ENABLE_SERVER],
 	[test "x$enable_server" = "xyes"])
 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]) ] )
 LIBS_save="$LIBS"
 CFLAGS_save="$CFLAGS"
@@ @@ -70,11 +72,12 @@ dnl define paths for configuration files @@
 dnl made:
 AC_DEFINE_DIR([LOCALSTATEDIR], [localstatedir], [Default directory for storing state information])
 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
 ])
 AC_OUTPUT

libdistren.pc.in

➞

Show inline comments

@@ new file 100644 @@
 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}

0 comments (0 inline, 0 general)