mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 09:57:20 +00:00
Code Issues Releases Wiki Activity

Half fixed recovering (no space handling) (unfinished)

Browse Source
This commit is contained in:
Francis Dupont 2016-10-06 16:15:35 +02:00
parent 13e5cc6cbe
commit d113bc2ca6
11 changed files with 77 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Makefile.am.in
View File

@ -1,7 +1,7 @@
AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
AM_CFLAGS = $(LDAP_CFLAGS) AM_CFLAGS = $(LDAP_CFLAGS)
noinst_LIBRARIES = libdhcp.@A@ lib_@DHLIBS@ = libdhcp.@A@
libdhcp_@A@_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c dhcp4o6.c \ libdhcp_@A@_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c dhcp4o6.c \
discover.c dispatch.c dlpi.c dns.c ethernet.c execute.c \ discover.c dispatch.c dlpi.c dns.c ethernet.c execute.c \
fddi.c icmp.c inet.c lpf.c memory.c nit.c ns_name.c \ fddi.c icmp.c inet.c lpf.c memory.c nit.c ns_name.c \

23
configure vendored
View File

@ -629,6 +629,7 @@ LDAP_CFLAGS
LDAP_LIBS LDAP_LIBS
BINDLT BINDLT
A A
DHLIBS
INSTALL_BIND_FALSE INSTALL_BIND_FALSE
INSTALL_BIND_TRUE INSTALL_BIND_TRUE
HAVE_BINDDIR_FALSE HAVE_BINDDIR_FALSE
@ -7032,23 +7033,29 @@ if test "${enable_libtool+set}" = set; then :
enableval=$enable_libtool; want_libtool="$enableval" enableval=$enable_libtool; want_libtool="$enableval"
fi fi
if test "$want_libtool" = "yes"; then
if test "$want_libtool" = "yes"; then if test "$want_libtool" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: legacy configure is used but libtool is enabled. Trying to recover..." >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: legacy configure is used but libtool is enabled. Trying to recover..." >&5
$as_echo "$as_me: WARNING: legacy configure is used but libtool is enabled. Trying to recover..." >&2;} $as_echo "$as_me: WARNING: legacy configure is used but libtool is enabled. Trying to recover..." >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: legacy configure is used but libtool is enabled. Trying to recover..." >&5 # dequote $ac_configure_args
$as_echo "$as_me: WARNING: legacy configure is used but libtool is enabled. Trying to recover..." >&2;} eval "set my_configure_args $ac_configure_args"
cd $srcdir; exec ./re-conf $ac_configure_args shift
cd $srcdir; exec ./re-conf $ac_configure_args re_configure_args=
as_fn_error $? "Recovering failed" "$LINENO" 5 for a; do
re_configure_args="$re_configure_args $a"
done
cd $srcdir; exec ./re-conf $re_configure_args
as_fn_error $? "Recovering failed" "$LINENO" 5 as_fn_error $? "Recovering failed" "$LINENO" 5
fi fi
fi
A=a DHLIBS=LIBRARIES
A=a A=a
# OpenLDAP support. # OpenLDAP support.
# Check whether --with-ldap was given. # Check whether --with-ldap was given.

21
configure.ac
View File

@ -825,18 +825,25 @@ BINDLT=
AC_ARG_ENABLE(libtool, AC_ARG_ENABLE(libtool,
AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]), AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]),
want_libtool="$enableval") want_libtool="$enableval")
if test "$want_libtool" = "yes"; then
if test "$want_libtool" = "yes"; then if test "$want_libtool" = "yes"; then
AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...]) AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...])
AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...]) # dequote $ac_configure_args
cd $srcdir; exec ./re-conf $ac_configure_args eval "set my_configure_args $ac_configure_args"
cd $srcdir; exec ./re-conf $ac_configure_args shift
AC_MSG_ERROR([Recovering failed]) re_configure_args=
for a; do
re_configure_args="$re_configure_args $a"
done
cd $srcdir; exec ./re-conf $re_configure_args
AC_MSG_ERROR([Recovering failed]) AC_MSG_ERROR([Recovering failed])
fi fi
fi
A=a DHLIBS=LIBRARIES
A=a A=a
AC_SUBST(DHLIBS)
AC_SUBST(A) AC_SUBST(A)
AC_SUBST(BINDLT) AC_SUBST(BINDLT)

7
configure.ac+lt
View File

@ -62,7 +62,6 @@ AC_SUBST(BINDCONFIG)
# Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
AC_PROG_RANLIB
AC_PATH_PROG(AR, ar) AC_PATH_PROG(AR, ar)
AC_SUBST(AR) AC_SUBST(AR)
@ -829,11 +828,17 @@ BINDLT=
AC_ARG_ENABLE(libtool, AC_ARG_ENABLE(libtool,
AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]), AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]),
want_libtool="$enableval") want_libtool="$enableval")
if test "$want_libtool" = "no"; then if test "$want_libtool" = "no"; then
AC_MSG_ERROR([libtool configure is used but libtool is disabled?]) AC_MSG_ERROR([libtool configure is used but libtool is disabled?])
fi fi
DHLIBS=LTLIBRARIES
A=la A=la
BINDLT=--with-libtool BINDLT=--with-libtool
AC_SUBST(DHLIBS)
AC_SUBST(A) AC_SUBST(A)
AC_SUBST(BINDLT) AC_SUBST(BINDLT)

19
configure.ac-base
View File

