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 | |
parent | f0cff24214d437ef28d0eb92f9bc45a36cf25530 (diff) | |
download | zlib-32d8a5379eb91c7fd55304b567a07ad0e2524398.tar.gz zlib-32d8a5379eb91c7fd55304b567a07ad0e2524398.tar.bz2 zlib-32d8a5379eb91c7fd55304b567a07ad0e2524398.zip |
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.
-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 @@ | |||
1 | lib_LTLIBRARIES = libminizip.la | 1 | lib_LTLIBRARIES = libminizip.la |
2 | 2 | ||
3 | if COND_DEMOS | ||
4 | bin_PROGRAMS = miniunzip minizip | ||
5 | endif | ||
6 | |||
3 | zlib_top_srcdir = $(top_srcdir)/../.. | 7 | zlib_top_srcdir = $(top_srcdir)/../.. |
4 | zlib_top_builddir = $(top_builddir)/../.. | 8 | zlib_top_builddir = $(top_builddir)/../.. |
5 | 9 | ||
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]) | |||
6 | AM_INIT_AUTOMAKE([foreign]) | 6 | AM_INIT_AUTOMAKE([foreign]) |
7 | LT_INIT | 7 | LT_INIT |
8 | 8 | ||
9 | AC_MSG_CHECKING([whether to build example programs]) | ||
10 | AC_ARG_ENABLE([demos], AC_HELP_STRING([--enable-demos], [build example programs])) | ||
11 | AM_CONDITIONAL([COND_DEMOS], [test "$enable_demos" = yes]) | ||
12 | if test "$enable_demos" = yes | ||
13 | then | ||
14 | AC_MSG_RESULT([yes]) | ||
15 | else | ||
16 | AC_MSG_RESULT([no]) | ||
17 | fi | ||
18 | |||
9 | AC_SUBST([HAVE_UNISTD_H], [0]) | 19 | AC_SUBST([HAVE_UNISTD_H], [0]) |
10 | AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) | 20 | AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) |
11 | AC_CONFIG_FILES([Makefile minizip.pc]) | 21 | AC_CONFIG_FILES([Makefile minizip.pc]) |