Commit 6d91a86b authored by Francis Dupont's avatar Francis Dupont
Browse files

Finished build stuff (still doc to do)

parent bf6f8fce
......@@ -11,7 +11,7 @@ ACLOCAL_AMFLAGS = -I m4
#
# We have a lot of files that we want shipped with the distribution.
#
EXTRA_DIST = RELNOTES LICENSE configure.ac+lt re-conf \
EXTRA_DIST = RELNOTES LICENSE configure.ac+lt config+lt \
contrib/3.0b1-lease-convert contrib/dhclient-tz-exithook.sh \
contrib/dhcp.spec contrib/sethostname.sh contrib/solaris.init \
contrib/ms2isc/Registry.pm contrib/ms2isc/ms2isc.pl \
......
......@@ -364,7 +364,7 @@ ACLOCAL_AMFLAGS = -I m4
#
# We have a lot of files that we want shipped with the distribution.
#
EXTRA_DIST = RELNOTES LICENSE configure.ac+lt re-conf \
EXTRA_DIST = RELNOTES LICENSE configure.ac+lt config+lt \
contrib/3.0b1-lease-convert contrib/dhclient-tz-exithook.sh \
contrib/dhcp.spec contrib/sethostname.sh contrib/solaris.init \
contrib/ms2isc/Registry.pm contrib/ms2isc/ms2isc.pl \
......
......@@ -18,5 +18,5 @@
cp configure.ac+lt configure.ac
autoreconf -i
echo Reconfiguring with $*
./configure $*
echo Reconfiguring with "$@"
./configure "$@"
......@@ -1461,9 +1461,8 @@ Optional Features:
--enable-epoll use Linux epoll (default is no)
--enable-devpoll use /dev/poll (default is no)
--enable-libtool use GNU libtool for dynamic shared libraries
(default is $want_libtool).
--enable-bind-install install bind includes and libraries (default is
$want_install_bind).
(default is no).
--enable-bind-install install bind includes and libraries (default is no).
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
......@@ -6966,10 +6965,15 @@ no)
if test ! -d "$use_libbind"; then
as_fn_error $? "Cannot find bind directory at $use_libbind" "$LINENO" 5
fi
if test ! -d "$use_libbind/include"; then
if test ! -d "$use_libbind/include" -o \
! -f "$use_libbind/include/isc/buffer.h"
then
as_fn_error $? "Cannot find bind includes at $use_libbind/include" "$LINENO" 5
fi
if test ! -d "$use_libbind/lib"; then
if test ! -d "$use_libbind/lib" -o \
\( ! -f "$use_libbind/lib/libisc.a" -a \
! -f "$use_libbind/lib/libisc.la" \)
then
as_fn_error $? "Cannot find bind libraries at $use_libbind/lib" "$LINENO" 5
fi
BINDDIR="$use_libbind"
......@@ -7020,18 +7024,27 @@ if test "${enable_libtool+set}" = set; then :
fi
if test "$use_libbind" != "no"; then
if test "$want_libtool" = "yes" -a \
! -f "$use_libbind/lib/libisc.la"
then
as_fn_error $? "Cannot find dynamic libraries at $use_libbind/lib" "$LINENO" 5
fi
if test "$want_libtool" = "no" -a \
! -f "$use_libbind/lib/libisc.a"
then
as_fn_error $? "Cannot find static libraries at $use_libbind/lib" "$LINENO" 5
fi
fi
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: WARNING: legacy configure is used but libtool is enabled. Trying to recover..." >&2;}
# dequote $ac_configure_args
# expand $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
cd $srcdir; exec ./config+lt "$@"
as_fn_error $? "Recovering failed" "$LINENO" 5
fi
......
......@@ -775,10 +775,15 @@ no)
if test ! -d "$use_libbind"; then
AC_MSG_ERROR([Cannot find bind directory at $use_libbind])
fi
if test ! -d "$use_libbind/include"; then
if test ! -d "$use_libbind/include" -o \
! -f "$use_libbind/include/isc/buffer.h"
then
AC_MSG_ERROR([Cannot find bind includes at $use_libbind/include])
fi
if test ! -d "$use_libbind/lib"; then
if test ! -d "$use_libbind/lib" -o \
\( ! -f "$use_libbind/lib/libisc.a" -a \
! -f "$use_libbind/lib/libisc.la" \)
then
AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib])
fi
BINDDIR="$use_libbind"
......@@ -817,20 +822,30 @@ want_libtool="no"
BINDLT=
DISTCHECK_LIBTOOL_CONFIGURE_FLAG=
AC_ARG_ENABLE(libtool,
AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $want_libtool).]),
AS_HELP_STRING([--enable-libtool],
[use GNU libtool for dynamic shared libraries (default is no).]),
want_libtool="$enableval")
if test "$use_libbind" != "no"; then
if test "$want_libtool" = "yes" -a \
! -f "$use_libbind/lib/libisc.la"
then
AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/lib])
fi
if test "$want_libtool" = "no" -a \
! -f "$use_libbind/lib/libisc.a"
then
AC_MSG_ERROR([Cannot find static libraries at $use_libbind/lib])
fi
fi
if test "$want_libtool" = "yes"; then
AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...])
# dequote $ac_configure_args
# expand $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
cd $srcdir; exec ./config+lt "$@"
AC_MSG_ERROR([Recovering failed])
fi
......@@ -856,7 +871,8 @@ if test "$use_libbind" != "no"; then
want_install_bind="no"
fi
AC_ARG_ENABLE(bind_install,
AS_HELP_STRING([--enable-bind-install],[install bind includes and libraries (default is $want_install_bind).]),
AS_HELP_STRING([--enable-bind-install],
[install bind includes and libraries (default is no).]),
want_install_bind="$enableval")
if test "$want_install_bind" = "yes"; then
if test "$use_libbind" != "no"; then
......
......@@ -776,10 +776,15 @@ no)
if test ! -d "$use_libbind"; then
AC_MSG_ERROR([Cannot find bind directory at $use_libbind])
fi
if test ! -d "$use_libbind/include"; then
if test ! -d "$use_libbind/include" -o \
! -f "$use_libbind/include/isc/buffer.h"
then
AC_MSG_ERROR([Cannot find bind includes at $use_libbind/include])
fi
if test ! -d "$use_libbind/lib"; then
if test ! -d "$use_libbind/lib" -o \
\( ! -f "$use_libbind/lib/libisc.a" -a \
! -f "$use_libbind/lib/libisc.la" \)
then
AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib])
fi
BINDDIR="$use_libbind"
......@@ -820,9 +825,23 @@ want_libtool="yes"
BINDLT=
DISTCHECK_LIBTOOL_CONFIGURE_FLAG=
AC_ARG_ENABLE(libtool,
AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $want_libtool).]),
AS_HELP_STRING([--enable-libtool],
[use GNU libtool for dynamic shared libraries (default is yes).]),
want_libtool="$enableval")
if test "$use_libbind" != "no"; then
if test "$want_libtool" = "yes" -a \
! -f "$use_libbind/lib/libisc.la"
then
AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/lib])
fi
if test "$want_libtool" = "no" -a \
! -f "$use_libbind/lib/libisc.a"
then
AC_MSG_ERROR([Cannot find static libraries at $use_libbind/lib])
fi
fi
if test "$want_libtool" = "no"; then
AC_MSG_ERROR([libtool configure is used but libtool is disabled?])
fi
......@@ -853,7 +872,8 @@ if test "$use_libbind" != "no"; then
want_install_bind="no"
fi
AC_ARG_ENABLE(bind_install,
AS_HELP_STRING([--enable-bind-install],[install bind includes and libraries (default is $want_install_bind).]),
AS_HELP_STRING([--enable-bind-install],
[install bind includes and libraries.]),
want_install_bind="$enableval")
if test "$want_install_bind" = "yes"; then
if test "$use_libbind" != "no"; then
......
......@@ -781,10 +781,15 @@ no)
if test ! -d "$use_libbind"; then
AC_MSG_ERROR([Cannot find bind directory at $use_libbind])
fi
if test ! -d "$use_libbind/include"; then
if test ! -d "$use_libbind/include" -o \
! -f "$use_libbind/include/isc/buffer.h"
then
AC_MSG_ERROR([Cannot find bind includes at $use_libbind/include])
fi
if test ! -d "$use_libbind/lib"; then
if test ! -d "$use_libbind/lib" -o \
\( ! -f "$use_libbind/lib/libisc.a" -a \
! -f "$use_libbind/lib/libisc.la" \)
then
AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib])
fi
BINDDIR="$use_libbind"
......@@ -827,9 +832,28 @@ want_libtool="yes"
BINDLT=
DISTCHECK_LIBTOOL_CONFIGURE_FLAG=
AC_ARG_ENABLE(libtool,
AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $want_libtool).]),
AS_HELP_STRING([--enable-libtool],
@BEGIN WITH LIBTOOL
[use GNU libtool for dynamic shared libraries (default is yes).]),
@END WITH LIBTOOL
@BEGIN WITHOUT LIBTOOL
[use GNU libtool for dynamic shared libraries (default is no).]),
@END WITHOUT LIBTOOL
want_libtool="$enableval")
if test "$use_libbind" != "no"; then
if test "$want_libtool" = "yes" -a \
! -f "$use_libbind/lib/libisc.la"
then
AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/lib])
fi
if test "$want_libtool" = "no" -a \
! -f "$use_libbind/lib/libisc.a"
then
AC_MSG_ERROR([Cannot find static libraries at $use_libbind/lib])
fi
fi
@BEGIN WITH LIBTOOL
if test "$want_libtool" = "no"; then
AC_MSG_ERROR([libtool configure is used but libtool is disabled?])
......@@ -844,14 +868,10 @@ DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool"
@BEGIN WITHOUT LIBTOOL
if test "$want_libtool" = "yes"; then
AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...])
# dequote $ac_configure_args
# expand $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
cd $srcdir; exec ./config+lt "$@"
AC_MSG_ERROR([Recovering failed])
fi
......@@ -881,7 +901,13 @@ if test "$use_libbind" != "no"; then
want_install_bind="no"
fi
AC_ARG_ENABLE(bind_install,
AS_HELP_STRING([--enable-bind-install],[install bind includes and libraries (default is $want_install_bind).]),
AS_HELP_STRING([--enable-bind-install],
@BEGIN WITH LIBTOOL
[install bind includes and libraries.]),
@END WITH LIBTOOL
@BEGIN WITHOUT LIBTOOL
[install bind includes and libraries (default is no).]),
@END WITHOUT LIBTOOL
want_install_bind="$enableval")
if test "$want_install_bind" = "yes"; then
if test "$use_libbind" != "no"; then
......
......@@ -775,10 +775,15 @@ no)
if test ! -d "$use_libbind"; then
AC_MSG_ERROR([Cannot find bind directory at $use_libbind])
fi
if test ! -d "$use_libbind/include"; then
if test ! -d "$use_libbind/include" -o \
! -f "$use_libbind/include/isc/buffer.h"
then
AC_MSG_ERROR([Cannot find bind includes at $use_libbind/include])
fi
if test ! -d "$use_libbind/lib"; then
if test ! -d "$use_libbind/lib" -o \
\( ! -f "$use_libbind/lib/libisc.a" -a \
! -f "$use_libbind/lib/libisc.la" \)
then
AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib])
fi
BINDDIR="$use_libbind"
......@@ -817,20 +822,30 @@ want_libtool="no"
BINDLT=
DISTCHECK_LIBTOOL_CONFIGURE_FLAG=
AC_ARG_ENABLE(libtool,
AS_HELP_STRING([--enable-libtool],[use GNU libtool for dynamic shared libraries (default is $want_libtool).]),
AS_HELP_STRING([--enable-libtool],
[use GNU libtool for dynamic shared libraries (default is no).]),
want_libtool="$enableval")
if test "$use_libbind" != "no"; then
if test "$want_libtool" = "yes" -a \
! -f "$use_libbind/lib/libisc.la"
then
AC_MSG_ERROR([Cannot find dynamic libraries at $use_libbind/lib])
fi
if test "$want_libtool" = "no" -a \
! -f "$use_libbind/lib/libisc.a"
then
AC_MSG_ERROR([Cannot find static libraries at $use_libbind/lib])
fi
fi
if test "$want_libtool" = "yes"; then
AC_MSG_WARN([legacy configure is used but libtool is enabled. Trying to recover...])
# dequote $ac_configure_args
# expand $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
cd $srcdir; exec ./config+lt "$@"
AC_MSG_ERROR([Recovering failed])
fi
......@@ -856,7 +871,8 @@ if test "$use_libbind" != "no"; then
want_install_bind="no"
fi
AC_ARG_ENABLE(bind_install,
AS_HELP_STRING([--enable-bind-install],[install bind includes and libraries (default is $want_install_bind).]),
AS_HELP_STRING([--enable-bind-install],
[install bind includes and libraries (default is no).]),
want_install_bind="$enableval")
if test "$want_install_bind" = "yes"; then
if test "$use_libbind" != "no"; then
......
This library is obsolete
#!/bin/sh
#
# Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
perl util/lt.pl with < configure.ac-base > configure.ac+lt
perl util/lt.pl without < configure.ac-base > configure.ac-lt
cp -p configure.ac-lt configure.ac
autoconf
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment