Skip to content

Commit

Permalink
Check libtool during configuration only when libuv is selected
Browse files Browse the repository at this point in the history
  • Loading branch information
manuel-serrano committed Dec 12, 2024
1 parent e45f2cd commit 86fa333
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 38 deletions.
46 changes: 46 additions & 0 deletions autoconf/libtool
Original file line number Diff line number Diff line change
@@ -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


38 changes: 1 addition & 37 deletions autoconf/tools
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
#*---------------------------------------------------------------------*/
Expand All @@ -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 */
#*---------------------------------------------------------------------*/
Expand All @@ -72,5 +38,3 @@ if [ "$?" = "1" ]; then
echo "*** ERROR: Cannot find \"awk\", abort."
exit 1
fi


4 changes: 3 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
#* ------------------------------------------------------------- */
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 86fa333

Please sign in to comment.