walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add --enable-src configure option 

When --enable-src is given, the programs in src directory will be
built. If --disable-src is given, those programs will not be built. If
none of them are given, --enable-src is assumed.
This commit is contained in:
Tatsuhiro Tsujikawa 2012-09-10 21:51:08 +09:00
parent b0fcd68783
commit ca415a2a15
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@ -45,6 +45,11 @@ AC_ARG_ENABLE([maintainer-mode],
[Turn on compile time warnings])], [Turn on compile time warnings])],
[maintainer_mode=$withval], [maintainer_mode=no]) [maintainer_mode=$withval], [maintainer_mode=no])
AC_ARG_ENABLE([src],
[AS_HELP_STRING([--enable-src],
[Build installable SPDY client/server programs in src])],
[request_src=$withval], [request_src=yes])
AC_ARG_ENABLE([examples], AC_ARG_ENABLE([examples],
[AS_HELP_STRING([--enable-examples], [AS_HELP_STRING([--enable-examples],
[Build example programs])], [Build example programs])],
@ -128,6 +133,15 @@ if test "x${have_libxml2}" = "xyes"; then
fi fi
AM_CONDITIONAL([HAVE_LIBXML2], [ test "x${have_libxml2}" = "xyes" ]) AM_CONDITIONAL([HAVE_LIBXML2], [ test "x${have_libxml2}" = "xyes" ])
# The src programs depend on OpenSSL
enable_src=no
if test "x${request_src}" = "xyes" &&
test "x${have_openssl}" = "xyes"; then
enable_src=yes
fi
AM_CONDITIONAL([ENABLE_SRC], [ test "x${enable_src}" = "xyes" ])
# The example programs depend on OpenSSL # The example programs depend on OpenSSL
enable_examples=no enable_examples=no
if test "x${request_examples}" = "xyes" && if test "x${request_examples}" = "xyes" &&
@ -255,5 +269,6 @@ AC_MSG_NOTICE([summary of build options:
OpenSSL: ${have_openssl} OpenSSL: ${have_openssl}
Libxml2: ${have_libxml2} Libxml2: ${have_libxml2}
Libevent(SSL): ${have_libevent_openssl} Libevent(SSL): ${have_libevent_openssl}
Src: ${enable_src}
Examples: ${enable_examples} Examples: ${enable_examples}
]) ])

4
src/Makefile.am
View File

@ -21,7 +21,7 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
if ENABLE_EXAMPLES if ENABLE_SRC
AM_CFLAGS = -Wall AM_CFLAGS = -Wall
AM_CPPFLAGS = -Wall -I$(srcdir)/../lib/includes -I$(builddir)/../lib/includes \ AM_CPPFLAGS = -Wall -I$(srcdir)/../lib/includes -I$(builddir)/../lib/includes \
@ -92,4 +92,4 @@ shrpx_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} \
http-parser/http_parser.c http-parser/http_parser.h http-parser/http_parser.c http-parser/http_parser.h
endif # HAVE_LIBEVENT_OPENSSL endif # HAVE_LIBEVENT_OPENSSL
endif # ENABLE_EXAMPLES endif # ENABLE_SRC

4
tests/Makefile.am
View File

@ -54,11 +54,11 @@ AM_CFLAGS = -Wall -I${top_srcdir}/lib -I${top_srcdir}/lib/includes -I${top_build
TESTS = main failmalloc TESTS = main failmalloc
if ENABLE_EXAMPLES if ENABLE_SRC
EXTRA_DIST = end_to_end.py EXTRA_DIST = end_to_end.py
TESTS += end_to_end.py TESTS += end_to_end.py
endif # ENABLE_EXAMPLES endif # ENABLE_SRC
endif # HAVE_CUNIT endif # HAVE_CUNIT