[dhcp-agent-commits] dhcp-agent config.h.in,1.3,1.4 configure.ac,1.4,1.5

[<act...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent
In directory sc8-pr-cvs1:/tmp/cvs-serv15092

Modified Files:
	config.h.in configure.ac 
Log Message:
updated for new sysconf/conf directories

Index: config.h.in
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/config.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** config.h.in	19 Dec 2002 18:00:25 -0000	1.3
--- config.h.in	15 May 2003 05:08:13 -0000	1.4
***************
*** 1,7 ****
  /* config.h.in.  Generated from configure.ac by autoheader.  */
  
- /* default client work directory */
- #undef CLIENT_WORK_DIR
- 
  /* have BPF_IMMEDIATE */
  #undef HAVE_BPF_IMMEDIATE
--- 1,4 ----

Index: configure.ac
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.ac	11 May 2003 17:01:45 -0000	1.4
--- configure.ac	15 May 2003 05:08:13 -0000	1.5
***************
*** 38,42 ****
  dnl
  
- 
  AC_CHECK_TYPE(sig_atomic_t, [AC_DEFINE(HAVE_SIG_ATOMIC_T, 1, [have sigatomic_t])], [], [#include <signal.h>])
  
--- 38,41 ----
***************
*** 143,147 ****
  fi
  
! AC_DEFINE_UNQUOTED(CLIENT_WORK_DIR, ["/etc/dhcp-client"], [default client work directory])
  
  AC_SUBST(PCAP_LIB)
--- 142,154 ----
  fi
  
! dnl
! dnl setup paths so they can be passed to the Makefile.in
! dnl
! 
! dhcpsysconfdir="${sysconfdir}/${PACKAGE_NAME}"
! dhcplocalstatedir="${localstatedir}/${PACKAGE_NAME}"
! 
! dhcpsysconf_clientdir="${dhcpsysconfdir}/dhcp-client"
! dhcplocalstate_clientdir="${dhcplocalstatedir}/dhcp-client"
  
  AC_SUBST(PCAP_LIB)
***************
*** 151,154 ****
--- 158,165 ----
  AC_SUBST(GUILE_LIB)
  AC_SUBST(GUILE_INC)
+ AC_SUBST(dhcpsysconfdir)
+ AC_SUBST(dhcpsysconf_clientdir)
+ AC_SUBST(dhcplocalstatedir)
+ AC_SUBST(dhcplocalstate_clientdir)
  
  AM_CONFIG_HEADER([config.h])