diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-04-30 14:39:02 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-04-30 14:39:02 -0700 |
| commit | 8d2cb9e7a897a070b2509f9de60961c9d154ee99 (patch) | |
| tree | 8049b26d4d08c9b3253be2237cf1d2524eae85f5 | |
| parent | 9a3534b3e0808a5294f85f2402a2b4410a153b76 (diff) | |
configure: check for libbsd before libxtrans checks for strlcpy
If we're going to link to libbsd, might as well use it for strlcpy too
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 9d89409..74cd4da 100644 --- a/configure.ac +++ b/configure.ac @@ -32,28 +32,25 @@ XORG_CHECK_SGML_DOCTOOLS(1.8) # Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(ICE, xproto xtrans) -# Transport selection macro from xtrans.m4 -XTRANS_CONNECTION_FLAGS -AC_DEFINE(ICE_t, 1, [Xtrans transport type]) -AC_DEFINE(TRANS_CLIENT, 1, [Xtrans transport client code]) -AC_DEFINE(TRANS_SERVER, 1, [Xtrans transport server code]) - # Checks for library functions. AC_CHECK_LIB([bsd], [arc4random_buf]) AC_CHECK_FUNCS([asprintf arc4random_buf getentropy]) -# Allow checking code with lint, sparse, etc. -XORG_WITH_LINT -XORG_LINT_LIBRARY([ICE]) -LINT_FLAGS="${LINT_FLAGS} ${ICE_CFLAGS} ${XTRANS_CFLAGS}" - - if test "x$ac_cv_lib_bsd_arc4random_buf" = xyes; then BSDLIB=-lbsd fi AC_SUBST(BSDLIB) +# Transport selection macro from xtrans.m4 +XTRANS_CONNECTION_FLAGS +AC_DEFINE(ICE_t, 1, [Xtrans transport type]) +AC_DEFINE(TRANS_CLIENT, 1, [Xtrans transport client code]) +AC_DEFINE(TRANS_SERVER, 1, [Xtrans transport server code]) +# Allow checking code with lint, sparse, etc. +XORG_WITH_LINT +XORG_LINT_LIBRARY([ICE]) +LINT_FLAGS="${LINT_FLAGS} ${ICE_CFLAGS} ${XTRANS_CFLAGS}" AC_CONFIG_FILES([Makefile doc/Makefile |