From 86fa33327cba76d3568462a38c0abf6beb4448fb Mon Sep 17 00:00:00 2001
From: Manuel Serrano <Manuel.Serrano@inria.fr>
Date: Thu, 12 Dec 2024 08:20:41 +0100
Subject: [PATCH] Check libtool during configuration only when libuv is
 selected

---
 autoconf/libtool | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 autoconf/tools   | 38 +-------------------------------------
 configure        |  4 +++-
 3 files changed, 50 insertions(+), 38 deletions(-)
 create mode 100755 autoconf/libtool

diff --git a/autoconf/libtool b/autoconf/libtool
new file mode 100755
index 000000000..4d8e02ca3
--- /dev/null
+++ b/autoconf/libtool
@@ -0,0 +1,46 @@
+#!/bin/sh
+#*=====================================================================*/
+#*    serrano/prgm/project/bigloo/bigloo/autoconf/libtool              */
+#*    -------------------------------------------------------------    */
+#*    Author      :  Manuel Serrano                                    */
+#*    Creation    :  Wed Aug  9 13:27:23 1995                          */
+#*    Last change :  Thu Dec 12 08:18:53 2024 (serrano)                */
+#*    -------------------------------------------------------------    */
+#*    Check for libtooling.                                            */
+#*=====================================================================*/
+
+#*---------------------------------------------------------------------*/
+#*    libtools                                                         */
+#*---------------------------------------------------------------------*/
+which libtoolize > /dev/null || which glibtoolize > /dev/null
+
+if [ "$?" = "1" ]; then
+  case $HOSTOS in
+    darwin)
+      echo "*** ERROR: Cannot find libtoolize nor glibtoolize"
+      echo "On MacOS X, you can install it with"
+      echo "  brew install libtool"
+      echo "abort"
+      exit 1
+      ;;
+      
+    *)
+      echo "*** ERROR: Cannot find libtoolize"
+      echo "Generally it is released with the \"libtool\" suite"
+      echo "abort"
+      exit 1
+      ;;
+  esac
+fi
+
+#*---------------------------------------------------------------------*/
+#*    autoconf                                                         */
+#*---------------------------------------------------------------------*/
+which autoconf > /dev/null
+
+if [ "$?" = "1" ]; then
+  echo "*** ERROR: Cannot find \"autoconf\", abort."
+  exit 1
+fi
+
+
diff --git a/autoconf/tools b/autoconf/tools
index 6a8a834ba..9407d923c 100755
--- a/autoconf/tools
+++ b/autoconf/tools
@@ -4,35 +4,11 @@
 #*    -------------------------------------------------------------    */
 #*    Author      :  Manuel Serrano                                    */
 #*    Creation    :  Wed Aug  9 13:27:23 1995                          */
-#*    Last change :  Thu Apr  8 10:39:47 2021 (serrano)                */
+#*    Last change :  Thu Dec 12 08:15:10 2024 (serrano)                */
 #*    -------------------------------------------------------------    */
 #*    Check for essential tools.                                       */
 #*=====================================================================*/
 
-#*---------------------------------------------------------------------*/
-#*    libtools                                                         */
-#*---------------------------------------------------------------------*/
-which libtoolize > /dev/null || which glibtoolize > /dev/null
-
-if [ "$?" = "1" ]; then
-  case $HOSTOS in
-    darwin)
-      echo "*** ERROR: Cannot find libtoolize nor glibtoolize"
-      echo "On MacOS X, you can install it with"
-      echo "  brew install libtool"
-      echo "abort"
-      exit 1
-      ;;
-      
-    *)
-      echo "*** ERROR: Cannot find libtoolize"
-      echo "Generally it is released with the \"libtool\" suite"
-      echo "abort"
-      exit 1
-      ;;
-  esac
-fi
-
 #*---------------------------------------------------------------------*/
 #*    make                                                             */
 #*---------------------------------------------------------------------*/
@@ -43,16 +19,6 @@ if [ "$?" = "1" ]; then
   exit 1
 fi
 
-#*---------------------------------------------------------------------*/
-#*    autoconf                                                         */
-#*---------------------------------------------------------------------*/
-which autoconf > /dev/null
-
-if [ "$?" = "1" ]; then
-  echo "*** ERROR: Cannot find \"autoconf\", abort."
-  exit 1
-fi
-
 #*---------------------------------------------------------------------*/
 #*    sed                                                              */
 #*---------------------------------------------------------------------*/
@@ -72,5 +38,3 @@ if [ "$?" = "1" ]; then
   echo "*** ERROR: Cannot find \"awk\", abort."
   exit 1
 fi
-
-
diff --git a/configure b/configure
index cd57ca629..1a35b43bb 100755
--- a/configure
+++ b/configure
@@ -4,7 +4,7 @@
 #*    -------------------------------------------------------------    */
 #*    Author      :  Manuel Serrano                                    */
 #*    Creation    :  Tue Jan 25 16:05:10 1994                          */
-#*    Last change :  Thu Nov 14 18:35:37 2024 (serrano)                */
+#*    Last change :  Thu Dec 12 08:19:46 2024 (serrano)                */
 #*    Last change :  Thu May 14 09:43:33 2020 (serrano)                */
 #*    Copyright   :  1994-2024 Manuel Serrano, see LICENSE file        */
 #*    -------------------------------------------------------------    */
@@ -2475,6 +2475,8 @@ fi
 if [ "$libuv_is_enabled " = "yes " -a "$customlibuv " = "yes " ]; then
   $echo ""
 
+  $autoconfdir/tools || exit 1
+  
   $echo "+ Installing custom libuv ($libuvversion) source code."
   (cd libuv; . ./install-libuv) || exit 1