@ -64,7 +64,9 @@ AC_SUBST(BINDCONFIG)
# Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
@BEGIN WITHOUT LIBTOOL
AC_PROG_RANLIB AC_PROG_RANLIB
@END WITHOUT LIBTOOL
AC_PATH_PROG(AR, ar) AC_PATH_PROG(AR, ar)
AC_SUBST(AR) AC_SUBST(AR)
@ -833,21 +835,36 @@ BINDLT=
AC_ARG_ENABLE(libtool, AC_ARG_ENABLE(libtool,
AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]), AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]),
want_libtool="$enableval") want_libtool="$enableval")
@BEGIN WITH LIBTOOL @BEGIN WITH LIBTOOL
if test "$want_libtool" = "no"; then if test "$want_libtool" = "no"; then
AC_MSG_ERROR([libtool configure is used but libtool is disabled?]) AC_MSG_ERROR([libtool configure is used but libtool is disabled?])
fi fi
DHLIBS=LTLIBRARIES
A=la A=la
BINDLT=--with-libtool BINDLT=--with-libtool
@END WITH LIBTOOL @END WITH LIBTOOL
@BEGIN WITHOUT LIBTOOL @BEGIN WITHOUT LIBTOOL
if test "$want_libtool" = "yes"; then if test "$want_libtool" = "yes"; then
AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...]) AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...])
cd $srcdir; exec ./re-conf $ac_configure_args # dequote $ac_configure_args
eval "set my_configure_args $ac_configure_args"
shift
re_configure_args=
for a; do
re_configure_args="$re_configure_args $a"
done
cd $srcdir; exec ./re-conf $re_configure_args
AC_MSG_ERROR([Recovering failed]) AC_MSG_ERROR([Recovering failed])
fi fi
DHLIBS=LIBRARIES
A=a A=a
@END WITHOUT LIBTOOL @END WITHOUT LIBTOOL
AC_SUBST(DHLIBS)
AC_SUBST(A) AC_SUBST(A)
AC_SUBST(BINDLT) AC_SUBST(BINDLT)

21
configure.ac-lt
View File

@ -825,18 +825,25 @@ BINDLT=
AC_ARG_ENABLE(libtool, AC_ARG_ENABLE(libtool,
AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]), AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $default_libtool).]),
want_libtool="$enableval") want_libtool="$enableval")
if test "$want_libtool" = "yes"; then
if test "$want_libtool" = "yes"; then if test "$want_libtool" = "yes"; then
AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...]) AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...])
AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...]) # dequote $ac_configure_args
cd $srcdir; exec ./re-conf $ac_configure_args eval "set my_configure_args $ac_configure_args"
cd $srcdir; exec ./re-conf $ac_configure_args shift
AC_MSG_ERROR([Recovering failed]) re_configure_args=
for a; do
re_configure_args="$re_configure_args $a"
done
cd $srcdir; exec ./re-conf $re_configure_args
AC_MSG_ERROR([Recovering failed]) AC_MSG_ERROR([Recovering failed])
fi fi
fi
A=a DHLIBS=LIBRARIES
A=a A=a
AC_SUBST(DHLIBS)
AC_SUBST(A) AC_SUBST(A)
AC_SUBST(BINDLT) AC_SUBST(BINDLT)

4
dhcpctl/Makefile.am.in
View File

@ -1,5 +1,5 @@
bin_PROGRAMS = omshell bin_PROGRAMS = omshell
lib_LIBRARIES = libdhcpctl.@A@ lib_@DHLIBS@ = libdhcpctl.@A@
noinst_PROGRAMS = cltest noinst_PROGRAMS = cltest
man_MANS = omshell.1 dhcpctl.3 man_MANS = omshell.1 dhcpctl.3
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
@ -11,7 +11,7 @@ omshell_LDADD = libdhcpctl.@A@ ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
@BINDLIBISCCFGDIR@/libisccfg.@A@ \ @BINDLIBISCCFGDIR@/libisccfg.@A@ \
@BINDLIBISCDIR@/libisc.@A@ @BINDLIBISCDIR@/libisc.@A@
libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c libdhcpctl_@A@_SOURCES = dhcpctl.c callback.c remote.c
cltest_SOURCES = cltest.c cltest_SOURCES = cltest.c
cltest_LDADD = libdhcpctl.@A@ ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ cltest_LDADD = libdhcpctl.@A@ ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \

2
omapip/Makefile.am.in
View File

@ -1,4 +1,4 @@
lib_LIBRARIES = libomapi.@A@ lib_@DHLIBS@ = libomapi.@A@
noinst_PROGRAMS = svtest noinst_PROGRAMS = svtest
libomapi_@A@_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \ libomapi_@A@_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \

8
re-conf
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
# #
# Permission to use, copy, modify, and/or distribute this software for any # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above
@ -14,7 +14,9 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# called by the configure place-holder # called by the legacy configure when libtool is enabled
cp configure.ac+lt configure.ac cp configure.ac+lt configure.ac
autoreconf -i && ./configure $* autoreconf -i
echo Reconfiguring with $*
./configure $*

2
tests/Makefile.am.in
View File

@ -28,6 +28,6 @@ EXTRA_DIST = failover/dhcp-1.cf failover/dhcp-2.cf failover/new-failover \
AM_CPPFLAGS = -I.. AM_CPPFLAGS = -I..
check_LIBRARIES = libt_api.@A@ check_@DHLIBS@ = libt_api.@A@
libt_api_@A@_SOURCES = t_api.c t_api_dhcp.c libt_api_@A@_SOURCES = t_api.c t_api_dhcp.c

1
util/lt.pl
View File

@ -118,7 +118,6 @@ foreach $line (<STDIN>) {
$escaped += 1; $escaped += 1;
next; next;
} else { } else {
print $line. "\n";
$included += 1; $included += 1;
} }
} }