[dhcp-agent-commits] dhcp-agent configure.ac,1.11,1.12 Makefile.am,1.6,1.7

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

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

Modified Files:
	configure.ac Makefile.am 
Log Message:
added dhcp-server; added contrib

Index: configure.ac
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure.ac,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** configure.ac	28 Jun 2003 17:54:49 -0000	1.11
--- configure.ac	5 Jul 2003 19:16:46 -0000	1.12
***************
*** 15,19 ****
  AC_PREREQ(2.57)
  AC_INIT([dhcp-agent],[0.39],[tm...@wh...])
! AM_INIT_AUTOMAKE([dhcp-agent], [0.39])
  AC_CONFIG_SRCDIR([src/dhcp-client.c])
  
--- 15,19 ----
  AC_PREREQ(2.57)
  AC_INIT([dhcp-agent],[0.39],[tm...@wh...])
! AM_INIT_AUTOMAKE([dhcp-agent], [0.40])
  AC_CONFIG_SRCDIR([src/dhcp-client.c])
  
***************
*** 228,231 ****
--- 228,233 ----
  dhcpsysconf_clientdir="${dhcpsysconfdir}/dhcp-client"
  dhcplocalstate_clientdir="${dhcplocalstatedir}/dhcp-client"
+ dhcpsysconf_serverdir="${dhcpsysconfdir}/dhcp-server"
+ dhcplocalstate_serverdir="${dhcplocalstatedir}/dhcp-server"
  
  dhcpdocdir="/doc/dhcp-agent"
***************
*** 239,244 ****
--- 241,248 ----
  AC_SUBST(dhcpsysconfdir)
  AC_SUBST(dhcpsysconf_clientdir)
+ AC_SUBST(dhcpsysconf_serverdir)
  AC_SUBST(dhcplocalstatedir)
  AC_SUBST(dhcplocalstate_clientdir)
+ AC_SUBST(dhcplocalstate_serverdir)
  AC_SUBST(infodir)
  AC_SUBST(dhcpdocdir)
***************
*** 249,253 ****
  
  AC_CONFIG_HEADERS([config.h])
! AC_CONFIG_FILES([Makefile src/Makefile man/Makefile tests/Makefile conf/Makefile doc/Makefile])
  AC_OUTPUT
  
--- 253,257 ----
  
  AC_CONFIG_HEADERS([config.h])
! AC_CONFIG_FILES([Makefile src/Makefile man/Makefile tests/Makefile conf/Makefile doc/Makefile contrib/Makefile])
  AC_OUTPUT
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.am	20 May 2003 00:34:29 -0000	1.6
--- Makefile.am	5 Jul 2003 19:16:46 -0000	1.7
***************
*** 5,9 ****
  
  AUTOMAKE_OPTIONS = foreign
! SUBDIRS = src man tests conf doc
  EXTRA_DIST = CAVEATS LICENSE README THANKS TODO UPGRADING INSTALL
  CLEANFILES = stdint_marcos.h
--- 5,10 ----
  
  AUTOMAKE_OPTIONS = foreign
! SUBDIRS = src man tests conf doc contrib
  EXTRA_DIST = CAVEATS LICENSE README THANKS TODO UPGRADING INSTALL
  CLEANFILES = stdint_marcos.h
+ MOSTLYCLEANFILES = *~ config.h src/*~ contrib/*~ doc/*~ man/*~ tests/*~