summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorFrancis Dupont <fdupont@isc.org>2016-10-07 01:57:28 +0200
committerFrancis Dupont <fdupont@isc.org>2016-10-07 01:57:28 +0200
commit6d91a86b23bd004c11e5ab742dbd5153db25dab5 (patch)
treef5c4ee893a9d3341d02250eb1b0a642cd0da2322 /configure
parentbf6f8fcee913200e4c87bb660824c270e3aa8804 (diff)
downloadisc-dhcp-6d91a86b23bd004c11e5ab742dbd5153db25dab5.tar.gz
Finished build stuff (still doc to do)
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure35
1 files changed, 24 insertions, 11 deletions
diff --git a/configure b/configure
index 660468b4..86ea6b9b 100755
--- a/configure
+++ b/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