X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=47821265bce4796e052d8fe2789939fc4e0e7b8e;hb=13d835543ea92339895d639165de1c6e1eec9010;hp=61235efd90c19a39113e1c85633fddb6befe1975;hpb=e0fa1b0c20a246712042fd53261395ae3d463604;p=pspp

diff --git a/Smake b/Smake
index 61235efd90..47821265bc 100644
--- a/Smake
+++ b/Smake
@@ -7,10 +7,12 @@ GNULIB_TOOL = $(GNULIB)/gnulib-tool
 GNULIB_MODULES = \
 	assert \
 	byteswap \
+	c-snprintf \
 	c-strcase \
 	c-strcasestr \
 	c-ctype \
 	c-strtod \
+	c-xvasprintf \
 	clean-temp \
 	close \
 	configmake \
@@ -46,11 +48,13 @@ GNULIB_MODULES = \
         mbiter \
 	memcasecmp \
 	memchr \
+	memchr2 \
 	mempcpy \
 	memrchr \
 	minmax \
 	mkdtemp \
 	mkstemp \
+	pipe2 \
 	printf-posix \
 	printf-safe \
 	progname \
@@ -60,12 +64,14 @@ GNULIB_MODULES = \
 	relocatable-prog \
 	rename \
 	round \
+	select \
 	snprintf \
 	snprintf-posix \
 	sprintf-posix \
 	stdarg \
 	stdbool \
 	stdint \
+	strcasestr \
 	stpcpy \
 	strerror \
 	strftime \
@@ -74,11 +80,15 @@ GNULIB_MODULES = \
 	sys_stat \
 	tempname \
 	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 \
 	unistd \
 	unistr/u8-check \
 	unistr/u8-cpy \
@@ -120,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