From 32d8a5379eb91c7fd55304b567a07ad0e2524398 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sat, 21 Jan 2012 15:55:54 -0600 Subject: [PATCH] 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. --- contrib/minizip/Makefile.am | 4 ++++ contrib/minizip/configure.ac | 10 ++++++++++ 2 files changed, 14 insertions(+) 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])