Cleanup configure.ac
@@ -131,6 +131,16 @@ AC_ARG_WITH([boringssl],
AC_ARG_VAR([BORINGSSL_CFLAGS], [C compiler flags for BORINGSSL])
AC_ARG_VAR([BORINGSSL_LIBS], [linker flags for BORINGSSL])
+AC_ARG_VAR([LIBEV_CFLAGS], [C compiler flags for libev, skipping any checks])
+AC_ARG_VAR([LIBEV_LIBS], [linker flags for libev, skipping any checks])
+
+AC_ARG_VAR([JEMALLOC_CFLAGS],
+ [C compiler flags for jemalloc, skipping any checks])
+AC_ARG_VAR([JEMALLOC_LIBS], [linker flags for jemalloc, skipping any checks])
+
+AC_ARG_VAR([LIBTOOL_LDFLAGS],
+ [libtool specific flags (e.g., -static-libtool-libs)])
+
# Checks for programs
AC_PROG_CC
AC_PROG_CXX
@@ -306,9 +316,6 @@ fi
AM_CONDITIONAL([HAVE_NGHTTP3], [ test "x${have_libnghttp3}" = "xyes" ])
-AC_ARG_VAR([LIBEV_CFLAGS], [C compiler flags for libev, skipping any checks])
-AC_ARG_VAR([LIBEV_LIBS], [linker flags for libev, skipping any checks])
-
# libev (required for examples)
have_libev=no
if test "x${request_libev}" != "xno"; then
@@ -322,8 +329,6 @@ if test "x${request_libev}" != "xno"; then
if test "x${have_libev}" = "xyes"; then
LIBEV_LIBS=-lev
LIBEV_CFLAGS=
- AC_SUBST([LIBEV_LIBS])
- AC_SUBST([LIBEV_CFLAGS])
fi
fi
LIBS=$save_LIBS
@@ -365,9 +370,6 @@ AM_CONDITIONAL([ENABLE_EXAMPLE_OPENSSL], [ test "x${enable_examples}" = "xyes" &
AM_CONDITIONAL([ENABLE_EXAMPLE_GNUTLS], [ test "x${enable_examples}" = "xyes" && test "x${have_gnutls}" = "xyes" ])
AM_CONDITIONAL([ENABLE_EXAMPLE_BORINGSSL], [ test "x${enable_examples}" = "xyes" && test "x${have_boringssl}" = "xyes" ])
-AC_ARG_VAR([JEMALLOC_CFLAGS], [C compiler flags for jemalloc, skipping any checks])
-AC_ARG_VAR([JEMALLOC_LIBS], [linker flags for jemalloc, skipping any checks])
-
# jemalloc
have_jemalloc=no
if test "x${request_jemalloc}" != "xno"; then
@@ -393,7 +395,6 @@ if test "x${request_jemalloc}" != "xno"; then
if test "x${have_jemalloc}" = "xyes" &&
test "x${jemalloc_libs}" != "xnone required"; then
JEMALLOC_LIBS=${jemalloc_libs}
- AC_SUBST([JEMALLOC_LIBS])
fi
else
have_jemalloc=yes
@@ -405,9 +406,6 @@ if test "x${request_jemalloc}" = "xyes" &&
AC_MSG_ERROR([jemalloc was requested (--with-jemalloc) but not found])
fi
-AC_ARG_VAR([LIBTOOL_LDFLAGS],
- [libtool specific flags (e.g., -static-libtool-libs)])
-
# Checks for header files.
AC_CHECK_HEADERS([ \
arpa/inet.h \
