Merge branch 'KangLin-master' (#227)

hartwork · hartwork · commit ba1cfbbeb47d · 2018-10-21T15:00:12.000+02:00
diff --git a/expat/Changes b/expat/Changes
@@ -8,10 +8,12 @@ Release x.x.x XXX XXXXXX XX XXXX
                     exporting non-API symbols
             #212  CMake: Make libdir of pkgconfig expat.pc support multilib
             #219  Remove fallback to bcopy, assume that memmove(3) exists
+            #227  Autotools: Add --without-examples and --without-tests
             #228  Autotools: Modernize configure.ac
 
         Special thanks to:
             Benjamin Peterson
+            @KangLin
             Marco Maggi
             @userwithuid
             Yury Gribov
diff --git a/expat/Makefile.am b/expat/Makefile.am
@@ -37,7 +37,13 @@ AUTOMAKE_OPTIONS = \
 ACLOCAL_AMFLAGS = -I m4
 LIBTOOLFLAGS = --verbose
 
-SUBDIRS = lib examples tests  # lib goes first to build first
+SUBDIRS = lib # lib goes first to build first
+if WITH_EXAMPLES
+SUBDIRS += examples
+endif
+if WITH_TESTS
+SUBDIRS += tests  
+endif
 if WITH_XMLWF
 SUBDIRS += xmlwf doc
 endif
diff --git a/expat/configure.ac b/expat/configure.ac
@@ -122,6 +122,14 @@ AC_ARG_WITH([xmlwf],
   [with_xmlwf=yes])
 AM_CONDITIONAL([WITH_XMLWF], [test x${with_xmlwf} = xyes])
 
+AC_ARG_WITH([examples], [
+AS_HELP_STRING([--without-examples], [do not build examples @<:@default=included@:>@])], [], [with_examples=yes])
+AM_CONDITIONAL([WITH_EXAMPLES], [test x${with_examples} = xyes])
+
+AC_ARG_WITH([tests], [
+AS_HELP_STRING([--without-tests], [do not build tests @<:@default=included@:>@])], [], [with_tests=yes])
+AM_CONDITIONAL([WITH_TESTS], [test x${with_tests} = xyes])
+
 AM_CONDITIONAL([MINGW], [echo -- "${host}" | ${FGREP} mingw >/dev/null])
 AM_CONDITIONAL([UNICODE], [echo -- "${CPPFLAGS}${CFLAGS}" | ${FGREP} XML_UNICODE >/dev/null])
 
