From d8eab7600f470fbd09013eb90cbc7c5e271da4e5 Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Fri, 20 Jan 2023 10:39:06 +1100 Subject: [PATCH] progs: just use libtoolize We no longer support xfsprogs on random platforms other than Linux, so drop the complexity in detecting the libtoolize binary on MacOS from the main makefile. Signed-off-by: Dave Chinner Reviewed-by: Carlos Maiolino Signed-off-by: Carlos Maiolino --- Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile b/Makefile index c8455a9e6..c12df98db 100644 --- a/Makefile +++ b/Makefile @@ -73,14 +73,6 @@ ifneq ("$(XGETTEXT)","") TOOL_SUBDIRS += po endif -# If we are on OS X, use glibtoolize from MacPorts, as OS X doesn't have -# libtoolize binary itself. -LIBTOOLIZE_TEST=$(shell libtoolize --version >/dev/null 2>&1 && echo found) -LIBTOOLIZE_BIN=libtoolize -ifneq ("$(LIBTOOLIZE_TEST)","found") -LIBTOOLIZE_BIN=glibtoolize -endif - # include is listed last so it is processed last in clean rules. SUBDIRS = $(LIBFROG_SUBDIR) $(LIB_SUBDIRS) $(TOOL_SUBDIRS) include @@ -116,7 +108,7 @@ clean: # if configure hasn't run, nothing to clean endif configure: configure.ac - $(LIBTOOLIZE_BIN) -c -i -f + libtoolize -c -i -f cp include/install-sh . aclocal -I m4 autoconf -- 2.47.3