[Dhcp-agent-commits] dhcp-agent Makefile.in,1.27,1.28 configure.in,1.23,1.24 configure,1.23,1.24 acl
Status: Alpha
Brought to you by:
actmodern
Menu
▾
▴
[Dhcp-agent-commits] dhcp-agent Makefile.in,1.27,1.28 configure.in,1.23,1.24 configure,1.23,1.24 aclocal.m4,1.9,1.10 acinclude.m4,1.9,1.10 missing,1.1.1.1,1.2
|
From: <act...@us...> - 2002-09-11 23:52:35
|
Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv28918
Modified Files:
Makefile.in configure.in configure aclocal.m4 acinclude.m4
missing
Log Message:
new autoconf changes
Index: Makefile.in
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/Makefile.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Makefile.in 30 Jun 2002 18:27:12 -0000 1.27
--- Makefile.in 11 Sep 2002 23:52:28 -0000 1.28
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.6.3 from Makefile.am.
! # @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
[...994 lines suppressed...]
! mostlyclean-am: mostlyclean-compile mostlyclean-generic
!
! uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
!
! uninstall-man: uninstall-man1
+ .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic dist dist-all dist-gzip distcheck distclean \
+ distclean-compile distclean-depend distclean-generic \
+ distclean-hdr distclean-tags distcleancheck distdir dvi dvi-am \
+ info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-man1 \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+ uninstall-man uninstall-man1
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: configure.in
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** configure.in 24 Jun 2002 14:32:25 -0000 1.23
--- configure.in 11 Sep 2002 23:52:28 -0000 1.24
***************
*** 1,2 ****
--- 1,3 ----
+ dnl $Header$
dnl Ok here's another shot at writing
dnl a proper configure.in
***************
*** 5,11 ****
dnl init
! AC_INIT(dhcp-agent, 0.37, tm...@wh...)
! AM_INIT_AUTOMAKE(dhcp-agent, 0.37)
AM_CONFIG_HEADER(config.h)
AC_ARG_WITH(libdnet-prefix,[ --with-libdnet-prefix=PREFIX Prefix where libdnet is installed (optional)],
--- 6,14 ----
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)],
***************
*** 25,32 ****
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)
AC_WF_TRY_PRI_MACROS
--- 28,38 ----
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
+
AC_WF_TRY_PRI_MACROS
***************
*** 34,38 ****
echo -n "attempting to generate stdint conversion macros..."
AC_WF_GET_PRI_MACROS
! AC_DEFINE(HAVE_PRIMACROS_H)
echo " done!"
fi
--- 40,44 ----
echo -n "attempting to generate stdint conversion macros..."
AC_WF_GET_PRI_MACROS
! AC_DEFINE(HAVE_PRIMACROS_H, 1, [ generated our own primacros ])
echo " done!"
fi
***************
*** 42,45 ****
--- 48,53 ----
AC_CHECK_FUNCS(strdup uname calloc daemon rename sysconf getrusage getprogname)
+ dnl other checks
+
dnl check if kill(pid, 0) can be used to detect a process
***************
*** 49,53 ****
dnl check for types
! AC_CHECK_TYPE(struct bpf_timeval, [AC_DEFINE(HAVE_BPF_TIMEVAL)], [],
[#include <sys/types.h>
#include <sys/time.h>
--- 57,61 ----
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>
***************
*** 56,69 ****
AC_MSG_CHECKING(for __progname)
! AC_TRY_COMPILE([
! #include <stdlib.h>
#include <stdio.h>
extern const char *__progname;
! ],[
! const char *s = __progname;
! ], [ AC_DEFINE(HAVE_PROGNAME)
! AC_MSG_RESULT(yes) ], [AC_MSG_RESULT(no)]);
! AC_CHECK_TYPE(sig_atomic_t, [AC_DEFINE(HAVE_SIG_ATOMIC_T)], [], [#include <signal.h>])
AC_TYPE_SIGNAL
--- 64,85 ----
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
! AC_DEFINE(HAVE_PROGNAME, 1, [have __progname var ])
! AC_MSG_RESULT(yes)
! else
! AC_MSG_RESULT(no)
! fi
!
!
! AC_CHECK_TYPE(sig_atomic_t, [AC_DEFINE(HAVE_SIG_ATOMIC_T, 1, [have sigatomic_t])], [], [#include <signal.h>])
AC_TYPE_SIGNAL
***************
*** 90,99 ****
fi
!
!
dnl libdnet sifting; actually it's a lot more well behaved
dnl than pcap.
dnl begin by looking for dnet-config if we find it, then
dnl just use it to get the include and lib dirs.
if test -z "$dnet_prefix"; then
--- 106,115 ----
fi
! dnl
dnl libdnet sifting; actually it's a lot more well behaved
dnl than pcap.
dnl begin by looking for dnet-config if we find it, then
dnl just use it to get the include and lib dirs.
+ dnl
if test -z "$dnet_prefix"; then
***************
*** 132,136 ****
DEFS=""
AC_SUBST(DEFS)
! AC_OUTPUT(Makefile)
echo
--- 148,152 ----
DEFS=""
AC_SUBST(DEFS)
! AC_OUTPUT([Makefile])
echo
Index: configure
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** configure 24 Jun 2002 14:32:25 -0000 1.23
--- configure 11 Sep 2002 23:52:28 -0000 1.24
***************
*** 1,13 ****
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by Autoconf 2.50 for dhcp-agent 0.37.
#
# Report bugs to <tm...@wh...>.
#
! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
[...6154 lines suppressed...]
! _ACEOF
! cat >>$CONFIG_STATUS <<\_ACEOF
{ (exit 0); exit 0; }
! _ACEOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
***************
*** 3977,3980 ****
--- 5216,5220 ----
$ac_cs_success || { (exit 1); exit 1; }
fi
+
echo
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/aclocal.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** aclocal.m4 23 Jun 2002 03:29:12 -0000 1.9
--- aclocal.m4 11 Sep 2002 23:52:29 -0000 1.10
***************
*** 1,13 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p4
! dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
[...989 lines suppressed...]
! # ------------------------------------------------------------
! # We used to try to get a real timestamp in stamp-h. But the fear is that
! # that will cause unnecessary cvs conflicts.
! AC_DEFUN([_AM_CONFIG_HEADER],
! [# Add the stamp file to the list of files AC keeps track of,
! # along with our hook.
! AC_CONFIG_HEADERS([$1],
! [# update the timestamp
! echo 'timestamp for $1' >"_AM_STAMP([$1])"
! $2],
! [$3])
! ])# _AM_CONFIG_HEADER
!
!
! # AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
! # --------------------------------------------------------------
! AC_DEFUN([AM_CONFIG_HEADER],
! [AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
! ])# AM_CONFIG_HEADER
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/acinclude.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** acinclude.m4 23 Jun 2002 03:29:12 -0000 1.9
--- acinclude.m4 11 Sep 2002 23:52:29 -0000 1.10
***************
*** 41,45 ****
AC_DEFUN(AC_WF_TRY_PRI_MACROS,
! [AC_MSG_CHECKING(checking for stdint conversion macros)
AC_TRY_COMPILE([#include <stdio.h>
#include <stdlib.h>
--- 41,45 ----
AC_DEFUN(AC_WF_TRY_PRI_MACROS,
! [AC_MSG_CHECKING(for stdint conversion macros)
AC_TRY_COMPILE([#include <stdio.h>
#include <stdlib.h>
***************
*** 81,85 ****
#define SUB_UNSIGNED_INT "du"
#define SUB_CHAR "d" /* same -- we're assuming int is always bigger than char */
! #define SUB_UNSIGNED_CHAR "du" /* which is an OK assumption. */
--- 81,85 ----
#define SUB_UNSIGNED_INT "du"
#define SUB_CHAR "d" /* same -- we're assuming int is always bigger than char */
! #define SUB_UNSIGNED_CHAR "du" /* which is an OK assumption (or is it?). */
***************
*** 106,110 ****
fprintf(stderr, "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n");
! fprintf(stderr, "* Warning! I couldn't find a suitable type that's sized for uint32_t. *\n");
fprintf(stderr, "* I'm going to go and use the largest I can and hope things work! *\n");
fprintf(stderr, "* Please do report this bug to tm...@wh... *\n");
--- 106,110 ----
fprintf(stderr, "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n");
! fprintf(stderr, "* Warning! I couldn't find a suitable type that's size for a type.\n");
fprintf(stderr, "* I'm going to go and use the largest I can and hope things work! *\n");
fprintf(stderr, "* Please do report this bug to tm...@wh... *\n");
***************
*** 202,206 ****
exit(1);
}
! ], [AC_DEFINE(KILL_SIGNAL_DETECT) AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])])
--- 202,206 ----
exit(1);
}
! ], [AC_DEFINE(KILL_SIGNAL_DETECT, 1, [kill(pid, 0) can be used to detect a process we can signal]) AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])])
***************
*** 216,219 ****
], [ ioctl(0, BIOCIMMEDIATE, NULL);],
[AC_MSG_RESULT(found)
! AC_DEFINE(HAVE_BPF_IMMEDIATE)],
AC_MSG_RESULT(not found))])
--- 216,219 ----
], [ ioctl(0, BIOCIMMEDIATE, NULL);],
[AC_MSG_RESULT(found)
! AC_DEFINE(HAVE_BPF_IMMEDIATE, 1, [have BPF_IMMEDIATE])],
AC_MSG_RESULT(not found))])
Index: missing
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/missing,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** missing 29 Jan 2002 18:05:07 -0000 1.1.1.1
--- missing 11 Sep 2002 23:52:29 -0000 1.2
***************
*** 1,6 ****
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
! # Copyright (C) 1996, 1997 Free Software Foundation, Inc.
! # Franc,ois Pinard <pi...@ir...>, 1996.
# This program is free software; you can redistribute it and/or modify
--- 1,6 ----
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
! # Originally by Fran,cois Pinard <pi...@ir...>, 1996.
# This program is free software; you can redistribute it and/or modify
***************
*** 19,22 ****
--- 19,27 ----
# 02111-1307, USA.
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
***************
*** 24,27 ****
--- 29,53 ----
fi
+ run=:
+
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+ if test -f configure.ac; then
+ configure_ac=configure.ac
+ else
+ configure_ac=configure.in
+ fi
+
+ case "$1" in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ ;;
+ esac
+
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
case "$1" in
***************
*** 36,39 ****
--- 62,66 ----
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
***************
*** 44,54 ****
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
! echo "missing - GNU libit 0.0"
;;
--- 71,83 ----
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
! echo "missing 0.4 - GNU automake"
;;
***************
*** 59,66 ****
;;
! aclocal)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
! you modified \`acinclude.m4' or \`configure.in'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
--- 88,100 ----
;;
! aclocal*)
! if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
! # We have it, but it failed.
! exit 1
! fi
!
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
! you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
***************
*** 69,75 ****
autoconf)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
! you modified \`configure.in'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
--- 103,114 ----
autoconf)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
! you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
***************
*** 78,87 ****
autoheader)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
! you modified \`acconfig.h' or \`configure.in'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
test -z "$files" && files="config.h"
touch_files=
--- 117,131 ----
autoheader)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
! you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
***************
*** 96,103 ****
;;
! automake)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
! you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
--- 140,152 ----
;;
! automake*)
! if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
! # We have it, but it failed.
! exit 1
! fi
!
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
! you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
***************
*** 107,110 ****
--- 156,187 ----
;;
+ autom4te)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
+ echo 1>&2 "\
+ WARNING: \`$1' is needed, and you do not seem to have it handy on your
+ system. You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
bison|yacc)
echo 1>&2 "\
***************
*** 160,164 ****
--- 237,271 ----
;;
+ help2man)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
+ echo 1>&2 "\
+ WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit 1
+ fi
+ ;;
+
makeinfo)
+ if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+ # We have makeinfo, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
***************
*** 174,177 ****
--- 281,323 ----
fi
touch $file
+ ;;
+
+ tar)
+ shift
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ fi
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case "$firstarg" in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case "$firstarg" in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+ WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
;;
|
