Changeset - e975833b57db
[Not reviewed]
default
1 3 0
Nathan Brink (binki) - 16 years ago 2009-12-07 20:40:58
ohnobinki@ohnopublishing.net
removed *.conf that should be generated from *.conf.in
4 files changed with 5 insertions and 14 deletions:
0 comments (0 inline, 0 general)
configure.ac
Show inline comments
 
@@ -20,48 +20,50 @@ AC_INIT([distren],[0.0],[http://bugs.ohn
 
AC_CONFIG_SRCDIR([src/server/distrend.c])
 
AC_CONFIG_MACRO_DIR([m4])
 

	
 
AC_PROG_CC
 
AC_PROG_LIBTOOL
 
#AC_PROG_RANLIB #don't add this even if autoscan says to, because AC_PROG_LIBTOOL is enough
 

	
 
AM_INIT_AUTOMAKE
 
AM_PROG_CC_C_O
 

	
 
#basic low-level checks (suggested by autoscan)
 
AC_CHECK_FUNCS([dup2])
 
AC_CHECK_FUNCS([memset])
 
AC_CHECK_FUNCS([strdup])
 

	
 
AC_CHECK_HEADERS([fcntl.h])
 
AC_CHECK_HEADERS([malloc.h])
 

	
 
# TODO: write up --with-list option
 
AC_CHECK_HEADERS([list.h queue.h stack.h], [], [AC_MSG_ERROR([I need liblist to be installed])])
 
AC_CHECK_LIB([list], [list_init], [
 
   AC_SUBST([LIST_LIBS],[-llist])], [
 
   AC_MSG_ERROR([I need liblist to be installed]) ])
 

	
 
echo $libdir
 

	
 
AC_FUNC_FORK
 
AC_FUNC_MALLOC
 

	
 
AC_TYPE_PID_T
 
AC_TYPE_SIZE_T
 

	
 
# to grab GNU-specific function prototypes for the following functions:
 
# getline
 
AC_DEFINE([_GNU_SOURCE], [1])
 

	
 
#package dependencies:
 

	
 
PKG_PROG_PKG_CONFIG(0.17.2)
 

	
 

	
 
PKGCONFIG_OHNOWRAP([DISTLIBS], [libconfuse >= 2.5 libcurl libxml-2.0])
 

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

	
 
AC_DEFINE_DIR([SYSCONFDIR], [sysconfdir], [Directory to find configuration files in])
 
AC_DEFINE_DIR([LOCALSTATEDIR], [localstatedir], [Directory in which the server or client may store its state files and data])
 
AC_DEFINE_DIR([RUNSTATEDIR], [localstatedir/run], [Directory where PID files are stored])
 

	
 
AC_CONFIG_FILES([Makefile
etc/distrenclient.conf
Show inline comments
 
deleted file
etc/distrendaemon.conf
Show inline comments
 
/*
 
 configuration for _this_ server
 
*/
 
daemon
 
{
 
  datadir = "/home/ethanzonca/var/distren"
 
  datadir = "/home/ohnobinki/var/distren"
 
  render_types = {"povray", "blender", "inkscape", "imagemagick", "dcraw"}
 
}
 

	
 
include("distrencommon.conf")
 

	
 

	
 
listen {
 
       type = "unix"
 
       path = "/home/ethanzonca/var/run/distrend.sock"
 
       path = "/home/ohnobinki/var/run/distrend.sock"
 
       port = "0770"
 
}
etc/distrenslave.conf
Show inline comments
 
slave
 
{
 
  username = "!username"
 
  datadir = "/home/ethanzonca/var/distren"
 
  datadir = "/home/ohnobinki/var/distren"
 
}
 

	
 
include("distrencommon.conf")
0 comments (0 inline, 0 general)