Merged rt29402c (footprint/libtool)

1 files changed, 99 insertions, 7 deletions

diff --git a/configure b/configure
index 6d8c1a9e..eff92d16 100755
--- a/configure
+++ b/configure
@@ -629,6 +629,11 @@ LDAP_CFLAGS
 LDAP_LIBS
 INSTALL_BIND_FALSE
 INSTALL_BIND_TRUE
+Q
+DISTCHECK_LIBTOOL_CONFIGURE_FLAG
+BINDLT
+A
+DHLIBS
 HAVE_BINDDIR_FALSE
 HAVE_BINDDIR_TRUE
 DISTCHECK_LIBBIND_CONFIGURE_FLAG
@@ -787,6 +792,7 @@ enable_epoll
 enable_devpoll
 with_bind_extra_config
 with_libbind
+enable_libtool
 enable_bind_install
 with_ldap
 with_ldapcrypto
@@ -1454,6 +1460,8 @@ Optional Features:
   --enable-kqueue         use BSD kqueue (default is no)
   --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 no).
   --enable-bind-install   install bind includes and libraries (default is no).
 
 Optional Packages:
@@ -2721,6 +2729,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 # we specify "foreign" to avoid having to have the GNU mandated files,
 # like AUTHORS, COPYING, and such
 am__api_version='1.15'
@@ -7009,10 +7018,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"
@@ -7040,16 +7054,89 @@ else
 fi
 
 
+#
+# GNU libtool support
+#
+case "$build_os" in
+	sunos*)
+		# Just set the maximum command line length for sunos
+		# as it otherwise takes a exceptionally long time to
+		# work it out. Required for libtool.
+
+		lt_cv_sys_max_cmd_len=4096
+		;;
+esac
+
+want_libtool="no"
+
+BINDLT=
+DISTCHECK_LIBTOOL_CONFIGURE_FLAG=
+# Check whether --enable-libtool was given.
+if test "${enable_libtool+set}" = set; then :
+  enableval=$enable_libtool; want_libtool="$enableval"
+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;}
+	# expand $ac_configure_args
+	eval "set my_configure_args $ac_configure_args"
+	shift
+	cd $srcdir; exec ./config+lt "$@"
+	as_fn_error $? "Recovering failed" "$LINENO" 5
+fi
+
+DHLIBS=LIBRARIES
+A=a
+
+
+
+
+
+
+# quoting in Makefile.am.in
+Q=@
+
+
+# install bind includes and libraries
+
+want_install_bind="no"
+if test "$want_libtool" = "yes"; then
+	want_install_bind="yes"
+fi
+if test "$use_libbind" != "no"; then
+	want_install_bind="no"
+fi
 # Check whether --enable-bind_install was given.
 if test "${enable_bind_install+set}" = set; then :
-  enableval=$enable_bind_install;
+  enableval=$enable_bind_install; want_install_bind="$enableval"
 fi
 
-if test "$enable_bind_install" = "yes" -a "$use_libbind" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-bind-install does nothing when --with-libbind is set" >&5
+if test "$want_install_bind" = "yes"; then
+        if test "$use_libbind" != "no"; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-bind-install does nothing when --with-libbind is set" >&5
 $as_echo "$as_me: WARNING: --enable-bind-install does nothing when --with-libbind is set" >&2;}
+	fi
+elif test "$want_libtool" = "yes" -a "$use_libbind" = "no"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: embedded dynamic bind libraries must be installed" >&5
+$as_echo "$as_me: WARNING: embedded dynamic bind libraries must be installed" >&2;}
 fi
- if test "$enable_bind_install" = "yes"; then
+ if test "$want_install_bind" = "yes"; then
   INSTALL_BIND_TRUE=
   INSTALL_BIND_FALSE='#'
 else
@@ -7439,7 +7526,7 @@ $as_echo "#define FLEXIBLE_ARRAY_MEMBER /**/" >>confdefs.h
   fi
 
 
-ac_config_files="$ac_config_files Makefile client/Makefile client/tests/Makefile common/Makefile common/tests/Makefile dhcpctl/Makefile includes/Makefile omapip/Makefile relay/Makefile server/Makefile tests/Makefile tests/unittest.sh server/tests/Makefile doc/devel/doxyfile"
+ac_config_files="$ac_config_files Makefile client/Makefile client/tests/Makefile common/Makefile.am common/Makefile common/tests/Makefile dhcpctl/Makefile.am dhcpctl/Makefile includes/Makefile omapip/Makefile.am omapip/Makefile relay/Makefile server/Makefile tests/Makefile.am tests/Makefile tests/unittest.sh server/tests/Makefile doc/devel/doxyfile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -8193,13 +8280,17 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "client/Makefile") CONFIG_FILES="$CONFIG_FILES client/Makefile" ;;
     "client/tests/Makefile") CONFIG_FILES="$CONFIG_FILES client/tests/Makefile" ;;
+    "common/Makefile.am") CONFIG_FILES="$CONFIG_FILES common/Makefile.am" ;;
     "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;;
     "common/tests/Makefile") CONFIG_FILES="$CONFIG_FILES common/tests/Makefile" ;;
+    "dhcpctl/Makefile.am") CONFIG_FILES="$CONFIG_FILES dhcpctl/Makefile.am" ;;
     "dhcpctl/Makefile") CONFIG_FILES="$CONFIG_FILES dhcpctl/Makefile" ;;
     "includes/Makefile") CONFIG_FILES="$CONFIG_FILES includes/Makefile" ;;
+    "omapip/Makefile.am") CONFIG_FILES="$CONFIG_FILES omapip/Makefile.am" ;;
     "omapip/Makefile") CONFIG_FILES="$CONFIG_FILES omapip/Makefile" ;;
     "relay/Makefile") CONFIG_FILES="$CONFIG_FILES relay/Makefile" ;;
     "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;;
+    "tests/Makefile.am") CONFIG_FILES="$CONFIG_FILES tests/Makefile.am" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "tests/unittest.sh") CONFIG_FILES="$CONFIG_FILES tests/unittest.sh" ;;
     "server/tests/Makefile") CONFIG_FILES="$CONFIG_FILES server/tests/Makefile" ;;
@@ -8892,6 +8983,7 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
+
 if test "$enable_dhcpv4o6" = "yes"; then
 	DHCP_VERSIONS="DHCPv4, DHCPv6 and DHCPv4-over-DHCPv6"
 elif test "$enable_dhcpv6" != "no"; then