From 6d91a86b23bd004c11e5ab742dbd5153db25dab5 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Fri, 7 Oct 2016 01:57:28 +0200
Subject: Finished build stuff (still doc to do)

---
 configure.ac-base | 46 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 10 deletions(-)

(limited to 'configure.ac-base')

diff --git a/configure.ac-base b/configure.ac-base
index 347c8568..85d88c9f 100644
--- a/configure.ac-base
+++ b/configure.ac-base
@@ -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
-- 
cgit v1.2.1