[dhcp-agent-commits] dhcp-agent configure.ac,1.6,1.7

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

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

Modified Files:
	configure.ac 
Log Message:
added HTML documentation option

Index: configure.ac
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure.ac	18 May 2003 02:58:25 -0000	1.6
--- configure.ac	20 May 2003 00:32:30 -0000	1.7
***************
*** 19,25 ****
  
  dnl
! dnl additional arguments to autoconf
  dnl
  
  dnl check for CC, INSTALL, and sane make
  
--- 19,36 ----
  
  dnl
! dnl enable/disable argument settings
  dnl
  
+ dnl allow user to pick HTML documentation
+ AC_ARG_ENABLE(htmldoc,
+ [  --enable-htmldoc        Create HTML documentation],
+ [case "${enableval}" in
+   yes) htmldoc=true ;;
+   no)  htmldoc=false ;;
+   *) 
+   AC_MSG_ERROR(bad value ${enableval} for --enable-htmldoc) ;;
+   esac],[debug=false])
+ AM_CONDITIONAL(HTMLDOC, test x$htmldoc = xtrue)
+ 
  dnl check for CC, INSTALL, and sane make
  
***************
*** 161,164 ****
--- 172,183 ----
  fi
  
+ if $htmldoc; then
+    AC_PATH_PROGS(TEXI2HTML_PATH, [texi2html], [no])
+ 
+    if test $TEXI2HTML_PATH = "no"; then
+       AC_MSG_ERROR([you selected --enable-htmldoc and no texi2html has been found. please install texi2html first.])
+    fi;
+ fi
+ 
  dnl
  dnl setup paths so they can be passed to the Makefile.in
***************
*** 171,174 ****
--- 190,195 ----
  dhcplocalstate_clientdir="${dhcplocalstatedir}/dhcp-client"
  
+ dhcpdocdir="/doc/dhcp-agent"
+ 
  AC_SUBST(PCAP_LIB)
  AC_SUBST(PCAP_INC)
***************
*** 181,187 ****
  AC_SUBST(dhcplocalstatedir)
  AC_SUBST(dhcplocalstate_clientdir)
  
  AM_CONFIG_HEADER([config.h])
! AC_CONFIG_FILES([Makefile src/Makefile man/Makefile tests/Makefile conf/Makefile])
  AC_OUTPUT
  
--- 202,210 ----
  AC_SUBST(dhcplocalstatedir)
  AC_SUBST(dhcplocalstate_clientdir)
+ AC_SUBST(infodir)
+ AC_SUBST(dhcpdocdir)
  
  AM_CONFIG_HEADER([config.h])
! AC_CONFIG_FILES([Makefile src/Makefile man/Makefile tests/Makefile conf/Makefile doc/Makefile])
  AC_OUTPUT