]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
progs: just use libtoolize origin/for-next_2023-01-31
authorDave Chinner <dchinner@redhat.com>
Thu, 19 Jan 2023 23:39:06 +0000 (10:39 +1100)
committerCarlos Maiolino <cem@kernel.org>
Fri, 20 Jan 2023 14:59:22 +0000 (15:59 +0100)
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 <dchinner@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
Makefile

index c8455a9e665f1151ef788d2ebc42a5efc3fa3a5a..c12df98dbef384d218f203309b83338fad1bc23a 100644 (file)
--- 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