From: Ben Pfaff <blp@cs.stanford.edu>
Date: Wed, 22 May 2013 03:32:27 +0000 (-0700)
Subject: Smake: Use glibtoolize instead of libtoolize, if it is available.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06289ea7170d6fc485f25019a38c323b261c4ddb;p=pspp

Smake: Use glibtoolize instead of libtoolize, if it is available.

Requested by Teppo Jussmäki <jussmaki@fastmail.fm>.
Tested by Teppo Jussmäki <jussmaki@fastmail.fm>.
---

diff --git a/Smake b/Smake
index d061973d12..47821265bc 100644
--- a/Smake
+++ b/Smake
@@ -130,7 +130,15 @@ prep_ph:
 		--source-base=gl --lib=libgl --tests-base=tests \
 		--doc-base=gl/doc --aux-dir=build-aux  \
 		--libtool $(GNULIB_MODULES)
-	libtoolize --force --automake
+	if (glibtoolize --version) >/dev/null 2>&1; then	\
+		LIBTOOLIZE=glibtoolize;				\
+	elif (libtoolize --version) >/dev/null 2>&1; then	\
+		LIBTOOLIZE=libtoolize;				\
+	else							\
+		echo >&2 "libtoolize not found";		\
+		exit 1;						\
+	fi;							\
+	$$LIBTOOLIZE --force --automake
 
 aclocal.m4:
 	aclocal -I m4 -I gl/m4