configure: shuffle AC_SUBST(), remove unused ones.

Remove V_LEX and V_YACC, as they're no longer used.

Move some AC_SUBST() calls closer to the point at which they're set.
Move others to the end.

2 files changed, 82 insertions, 88 deletions

diff --git a/configure b/configure
index d5ca8ed6..b4bee8f6 100755
--- a/configure
+++ b/configure
@@ -620,6 +620,25 @@ ac_includes_default="\
 #endif"
 
 ac_subst_vars='LTLIBOBJS
+EXTRA_NETWORK_LIBS
+RPCAPD_LIBS
+INSTALL_RPCAPD
+BUILD_RPCAPD
+PTHREAD_LIBS
+REMOTE_C_SRC
+MODULE_C_SRC
+PLATFORM_CXX_SRC
+PLATFORM_C_SRC
+ADDLARCHIVEOBJS
+ADDLOBJS
+V_RPATH_OPT
+V_SONAME_OPT
+V_SHLIB_OPT
+V_SHLIB_CMD
+V_SHLIB_CCOPT
+V_INCLS
+V_DEFS
+V_CCOPT
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
@@ -636,41 +655,20 @@ DPDK_CFLAGS
 PCAP_SUPPORT_NETMAP
 PCAP_SUPPORT_NETFILTER
 PCAP_SUPPORT_LINUX_USBMON
-EXTRA_NETWORK_LIBS
-RPCAPD_LIBS
-INSTALL_RPCAPD
-BUILD_RPCAPD
-PTHREAD_LIBS
+MKDEP
+DEPENDENCY_CFLAG
+LN_S
+AR
+RANLIB
 MAN_ADMIN_COMMANDS
 MAN_MISC_INFO
 MAN_FILE_FORMATS
 MAN_DEVICES
 DYEXT
-REMOTE_C_SRC
-MODULE_C_SRC
-PLATFORM_CXX_SRC
-PLATFORM_C_SRC
-ADDLARCHIVEOBJS
-ADDLOBJS
-V_YACC
-V_RPATH_OPT
-V_SONAME_OPT
-V_SHLIB_OPT
-V_SHLIB_CMD
-V_SHLIB_CCOPT
-V_LEX
-V_INCLS
-V_DEFS
 V_PROG_LDFLAGS_FAT
 V_PROG_CCOPT_FAT
 V_LIB_LDFLAGS_FAT
 V_LIB_CCOPT_FAT
-V_CCOPT
-MKDEP
-DEPENDENCY_CFLAG
-LN_S
-AR
-RANLIB
 REENTRANT_PARSER
 BISON_BYACC
 LEXLIB
@@ -9647,6 +9645,15 @@ $as_echo "#define HAVE_SOLARIS 1" >>confdefs.h
 	;;
 esac
 
+
+
+
+
+
+
+
+
+
 # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared;
@@ -11629,37 +11636,6 @@ _ACEOF
 fi
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 #
 # Various Linux-specific mechanisms.
 #
@@ -12893,6 +12869,26 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 ac_config_headers="$ac_config_headers config.h"
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ac_config_commands="$ac_config_commands default-1"
 
 ac_config_files="$ac_config_files Makefile grammar.y pcap-filter.manmisc pcap-linktype.manmisc pcap-tstamp.manmisc pcap-savefile.manfile pcap.3pcap pcap_compile.3pcap pcap_datalink.3pcap pcap_dump_open.3pcap pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap pcap_open_offline.3pcap pcap_set_immediate_mode.3pcap pcap_set_tstamp_precision.3pcap pcap_set_tstamp_type.3pcap rpcapd/Makefile rpcapd/rpcapd.manadmin rpcapd/rpcapd-config.manfile testprogs/Makefile"
diff --git a/configure.ac b/configure.ac
index d8483ab4..4ab397f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2276,6 +2276,15 @@ solaris*)
 	esac
 	;;
 esac
