We don't use the variables being passed to `AC_SUBST` in these calls as
output variables, so remove them.
Signed-off-by: Jeremy Sowden <jeremy@xxxxxxxxxx>
---
acinclude.m4 | 13 -------------
configure.ac | 4 ----
2 files changed, 17 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 8388c452aade..16434f4fdf0d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -25,9 +25,6 @@ AC_ARG_WITH(pgsql-lib,
[pg_lib=$withval], [pg_lib=])
-AC_SUBST(PQINCPATH)
-AC_SUBST(PQLIBPATH)
-AC_SUBST(PQLIBS)
PQLIBS=-lpq
if test "$pg_prefix" != "no"; then
@@ -120,9 +117,6 @@ AC_ARG_WITH(mysql-lib,
[my_lib=$withval], [my_lib=])
-AC_SUBST(MYSQL_INC)
-AC_SUBST(MYSQL_LIB)
-
if test "$my_prefix" != "no"; then
AC_MSG_CHECKING([for MySQL mysql_config program])
@@ -212,10 +206,6 @@ AC_ARG_WITH(pcap-lib,
[pcap_lib=$withval], [pcap_lib=/usr/lib])
-AC_SUBST(PCAP_INC)
-AC_SUBST(PCAP_LIB)
-AC_SUBST(HAVE_PCAP_LIB)
-
if test "$pcap_prefix" != "no"; then
if test "$pcap_prefix" != ""; then
@@ -291,9 +281,6 @@ AC_ARG_WITH(dbi-lib,
[dbi_lib=$withval], [dbi_lib=/usr/lib])
-AC_SUBST(DBI_INC)
-AC_SUBST(DBI_LIB)
-
if test "$dbi_prefix" != "no"; then
if test "$dbi_prefix" != ""; then
diff --git a/configure.ac b/configure.ac
index 268cd10de2da..154650000fb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,6 @@ LT_INIT([disable-static])
dnl Checks for libraries.
AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
-AC_SUBST([libdl_LIBS])
dnl Checks for header files.
AC_HEADER_DIRENT
@@ -35,7 +34,6 @@ AC_FUNC_VPRINTF
AC_CHECK_FUNCS(socket strerror)
AC_SEARCH_LIBS([pthread_create], [pthread], [libpthread_LIBS="$LIBS"; LIBS=""])
-AC_SUBST([libpthread_LIBS])
AC_ARG_ENABLE(ulog,
AS_HELP_STRING([--enable-ulog], [Enable ulog module [default=yes]]),[enable_ulog=$enableval],[enable_ulog=yes])
@@ -128,7 +126,6 @@ fi
AC_ARG_WITH([pcap], AS_HELP_STRING([--without-pcap], [Build without PCAP output plugin [default=test]]))
AS_IF([test "x$with_pcap" != "xno"], [
AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
- AC_SUBST([libpcap_LIBS])
])
AM_CONDITIONAL([HAVE_PCAP], [test -n "$libpcap_LIBS"])
if test "x$libpcap_LIBS" != "x"; then
@@ -153,7 +150,6 @@ AC_ARG_WITH([ulogd2libdir],
[Default directory to load ulogd2 plugin from [[LIBDIR/ulogd]]]),
[ulogd2libdir="$withval"],
[ulogd2libdir="${libdir}/ulogd"])
-AC_SUBST([ulogd2libdir])
AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
include/linux/Makefile include/linux/netfilter/Makefile \
--
2.33.0
