X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=47821265bce4796e052d8fe2789939fc4e0e7b8e;hb=577a41e54a202186cf541b2de62e4abc169cab3b;hp=22699f65e3a2d4fc9e7efc986e4f4ea447d80a10;hpb=23fd25fa0a2fb9d613f4f9445000e49cc3b83db1;p=pspp

diff --git a/Smake b/Smake
index 22699f65e3..47821265bc 100644
--- a/Smake
+++ b/Smake
@@ -48,11 +48,13 @@ GNULIB_MODULES = \
         mbiter \
 	memcasecmp \
 	memchr \
+	memchr2 \
 	mempcpy \
 	memrchr \
 	minmax \
 	mkdtemp \
 	mkstemp \
+	pipe2 \
 	printf-posix \
 	printf-safe \
 	progname \
@@ -62,12 +64,14 @@ GNULIB_MODULES = \
 	relocatable-prog \
 	rename \
 	round \
+	select \
 	snprintf \
 	snprintf-posix \
 	sprintf-posix \
 	stdarg \
 	stdbool \
 	stdint \
+	strcasestr \
 	stpcpy \
 	strerror \
 	strftime \
@@ -78,9 +82,10 @@ GNULIB_MODULES = \
 	trunc \
 	unicase/u8-casecmp \
 	unicase/u8-casefold \
+	unicase/u8-tolower \
+	unicase/u8-toupper \
 	unictype/ctype-print \
-	unictype/property-id-continue \
-	unictype/property-id-start \
+	unictype/category-of \
 	unigbrk/uc-is-grapheme-break \
 	unilbrk/u8-possible-linebreaks \
 	uninorm/nfkd \
@@ -125,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