[dhcp-agent-commits] dhcp-agent configure.ac,1.2,1.3

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

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

Modified Files:
	configure.ac 
Log Message:
fixed up configure.ac a bit

Index: configure.ac
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.ac	30 Dec 2002 00:47:51 -0000	1.2
--- configure.ac	11 May 2003 07:52:57 -0000	1.3
***************
*** 13,20 ****
  dnl
  
! AC_PREREQ(2.53)
! AC_INIT(dhcp-agent, 0.38, tm...@wh...)
! AM_INIT_AUTOMAKE(dhcp-agent, 0.38)
! AC_CONFIG_SRCDIR(src/dhcp-client.c)
  
  dnl
--- 13,20 ----
  dnl
  
! AC_PREREQ(2.57)
! AC_INIT([dhcp-agent],[0.38],[tm...@wh...])
! AM_INIT_AUTOMAKE([dhcp-agent], [0.38])
! AC_CONFIG_SRCDIR([src/dhcp-client.c])
  
  dnl
***************
*** 22,32 ****
  dnl
  
- AC_ARG_WITH(libdnet-prefix,[  --with-libdnet-prefix=PREFIX Prefix where libdnet is installed (optional)], 
- dnet_prefix="$withval", dnet_prefix="")
- AC_ARG_WITH(libpcap-prefix,[  --with-libpcap-prefix=PREFIX Prefix where libpcap is installed (optional)], 
- pcap_prefix="$withval", pcap_prefix="")
- AC_ARG_WITH(libpcap-prefix,[  --client-work-dir=WORK_DIR Default dhcpclient work dir (optional)], 
- client_work_dir="$withval", client_work_dir="/etc/dhcp-client")
- 
  dnl check for CC, INSTALL, and sane make
  
--- 22,25 ----
***************
*** 84,95 ****
  
  AC_MSG_CHECKING(for __progname)
! AC_TRY_LINK([
  #include <stdlib.h>
  #include <stdio.h>
  extern const char *__progname;
! ],
! [ __progname = 0; ],
! [ have_progname="yes" ],
! [ have_progname="no" ])
  
  if test $have_progname = "yes"; then
--- 77,85 ----
  
  AC_MSG_CHECKING(for __progname)
! AC_LINK_IFELSE([AC_LANG_PROGRAM([[
  #include <stdlib.h>
  #include <stdio.h>
  extern const char *__progname;
! ]], [[ __progname = 0; ]])],[ have_progname="yes" ],[ have_progname="no" ])
  
  if test $have_progname = "yes"; then
***************
*** 128,169 ****
  dnl
  
! if test -z "$dnet_prefix"; then
! 
! AC_PATH_PROGS(DNET_PATH, dnet-config, [ "no" ])
  
!   if test $DNET_PATH = "no"; then
  
!   dnl try linking by default path
!   AC_CHECK_LIB(dnet, eth_open, DNET_LIB="-ldnet",
!   AC_MSG_ERROR(`libdnet not found http://libdnet.sourceforge.net/ to get a copy', 1))
!   DNET_INC=""
  
!   else
  
     DNET_LIB="`dnet-config --libs`"
     DNET_INC="`dnet-config --cflags`"
     
!   fi
  
! else
  
!   DNET_LIB="-L$dnet_prefix/lib -ldnet"
!   DNET_INC="-I$dnet_prefix/include"
!   
  fi
  
  AC_SUBST(PCAP_LIB)
  AC_SUBST(PCAP_INC)
  AC_SUBST(DNET_LIB)
  AC_SUBST(DNET_INC)
  
! AC_DEFINE_UNQUOTED(CLIENT_WORK_DIR, "$client_work_dir", [ default client work directory])
! 
! dnl kill defs
! DEFS=""
! AC_SUBST(DEFS)
! 
! AM_CONFIG_HEADER(config.h)
! AC_OUTPUT([Makefile src/Makefile man/Makefile tests/Makefile])
  
  echo
--- 118,158 ----
  dnl
  
! AC_PATH_PROGS(DNET_PATH, [dnet-config], [no])
  
! if test $DNET_PATH = "no"; then
  
!   AC_MSG_ERROR([libdnet not found. get a copy from http://libdnet.sourceforge.net])
  
! else
  
     DNET_LIB="`dnet-config --libs`"
     DNET_INC="`dnet-config --cflags`"
     
! fi
  
! AC_PATH_PROGS(GUILE_PATH, [guile-config], [no])
  
!   if test $GUILE_PATH = "no"; then
! 
!   AC_MSG_ERROR([could not find guile on this system. get a copy from http://www.gnu.org/software/guile])
! 
!   else
! 
!   GUILE_LIB="`guile-config link`"
!   GUILE_INC="`guile-config compile`"
  fi
  
+ AC_DEFINE_UNQUOTED(CLIENT_WORK_DIR, ["/etc/dhcp-client"], [default client work directory])
+ 
  AC_SUBST(PCAP_LIB)
  AC_SUBST(PCAP_INC)
  AC_SUBST(DNET_LIB)
  AC_SUBST(DNET_INC)
+ AC_SUBST(GUILE_LIB)
+ AC_SUBST(GUILE_INC)
  
! AM_CONFIG_HEADER([config.h])
! AC_CONFIG_FILES([Makefile src/Makefile man/Makefile tests/Makefile])
! AC_OUTPUT
  
  echo