Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nghttp2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
nghttp2
Commits
fa312caa
Commit
fa312caa
authored
Feb 08, 2012
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check cunit and openssl in configure and set substitute variables.
parent
580a2b1b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
6 deletions
+26
-6
configure.ac
configure.ac
+20
-2
examples/Makefile.am
examples/Makefile.am
+3
-2
tests/Makefile.am
tests/Makefile.am
+3
-2
No files found.
configure.ac
View file @
fa312caa
...
...
@@ -44,14 +44,32 @@ AC_PROG_MAKE_SET
PKG_PROG_PKG_CONFIG([0.20])
# Checks for libraries.
# zlib
PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3])
LIBS=$ZLIB_LIBS $LIBS
CFLAGS=$CFLAGS $ZLIB_CFLAGS
AC_CHECK_LIB([cunit], [CU_initialize_registry],
[have_cunit=yes], [have_cunit=no])
# cunit
PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
# If pkg-config does not find cunit, check it using AC_CHECK_LIB. We
# do this because Debian (Ubuntu) lacks pkg-config file for cunit.
if test "x${have_cunit}" = "xno"; then
AC_MSG_WARN([${CUNIT_PKG_ERRORS}])
AC_CHECK_LIB([cunit], [CU_initialize_registry],
[have_cunit=yes], [have_cunit=no])
if test "x${have_cunit}" = "xyes"; then
CUNIT_LIBS="-lcunit"
CUNIT_CFLAGS=""
AC_SUBST([CUNIT_LIBS])
AC_SUBST([CUNIT_CFLAGS])
fi
fi
AM_CONDITIONAL([HAVE_CUNIT], [ test "x${have_cunit}" = "xyes" ])
# openssl (for examples)
PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.0])
# Checks for header files.
AC_CHECK_HEADERS([ \
arpa/inet.h \
...
...
examples/Makefile.am
View file @
fa312caa
...
...
@@ -22,8 +22,9 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AM_CFLAGS
=
-Wall
AM_CPPFLAGS
=
-I
$(srcdir)
/../lib/includes
-I
$(builddir)
/../lib/includes
`
pkg-config
--cflags
libssl libcrypto
`
AM_LDFLAGS
=
`
pkg-config
--libs
libssl libcrypto
`
AM_CPPFLAGS
=
-I
$(srcdir)
/../lib/includes
-I
$(builddir)
/../lib/includes
\
@OPENSSL_CFLAGS@
AM_LDFLAGS
=
@OPENSSL_LIBS@
LDADD
=
$(top_builddir)
/lib/libspdylay.la
bin_PROGRAMS
=
spdycat spdyd
...
...
tests/Makefile.am
View file @
fa312caa
...
...
@@ -36,8 +36,9 @@ HFILES = spdylay_pq_test.h spdylay_map_test.h spdylay_queue_test.h \
main_SOURCES
=
$(HFILES)
$(OBJECTS)
main_LDADD
=
${top_builddir}
/lib/libspdylay.la
main_LDFLAGS
=
-static
-lcunit
-lncurses
AM_CFLAGS
=
-Wall
-g
-O2
-I
${top_srcdir}
/lib
-I
${top_srcdir}
/lib/includes
main_LDFLAGS
=
-static
@CUNIT_LIBS@
-lncurses
AM_CFLAGS
=
-Wall
-g
-O2
-I
${top_srcdir}
/lib
-I
${top_srcdir}
/lib/includes
\
@CUNIT_CFLAGS@
TESTS
=
main
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment