Changeset - 120992cc1f14
[Not reviewed]
default
0 2 0
Nathan Brink (binki) - 15 years ago 2010-08-16 00:09:02
ohnobinki@ohnopublishing.net
Add -lrt in the correct place.
2 files changed with 2 insertions and 4 deletions:
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)
 
LIBS = $(DISTLIBS_LIBS)
 
# we need the clock_gettime() function
 
LIBS = $(DISTLIBS_LIBS) -lrt
 

	
 
bin_PROGRAMS = distren
 
if ENABLE_SERVER
 
bin_PROGRAMS += distrend distrenslave distrensimpleslave
 
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 \
 
	src/common/protocol.c src/common/protocol.h \
 
	src/common/remoteio.h \
 
	src/common/remoteio.c src/common/libremoteio.h \
 
	src/common/request.c src/common/request.h
 
#see http://sources.redhat.com/autobook/autobook/autobook_91.html
 
# either increase the revision number or the interface number each release!
 
libdistrencommon_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
 

	
 
#library client
 
libdistren_la_SOURCES = \
 
	src/client/libdistren.c src/client/libdistren.h \
 
	src/client/libdistren_config.c \
 
	src/client/libdistren_job.c \
 
	src/client/libdistren_request.c
 
libdistren_la_LIBADD = libdistrencommon.la
 

	
 
#CLI client.
 
distren_SOURCES = \
 
	src/client/distren.c
 
distren_LDADD = libdistrencommon.la libdistren.la
 

	
 
# shared server sources:
 
SERVER_SOURCES = \
 
	src/server/slavefuncs.c	src/server/slavefuncs.h \
 
	src/server/distrenjob.c	src/server/distrenjob.h
 
# distrend:
 
distrend_CFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS)
 
distrend_LDFLAGS = $(AM_LDFLAGS) $(MYSQL_LDFLAGS)
 
distrend_SOURCES = $(SERVER_SOURCES) \
configure.ac
Show inline comments
 
@@ -29,58 +29,55 @@ AM_PROG_CC_C_O
 

	
 
dnl these macros force the refered to types to be available without me
 
dnl writing my own magic :-)
 
AC_TYPE_PID_T
 
AC_TYPE_SIZE_T
 

	
 
AC_TYPE_UINT8_T
 
AC_TYPE_UINT16_T
 
AC_TYPE_UINT32_T
 

	
 
dnl selective compilation
 
dnl For now, this is only left for when the C-based client is
 
dnl reintroducded.
 
AC_ARG_ENABLE([server],
 
	[AS_HELP_STRING([--disable-server],[Don't build the distren server])],
 
	[enable_server=$enableval],
 
	[enable_server=yes])
 
AM_CONDITIONAL([ENABLE_SERVER],
 
	[test "x$enable_server" = "xyes"])
 

	
 
dnl package dependencies:
 

	
 
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"
 
LIBS="$LIBS $DISTLIBS_LIBS"
 
CFLAGS="$CFLAGS $DISTLIBS_CFLAGS"
 
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <list.h>
 
	#include <stdio.h>
 
	], [printf(stderr, "%s", list_brag);
 
	return 0;])], [AC_DEFINE([HAVE_LIST_BRAG], [], [Define if liblist has list_brag.])], [])
 
LIBS="$LIBS_save"
 
CFLAGS="$CFLAGS_save"
 

	
 
PKG_CHECK_MODULES([CHECK], [check >= 0.9.3])
 

	
 
dnl define paths for configuration files until a better arrangement is
 
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])
 

	
 
# we need the clock_gettime() function
 
LIBS="$LIBS -lrt"
 

	
 
AC_CONFIG_FILES([Makefile
 
	libdistren.pc
 
	etc/distrendaemon.conf
 
	etc/distrenslave.conf
 
])
 

	
 
AC_OUTPUT
0 comments (0 inline, 0 general)