diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2012-01-21 15:55:54 -0600 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-01-21 17:15:48 -0800 |
| commit | 32d8a5379eb91c7fd55304b567a07ad0e2524398 (patch) | |
| tree | 03b38c1041f55373781a82b01105b43a0370bea9 /contrib/minizip | |
| parent | f0cff24214d437ef28d0eb92f9bc45a36cf25530 (diff) | |
| download | zlib-32d8a5379eb91c7fd55304b567a07ad0e2524398.tar.gz | |
Add an --enable-demos option to contrib/minizip/configure.
This makes build-testing and installing the minizip/miniunzip programs
as simple as "autoreconf -if && ./configure --enable-demos && make &&
make install". Without --enable-demos, the makefile will only build
and install the library, as before. Helped by Mike Frysinger.
minizip/miniunzip were not intended to be general-purpose installed
utilities, but they can be useful from time to time as a lightweight
substitute for zip/unzip. You can also use them to quickly test that
the library installation procedure worked.
Diffstat (limited to 'contrib/minizip')
| -rw-r--r-- | contrib/minizip/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/minizip/configure.ac | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am index b0f39b6..2ced913 100644 --- a/contrib/minizip/Makefile.am +++ b/contrib/minizip/Makefile.am @@ -1,5 +1,9 @@ lib_LTLIBRARIES = libminizip.la +if COND_DEMOS +bin_PROGRAMS = miniunzip minizip +endif + zlib_top_srcdir = $(top_srcdir)/../.. zlib_top_builddir = $(top_builddir)/../.. diff --git a/contrib/minizip/configure.ac b/contrib/minizip/configure.ac index 4799cdc..53adbb8 100644 --- a/contrib/minizip/configure.ac +++ b/contrib/minizip/configure.ac @@ -6,6 +6,16 @@ AC_CONFIG_SRCDIR([minizip.c]) AM_INIT_AUTOMAKE([foreign]) LT_INIT +AC_MSG_CHECKING([whether to build example programs]) +AC_ARG_ENABLE([demos], AC_HELP_STRING([--enable-demos], [build example programs])) +AM_CONDITIONAL([COND_DEMOS], [test "$enable_demos" = yes]) +if test "$enable_demos" = yes +then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi + AC_SUBST([HAVE_UNISTD_H], [0]) AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) AC_CONFIG_FILES([Makefile minizip.pc]) |