Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv5475
Modified Files:
configure.in
Log Message:
new configure.in with better layout
Index: configure.in
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** configure.in 11 Sep 2002 23:52:28 -0000 1.24
--- configure.in 13 Sep 2002 01:18:47 -0000 1.25
***************
*** 1,15 ****
dnl $Header$
! dnl Ok here's another shot at writing
! dnl a proper configure.in
dnl
dnl -- tm...@wh...
dnl init
AC_PREREQ(2.53)
AC_INIT(dhcp-agent, 0.38, tm...@wh...)
AM_INIT_AUTOMAKE(dhcp-agent, 0.38)
- AM_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR(dhcp-client.c)
AC_ARG_WITH(libdnet-prefix,[ --with-libdnet-prefix=PREFIX Prefix where libdnet is installed (optional)],
dnet_prefix="$withval", dnet_prefix="")
--- 1,25 ----
dnl $Header$
! dnl
! dnl Second try at writing a more coherent configure script.
! dnl We've layed it out per the gnu autoconf manual
! dnl Please look at:
! dnl http://www.gnu.org/manual/autoconf/html_node/configure.ac-Layout.html#configure.ac%20Layout
! dnl before making any changes.
dnl
dnl -- tm...@wh...
+ dnl
dnl init
+ dnl
+
AC_PREREQ(2.53)
AC_INIT(dhcp-agent, 0.38, tm...@wh...)
AM_INIT_AUTOMAKE(dhcp-agent, 0.38)
AC_CONFIG_SRCDIR(dhcp-client.c)
+ dnl
+ dnl additional arguments to autoconf
+ dnl
+
AC_ARG_WITH(libdnet-prefix,[ --with-libdnet-prefix=PREFIX Prefix where libdnet is installed (optional)],
dnet_prefix="$withval", dnet_prefix="")
***************
*** 25,36 ****
AC_PROG_MAKE_SET
! dnl check stdc
AC_HEADER_STDC
-
- dnl check for inttypes.h signal.h varargs.h stdarg.h sys/utsname.h getopt.h
-
AC_CHECK_HEADERS(inttypes.h signal.h varargs.h stdarg.h sys/utsname.h getopt.h)
dnl try finding or generating our own C99 stdint macros
--- 35,56 ----
AC_PROG_MAKE_SET
! dnl check header files we should have
AC_HEADER_STDC
AC_CHECK_HEADERS(inttypes.h signal.h varargs.h stdarg.h sys/utsname.h getopt.h)
+ dnl
+ dnl check for types
+ dnl
+
+
+ AC_CHECK_TYPE(sig_atomic_t, [AC_DEFINE(HAVE_SIG_ATOMIC_T, 1, [have sigatomic_t])], [], [#include <signal.h>])
+
+ AC_CHECK_TYPE(struct bpf_timeval, [AC_DEFINE(HAVE_BPF_TIMEVAL, 1, [have struct bpf_timeval])], [],
+ [#include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <net/bpf.h> ])
+
dnl try finding or generating our own C99 stdint macros
***************
*** 44,47 ****
--- 64,69 ----
fi
+ AC_TYPE_SIGNAL
+
dnl check for functions
***************
*** 53,65 ****
AC_WF_CHECK_KILL_SIGNAL_DETECT
- AC_WF_CHECK_BPF_IMMEDIATE
! dnl check for types
! AC_CHECK_TYPE(struct bpf_timeval, [AC_DEFINE(HAVE_BPF_TIMEVAL, 1, [have struct bpf_timeval])], [],
! [#include <sys/types.h>
! #include <sys/time.h>
! #include <sys/ioctl.h>
! #include <net/bpf.h> ])
AC_MSG_CHECKING(for __progname)
--- 75,84 ----
AC_WF_CHECK_KILL_SIGNAL_DETECT
! dnl check for BPF_IMMEDIATE flag
! AC_WF_CHECK_BPF_IMMEDIATE
!
! dnl check for __progname
AC_MSG_CHECKING(for __progname)
***************
*** 80,87 ****
fi
-
- AC_CHECK_TYPE(sig_atomic_t, [AC_DEFINE(HAVE_SIG_ATOMIC_T, 1, [have sigatomic_t])], [], [#include <signal.h>])
- AC_TYPE_SIGNAL
-
dnl pcap sifting
--- 99,102 ----
***************
*** 93,97 ****
PCAP_LIB="-L$ac_pcap_lib_dir -lpcap"
-
AC_WF_CHECK_PCAP_HEADER_DIR
PCAP_INC="-I$ac_pcap_header_dir"
--- 108,111 ----
***************
*** 148,151 ****
--- 162,167 ----
DEFS=""
AC_SUBST(DEFS)
+
+ AM_CONFIG_HEADER(config.h)
AC_OUTPUT([Makefile])
|