+AC_SUBST(V_LIB_CCOPT_FAT)
+AC_SUBST(V_LIB_LDFLAGS_FAT)
+AC_SUBST(V_PROG_CCOPT_FAT)
+AC_SUBST(V_PROG_LDFLAGS_FAT)
+AC_SUBST(DYEXT)
+AC_SUBST(MAN_DEVICES)
+AC_SUBST(MAN_FILE_FORMATS)
+AC_SUBST(MAN_MISC_INFO)
+AC_SUBST(MAN_ADMIN_COMMANDS)
 
 AC_ARG_ENABLE(shared,
 AS_HELP_STRING([--enable-shared],[build shared libraries @<:@default=yes, if support available@:>@]))
@@ -2325,37 +2334,6 @@ AC_CHECK_MEMBERS([dl_hp_ppa_info_t.dl_module_id_1],,,
 	#include <sys/dlpi_ext.h>
     ])
 
-AC_SUBST(V_CCOPT)
-AC_SUBST(V_LIB_CCOPT_FAT)
-AC_SUBST(V_LIB_LDFLAGS_FAT)
-AC_SUBST(V_PROG_CCOPT_FAT)
-AC_SUBST(V_PROG_LDFLAGS_FAT)
-AC_SUBST(V_DEFS)
-AC_SUBST(V_INCLS)
-AC_SUBST(V_LEX)
-AC_SUBST(V_SHLIB_CCOPT)
-AC_SUBST(V_SHLIB_CMD)
-AC_SUBST(V_SHLIB_OPT)
-AC_SUBST(V_SONAME_OPT)
-AC_SUBST(V_RPATH_OPT)
-AC_SUBST(V_YACC)
-AC_SUBST(ADDLOBJS)
-AC_SUBST(ADDLARCHIVEOBJS)
-AC_SUBST(PLATFORM_C_SRC)
-AC_SUBST(PLATFORM_CXX_SRC)
-AC_SUBST(MODULE_C_SRC)
-AC_SUBST(REMOTE_C_SRC)
-AC_SUBST(DYEXT)
-AC_SUBST(MAN_DEVICES)
-AC_SUBST(MAN_FILE_FORMATS)
-AC_SUBST(MAN_MISC_INFO)
-AC_SUBST(MAN_ADMIN_COMMANDS)
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(BUILD_RPCAPD)
-AC_SUBST(INSTALL_RPCAPD)
-AC_SUBST(RPCAPD_LIBS)
-AC_SUBST(EXTRA_NETWORK_LIBS)
-
 #
 # Various Linux-specific mechanisms.
 #
@@ -2936,6 +2914,26 @@ AC_PROG_INSTALL
 
 AC_CONFIG_HEADER(config.h)
 
+AC_SUBST(V_CCOPT)
+AC_SUBST(V_DEFS)
+AC_SUBST(V_INCLS)
+AC_SUBST(V_SHLIB_CCOPT)
+AC_SUBST(V_SHLIB_CMD)
+AC_SUBST(V_SHLIB_OPT)
+AC_SUBST(V_SONAME_OPT)
+AC_SUBST(V_RPATH_OPT)
+AC_SUBST(ADDLOBJS)
+AC_SUBST(ADDLARCHIVEOBJS)
+AC_SUBST(PLATFORM_C_SRC)
+AC_SUBST(PLATFORM_CXX_SRC)
+AC_SUBST(MODULE_C_SRC)
+AC_SUBST(REMOTE_C_SRC)
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(BUILD_RPCAPD)
+AC_SUBST(INSTALL_RPCAPD)
+AC_SUBST(RPCAPD_LIBS)
+AC_SUBST(EXTRA_NETWORK_LIBS)
+
 AC_OUTPUT_COMMANDS([if test -f .devel; then
 	echo timestamp > stamp-h
 	cat $srcdir/Makefile-devel-adds >> Makefile