]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Merge pull request #1129 in SNORT/snort3 from goodbye_autotools to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 9 Mar 2018 15:50:59 +0000 (10:50 -0500)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 9 Mar 2018 15:50:59 +0000 (10:50 -0500)
Squashed commit of the following:

commit 82659ae2d7864dda3cb124ad16f3fbc6e23fb069
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Mar 8 20:34:20 2018 -0500

    build: Fix few const-related compiler warnings

commit 9e6059c85793c13d4127cf1a9a2d26c0cecabd5d
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Mar 8 18:18:53 2018 -0500

    build: Extirpate autotools usage

commit a5d3096b0ffa828a749ca55ca6245357e71fc923
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Mar 8 17:25:43 2018 -0500

    doc: Fix including config_changes.txt when ruby is not present

181 files changed:
.gitignore
Makefile.am [deleted file]
README.md
build-aux/config.rpath [deleted file]
cmake/packaging_data.cmake
configure.ac [deleted file]
daqs/Makefile.am [deleted file]
doc/CMakeLists.txt
doc/Makefile.am [deleted file]
doc/tutorial.txt
extra/CMakeLists.txt
extra/Makefile.am [deleted file]
extra/README
extra/configure.ac [deleted file]
extra/generate_boilerplate.sh
extra/m4/ax_cxx_compile_stdcxx.m4 [deleted file]
extra/m4/ax_cxx_compile_stdcxx_11.m4 [deleted file]
extra/m4/visibility.m4 [deleted file]
extra/src/Makefile.am [deleted file]
extra/src/codecs/Makefile.am [deleted file]
extra/src/codecs/cd_eapol/Makefile.am [deleted file]
extra/src/codecs/cd_linux_sll/Makefile.am [deleted file]
extra/src/codecs/cd_null/Makefile.am [deleted file]
extra/src/codecs/cd_pbb/Makefile.am [deleted file]
extra/src/codecs/cd_pflog/Makefile.am [deleted file]
extra/src/codecs/cd_ppp/Makefile.am [deleted file]
extra/src/codecs/cd_raw4/Makefile.am [deleted file]
extra/src/codecs/cd_raw6/Makefile.am [deleted file]
extra/src/codecs/cd_slip/Makefile.am [deleted file]
extra/src/codecs/cd_token_ring/Makefile.am [deleted file]
extra/src/codecs/cd_wlan/Makefile.am [deleted file]
extra/src/daqs/Makefile.am [deleted file]
extra/src/daqs/daq_regtest/Makefile.am [deleted file]
extra/src/daqs/daq_socket/Makefile.am [deleted file]
extra/src/inspectors/Makefile.am [deleted file]
extra/src/inspectors/data_log/Makefile.am [deleted file]
extra/src/inspectors/dpx/Makefile.am [deleted file]
extra/src/inspectors/reg_test/Makefile.am [deleted file]
extra/src/ips_options/Makefile.am [deleted file]
extra/src/ips_options/find/Makefile.am [deleted file]
extra/src/ips_options/find/find.lua
extra/src/ips_options/ips_mss/Makefile.am [deleted file]
extra/src/ips_options/ips_pkt_num/Makefile.am [deleted file]
extra/src/ips_options/ips_urg/Makefile.am [deleted file]
extra/src/ips_options/ips_wscale/Makefile.am [deleted file]
extra/src/loggers/Makefile.am [deleted file]
extra/src/loggers/alert_ex/Makefile.am [deleted file]
extra/src/loggers/alert_json/Makefile.am [deleted file]
extra/src/loggers/alert_lua/Makefile.am [deleted file]
extra/src/loggers/alert_lua/alert.lua
extra/src/loggers/alert_unixsock/Makefile.am [deleted file]
extra/src/loggers/log_null/Makefile.am [deleted file]
extra/src/search_engines/Makefile.am [deleted file]
extra/src/search_engines/lowmem/Makefile.am [deleted file]
extra/src/so_rules/Makefile.am [deleted file]
extra/src/so_rules/sid_18758/Makefile.am [deleted file]
extra/templates/Makefile.am.erb [deleted file]
lua/Makefile.am [deleted file]
m4/ax_check_compile_flag.m4 [deleted file]
m4/ax_check_link_flag.m4 [deleted file]
m4/ax_check_preproc_flag.m4 [deleted file]
m4/ax_code_coverage.m4 [deleted file]
m4/ax_cxx_compile_stdcxx.m4 [deleted file]
m4/ax_cxx_compile_stdcxx_11.m4 [deleted file]
m4/iconv.m4 [deleted file]
m4/lib-ld.m4 [deleted file]
m4/lib-link.m4 [deleted file]
m4/lib-prefix.m4 [deleted file]
m4/visibility.m4 [deleted file]
src/Makefile.am [deleted file]
src/actions/Makefile.am [deleted file]
src/catch/Makefile.am [deleted file]
src/codecs/Makefile.am [deleted file]
src/codecs/ip/Makefile.am [deleted file]
src/codecs/link/Makefile.am [deleted file]
src/codecs/misc/Makefile.am [deleted file]
src/codecs/root/Makefile.am [deleted file]
src/connectors/Makefile.am [deleted file]
src/connectors/file_connector/Makefile.am [deleted file]
src/connectors/file_connector/test/Makefile.am [deleted file]
src/connectors/tcp_connector/Makefile.am [deleted file]
src/connectors/tcp_connector/test/Makefile.am [deleted file]
src/control/Makefile.am [deleted file]
src/decompress/Makefile.am [deleted file]
src/detection/Makefile.am [deleted file]
src/events/Makefile.am [deleted file]
src/file_api/Makefile.am [deleted file]
src/filters/Makefile.am [deleted file]
src/flow/Makefile.am [deleted file]
src/flow/test/Makefile.am [deleted file]
src/framework/Makefile.am [deleted file]
src/hash/Makefile.am [deleted file]
src/hash/test/Makefile.am [deleted file]
src/helpers/Makefile.am [deleted file]
src/host_tracker/Makefile.am [deleted file]
src/host_tracker/test/Makefile.am [deleted file]
src/ips_options/Makefile.am [deleted file]
src/ips_options/test/Makefile.am [deleted file]
src/latency/Makefile.am [deleted file]
src/log/Makefile.am [deleted file]
src/log/test/Makefile.am [deleted file]
src/loggers/Makefile.am [deleted file]
src/lua/Makefile.am [deleted file]
src/main/Makefile.am [deleted file]
src/managers/Makefile.am [deleted file]
src/memory/Makefile.am [deleted file]
src/mime/Makefile.am [deleted file]
src/network_inspectors/Makefile.am [deleted file]
src/network_inspectors/appid/Makefile.am [deleted file]
src/network_inspectors/appid/appid_http_session.cc
src/network_inspectors/appid/detector_plugins/test/Makefile.am [deleted file]
src/network_inspectors/appid/service_plugins/test/Makefile.am [deleted file]
src/network_inspectors/appid/test/Makefile.am [deleted file]
src/network_inspectors/appid/thirdparty_appid_utils.cc
src/network_inspectors/arp_spoof/Makefile.am [deleted file]
src/network_inspectors/binder/Makefile.am [deleted file]
src/network_inspectors/normalize/Makefile.am [deleted file]
src/network_inspectors/packet_capture/Makefile.am [deleted file]
src/network_inspectors/perf_monitor/Makefile.am [deleted file]
src/network_inspectors/port_scan/Makefile.am [deleted file]
src/network_inspectors/reputation/Makefile.am [deleted file]
src/packet_io/Makefile.am [deleted file]
src/parser/Makefile.am [deleted file]
src/piglet/Makefile.am [deleted file]
src/piglet_plugins/Makefile.am [deleted file]
src/ports/Makefile.am [deleted file]
src/profiler/Makefile.am [deleted file]
src/protocols/Makefile.am [deleted file]
src/pub_sub/Makefile.am [deleted file]
src/search_engines/Makefile.am [deleted file]
src/search_engines/test/Makefile.am [deleted file]
src/service_inspectors/Makefile.am [deleted file]
src/service_inspectors/back_orifice/Makefile.am [deleted file]
src/service_inspectors/dce_rpc/Makefile.am [deleted file]
src/service_inspectors/dnp3/Makefile.am [deleted file]
src/service_inspectors/dns/Makefile.am [deleted file]
src/service_inspectors/ftp_telnet/Makefile.am [deleted file]
src/service_inspectors/gtp/Makefile.am [deleted file]
src/service_inspectors/http2_inspect/Makefile.am [deleted file]
src/service_inspectors/http_inspect/Makefile.am [deleted file]
src/service_inspectors/http_inspect/test/Makefile.am [deleted file]
src/service_inspectors/imap/Makefile.am [deleted file]
src/service_inspectors/modbus/Makefile.am [deleted file]
src/service_inspectors/pop/Makefile.am [deleted file]
src/service_inspectors/rpc_decode/Makefile.am [deleted file]
src/service_inspectors/sip/Makefile.am [deleted file]
src/service_inspectors/smtp/Makefile.am [deleted file]
src/service_inspectors/ssh/Makefile.am [deleted file]
src/service_inspectors/ssl/Makefile.am [deleted file]
src/service_inspectors/wizard/Makefile.am [deleted file]
src/sfip/Makefile.am [deleted file]
src/sfrt/Makefile.am [deleted file]
src/side_channel/Makefile.am [deleted file]
src/side_channel/test/Makefile.am [deleted file]
src/stream/Makefile.am [deleted file]
src/stream/base/Makefile.am [deleted file]
src/stream/file/Makefile.am [deleted file]
src/stream/icmp/Makefile.am [deleted file]
src/stream/ip/Makefile.am [deleted file]
src/stream/libtcp/Makefile.am [deleted file]
src/stream/tcp/Makefile.am [deleted file]
src/stream/tcp/test/Makefile.am [deleted file]
src/stream/test/Makefile.am [deleted file]
src/stream/udp/Makefile.am [deleted file]
src/stream/user/Makefile.am [deleted file]
src/target_based/Makefile.am [deleted file]
src/time/Makefile.am [deleted file]
src/utils/Makefile.am [deleted file]
tools/Makefile.am [deleted file]
tools/flatbuffers/Makefile.am [deleted file]
tools/snort2lua/Makefile.am [deleted file]
tools/snort2lua/config_states/Makefile.am [deleted file]
tools/snort2lua/data/Makefile.am [deleted file]
tools/snort2lua/data/data_types/Makefile.am [deleted file]
tools/snort2lua/helpers/Makefile.am [deleted file]
tools/snort2lua/keyword_states/Makefile.am [deleted file]
tools/snort2lua/output_states/Makefile.am [deleted file]
tools/snort2lua/preprocessor_states/Makefile.am [deleted file]
tools/snort2lua/rule_states/Makefile.am [deleted file]
tools/u2boat/Makefile.am [deleted file]
tools/u2spewfoo/Makefile.am [deleted file]

index b46ba4eccf93cb290038196a4d27289c4eabc8b2..753712449d37ddaaab283297aa47748488fe26ce 100644 (file)
@@ -1,8 +1,3 @@
-*.[oa]
-*.deps/
-*.la
-*.libs/
-*.lo
 *.log
 *.out
 *.rej
 *.gcda
 *.gcov
 *.trs
-*_test
-*.Po
 *~
 ._Xcode*
-*.dirstamp
 Cbuild/
-Makefile
-Makefile.in
 Xcode*/
-aclocal.m4
-autom4te.cache/
-automake*
-compile
-config.guess
-config.h*
-config.status
-config.sub
-configure
-depcomp
 doc/basic.txt
 doc/builtin.txt
 doc/codec.txt
@@ -60,31 +40,8 @@ doc/snort_manual.xml
 doc/version.txt
 extra/rule.xxd
 extra/snort_examples-1.0.tar.gz
-install-sh
-libtool
-ltmain.sh
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-missing
-snort
 snort.pc
 src/framework/api_options.h
-src/framework/stamp-h2
-src/managers/snort_plugin.lua
-src/snort
-src/tags
-src/test/suite_decl.h
-src/test/suite_list.h
-stamp-h1
-test-driver
-tools/flatbuffers/fbstreamer
-tools/snort2lua/snort2lua
-tools/snort2lua/tags
-tools/u2boat/u2boat
-tools/u2spewfoo/u2spewfoo
 GTAGS
 GRTAGS
 GPATH
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644 (file)
index a7cec04..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = \
-src \
-lua \
-tools \
-doc \
-daqs
-
-EXTRA_DIST = \
-snort.pc.in \
-README.md \
-COPYING \
-LICENSE
-
-DISTCLEANFILES = \
-stamp-h.in \
-cflags.out \
-cppflags.out
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = snort.pc
-
-# Code coverage
-@CODE_COVERAGE_RULES@
index ce799cc4ea71bed2e59f82ebb9e452aac732cb3f..03b268b16589d0b4039b787588b3e3b6e46a31d5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -102,32 +102,24 @@ Follow these steps:
     cd snort-3.0.0*
     ```
     
-1.  Setup install path:
+2.  Setup install path:
 
     ```shell
     export my_path=/path/to/snorty
     ```
 
-1.  Compile and install:
+3.  Compile and install:
 
-  * To build with autotools, simply do the usual from the top level directory:
-
-    ```shell 
-    ./configure --prefix=$my_path
-    make -j 8 install
-    ```
-    
   * To build with cmake and make, run configure_cmake.sh.  It will automatically create and populate a new subdirectory named 'build'.
 
     ```shell
     ./configure_cmake.sh --prefix=$my_path
     cd build
-    make -j 8 install
+    make -j $(nproc) install
     ```
 
 **_Note_**:
 
-  * If you are using autotools with a github clone, first do autoreconf -isvf.
   * If you can do src/snort -V you built successfully.
   * If you are familiar with cmake, you can run cmake/ccmake instead of configure_cmake.sh.
   * cmake --help will list any available generators, such as Xcode.  Feel free to use one, however help with those will be provided separately.
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
deleted file mode 100755 (executable)
index af3c415..0000000
+++ /dev/null
@@ -1,684 +0,0 @@
-#! /bin/sh
-# Output a system dependent set of variables, describing how to set the
-# run time search path of shared libraries in an executable.
-#
-#   Copyright 1996-2017 Free Software Foundation, Inc.
-#   Taken from GNU libtool, 2001
-#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-#   This file is free software; the Free Software Foundation gives
-#   unlimited permission to copy and/or distribute it, with or without
-#   modifications, as long as this notice is preserved.
-#
-# The first argument passed to this file is the canonical host specification,
-#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
-# should be set by the caller.
-#
-# The set of defined variables is at the end of this script.
-
-# Known limitations:
-# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
-#   than 256 bytes, otherwise the compiler driver will dump core. The only
-#   known workaround is to choose shorter directory names for the build
-#   directory and/or the installation directory.
-
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-shrext=.so
-
-host="$1"
-host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-# Code taken from libtool.m4's _LT_CC_BASENAME.
-
-for cc_temp in $CC""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
-
-# Code taken from libtool.m4's _LT_COMPILER_PIC.
-
-wl=
-if test "$GCC" = yes; then
-  wl='-Wl,'
-else
-  case "$host_os" in
-    aix*)
-      wl='-Wl,'
-      ;;
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      ;;
-    hpux9* | hpux10* | hpux11*)
-      wl='-Wl,'
-      ;;
-    irix5* | irix6* | nonstopux*)
-      wl='-Wl,'
-      ;;
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-        ecc*)
-          wl='-Wl,'
-          ;;
-        icc* | ifort*)
-          wl='-Wl,'
-          ;;
-        lf95*)
-          wl='-Wl,'
-          ;;
-        nagfor*)
-          wl='-Wl,-Wl,,'
-          ;;
-        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-          wl='-Wl,'
-          ;;
-        ccc*)
-          wl='-Wl,'
-          ;;
-        xl* | bgxl* | bgf* | mpixl*)
-          wl='-Wl,'
-          ;;
-        como)
-          wl='-lopt='
-          ;;
-        *)
-          case `$CC -V 2>&1 | sed 5q` in
-            *Sun\ F* | *Sun*Fortran*)
-              wl=
-              ;;
-            *Sun\ C*)
-              wl='-Wl,'
-              ;;
-          esac
-          ;;
-      esac
-      ;;
-    newsos6)
-      ;;
-    *nto* | *qnx*)
-      ;;
-    osf3* | osf4* | osf5*)
-      wl='-Wl,'
-      ;;
-    rdos*)
-      ;;
-    solaris*)
-      case $cc_basename in
-        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-          wl='-Qoption ld '
-          ;;
-        *)
-          wl='-Wl,'
-          ;;
-      esac
-      ;;
-    sunos4*)
-      wl='-Qoption ld '
-      ;;
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      wl='-Wl,'
-      ;;
-    sysv4*MP*)
-      ;;
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      wl='-Wl,'
-      ;;
-    unicos*)
-      wl='-Wl,'
-      ;;
-    uts4*)
-      ;;
-  esac
-fi
-
-# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
-
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-
-case "$host_os" in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  # Set some defaults for GNU ld with shared library support. These
-  # are reset later if shared libraries are not supported. Putting them
-  # here allows them to be overridden if necessary.
-  # Unlike libtool, we use -rpath here, not --rpath, since the documented
-  # option of GNU ld is called -rpath, not --rpath.
-  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-  case "$host_os" in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-        ld_shlibs=no
-      fi
-      ;;
-    amigaos*)
-      case "$host_cpu" in
-        powerpc)
-          ;;
-        m68k)
-          hardcode_libdir_flag_spec='-L$libdir'
-          hardcode_minus_L=yes
-          ;;
-      esac
-      ;;
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    cygwin* | mingw* | pw32* | cegcc*)
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    haiku*)
-      ;;
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      ;;
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    netbsd*)
-      ;;
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-        ld_shlibs=no
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-          ld_shlibs=no
-          ;;
-        *)
-          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-          else
-            ld_shlibs=no
-          fi
-          ;;
-      esac
-      ;;
-    sunos4*)
-      hardcode_direct=yes
-      ;;
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-  esac
-  if test "$ld_shlibs" = no; then
-    hardcode_libdir_flag_spec=
-  fi
-else
-  case "$host_os" in
-    aix3*)
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes; then
-        # Neither direct hardcoding nor static linking is supported with a
-        # broken collect2.
-        hardcode_direct=unsupported
-      fi
-      ;;
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-        # On IA64, the linker does run time linking by default, so we don't
-        # have to do anything special.
-        aix_use_runtimelinking=no
-      else
-        aix_use_runtimelinking=no
-        # Test if we are trying to use run time linking or normal
-        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-        # need to do runtime linking.
-        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-          for ld_flag in $LDFLAGS; do
-            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-              aix_use_runtimelinking=yes
-              break
-            fi
-          done
-          ;;
-        esac
-      fi
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      if test "$GCC" = yes; then
-        case $host_os in aix4.[012]|aix4.[012].*)
-          collect2name=`${CC} -print-prog-name=collect2`
-          if test -f "$collect2name" && \
-            strings "$collect2name" | grep resolve_lib_name >/dev/null
-          then
-            # We have reworked collect2
-            :
-          else
-            # We have old collect2
-            hardcode_direct=unsupported
-            hardcode_minus_L=yes
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_libdir_separator=
-          fi
-          ;;
-        esac
-      fi
-      # Begin _LT_AC_SYS_LIBPATH_AIX.
-      echo 'int main () { return 0; }' > conftest.c
-      ${CC} ${LDFLAGS} conftest.c -o conftest
-      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-      if test -z "$aix_libpath"; then
-        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-      fi
-      if test -z "$aix_libpath"; then
-        aix_libpath="/usr/lib:/lib"
-      fi
-      rm -f conftest.c conftest
-      # End _LT_AC_SYS_LIBPATH_AIX.
-      if test "$aix_use_runtimelinking" = yes; then
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-      else
-        if test "$host_cpu" = ia64; then
-          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-        else
-          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        fi
-      fi
-      ;;
-    amigaos*)
-      case "$host_cpu" in
-        powerpc)
-          ;;
-        m68k)
-          hardcode_libdir_flag_spec='-L$libdir'
-          hardcode_minus_L=yes
-          ;;
-      esac
-      ;;
-    bsdi[45]*)
-      ;;
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      libext=lib
-      ;;
-    darwin* | rhapsody*)
-      hardcode_direct=no
-      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    dgux*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    freebsd2.[01]*)
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      ;;
-    freebsd* | dragonfly*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    hpux9*)
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      ;;
-    hpux10*)
-      if test "$with_gnu_ld" = no; then
-        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator=:
-        hardcode_direct=yes
-        # hardcode_minus_L: Not really in the search PATH,
-        # but as the default location of the library.
-        hardcode_minus_L=yes
-      fi
-      ;;
-    hpux11*)
-      if test "$with_gnu_ld" = no; then
-        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator=:
-        case $host_cpu in
-          hppa*64*|ia64*)
-            hardcode_direct=no
-            ;;
-          *)
-            hardcode_direct=yes
-            # hardcode_minus_L: Not really in the search PATH,
-            # but as the default location of the library.
-            hardcode_minus_L=yes
-            ;;
-        esac
-      fi
-      ;;
-    irix5* | irix6* | nonstopux*)
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    netbsd*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    newsos6)
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    *nto* | *qnx*)
-      ;;
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-        hardcode_direct=yes
-        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-        else
-          case "$host_os" in
-            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-              hardcode_libdir_flag_spec='-R$libdir'
-              ;;
-            *)
-              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-              ;;
-          esac
-        fi
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      ;;
-    osf3*)
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    osf4* | osf5*)
-      if test "$GCC" = yes; then
-        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-        # Both cc and cxx compiler support -rpath directly
-        hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
-    solaris*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      ;;
-    sunos4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      ;;
-    sysv4)
-      case $host_vendor in
-        sni)
-          hardcode_direct=yes # is this really true???
-          ;;
-        siemens)
-          hardcode_direct=no
-          ;;
-        motorola)
-          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-          ;;
-      esac
-      ;;
-    sysv4.3*)
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-        ld_shlibs=yes
-      fi
-      ;;
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      ;;
-    sysv5* | sco3.2v5* | sco5v6*)
-      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator=':'
-      ;;
-    uts4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    *)
-      ld_shlibs=no
-      ;;
-  esac
-fi
-
-# Check dynamic linker characteristics
-# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
-# Unlike libtool.m4, here we don't care about _all_ names of the library, but
-# only about the one the linker finds when passed -lNAME. This is the last
-# element of library_names_spec in libtool.m4, or possibly two of them if the
-# linker has special search rules.
-library_names_spec=      # the last element of library_names_spec in libtool.m4
-libname_spec='lib$name'
-case "$host_os" in
-  aix3*)
-    library_names_spec='$libname.a'
-    ;;
-  aix[4-9]*)
-    library_names_spec='$libname$shrext'
-    ;;
-  amigaos*)
-    case "$host_cpu" in
-      powerpc*)
-        library_names_spec='$libname$shrext' ;;
-      m68k)
-        library_names_spec='$libname.a' ;;
-    esac
-    ;;
-  beos*)
-    library_names_spec='$libname$shrext'
-    ;;
-  bsdi[45]*)
-    library_names_spec='$libname$shrext'
-    ;;
-  cygwin* | mingw* | pw32* | cegcc*)
-    shrext=.dll
-    library_names_spec='$libname.dll.a $libname.lib'
-    ;;
-  darwin* | rhapsody*)
-    shrext=.dylib
-    library_names_spec='$libname$shrext'
-    ;;
-  dgux*)
-    library_names_spec='$libname$shrext'
-    ;;
-  freebsd[23].*)
-    library_names_spec='$libname$shrext$versuffix'
-    ;;
-  freebsd* | dragonfly*)
-    library_names_spec='$libname$shrext'
-    ;;
-  gnu*)
-    library_names_spec='$libname$shrext'
-    ;;
-  haiku*)
-    library_names_spec='$libname$shrext'
-    ;;
-  hpux9* | hpux10* | hpux11*)
-    case $host_cpu in
-      ia64*)
-        shrext=.so
-        ;;
-      hppa*64*)
-        shrext=.sl
-        ;;
-      *)
-        shrext=.sl
-        ;;
-    esac
-    library_names_spec='$libname$shrext'
-    ;;
-  interix[3-9]*)
-    library_names_spec='$libname$shrext'
-    ;;
-  irix5* | irix6* | nonstopux*)
-    library_names_spec='$libname$shrext'
-    case "$host_os" in
-      irix5* | nonstopux*)
-        libsuff= shlibsuff=
-        ;;
-      *)
-        case $LD in
-          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
-          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
-          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
-          *) libsuff= shlibsuff= ;;
-        esac
-        ;;
-    esac
-    ;;
-  linux*oldld* | linux*aout* | linux*coff*)
-    ;;
-  linux* | k*bsd*-gnu | kopensolaris*-gnu)
-    library_names_spec='$libname$shrext'
-    ;;
-  knetbsd*-gnu)
-    library_names_spec='$libname$shrext'
-    ;;
-  netbsd*)
-    library_names_spec='$libname$shrext'
-    ;;
-  newsos6)
-    library_names_spec='$libname$shrext'
-    ;;
-  *nto* | *qnx*)
-    library_names_spec='$libname$shrext'
-    ;;
-  openbsd*)
-    library_names_spec='$libname$shrext$versuffix'
-    ;;
-  os2*)
-    libname_spec='$name'
-    shrext=.dll
-    library_names_spec='$libname.a'
-    ;;
-  osf3* | osf4* | osf5*)
-    library_names_spec='$libname$shrext'
-    ;;
-  rdos*)
-    ;;
-  solaris*)
-    library_names_spec='$libname$shrext'
-    ;;
-  sunos4*)
-    library_names_spec='$libname$shrext$versuffix'
-    ;;
-  sysv4 | sysv4.3*)
-    library_names_spec='$libname$shrext'
-    ;;
-  sysv4*MP*)
-    library_names_spec='$libname$shrext'
-    ;;
-  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-    library_names_spec='$libname$shrext'
-    ;;
-  tpf*)
-    library_names_spec='$libname$shrext'
-    ;;
-  uts4*)
-    library_names_spec='$libname$shrext'
-    ;;
-esac
-
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
-shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
-escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-
-LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
-
-# How to pass a linker flag through the compiler.
-wl="$escaped_wl"
-
-# Static library suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally "so").
-shlibext="$shlibext"
-
-# Format of library name prefix.
-libname_spec="$escaped_libname_spec"
-
-# Library names that the linker finds when passed -lNAME.
-library_names_spec="$escaped_library_names_spec"
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator="$hardcode_libdir_separator"
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct="$hardcode_direct"
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L="$hardcode_minus_L"
-
-EOF
index dcfe1a1704d4c8ac87cba8b78e88aefd2e3960a6..93d5a813e8ac982a42cdb16818a54b0933746f85 100644 (file)
@@ -1,6 +1,4 @@
 
-set (AUTOTOOL_FILES "autom4te.cache;m4;configure.ac;Makefile.am")
-
 set (CPACK_GENERATOR TGZ)
 set (CPACK_PACKAGE_NAME "snort")
 set (CPACK_PACKAGE_VENDOR "Cisco")
@@ -12,7 +10,7 @@ set (CPACK_PACKAGE_INSTALL_DIRECTORY "snort")
 set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set (CPACK_SOURCE_IGNORE_FILES "tools/snort2lua/tests/;\\\\.git/;\\\\.gitignore;extra/;${AUTOTOOL_FILES}")
+set (CPACK_SOURCE_IGNORE_FILES "tools/snort2lua/tests/;\\\\.git/;\\\\.gitignore;extra/;${CMAKE_BINARY_DIR}/*")
 set (CPACK_SOURCE_GENERATOR TGZ)
 
 include(CPack)
diff --git a/configure.ac b/configure.ac
deleted file mode 100644 (file)
index 234c2da..0000000
+++ /dev/null
@@ -1,1327 +0,0 @@
-#--------------------------------------------------------------------------
-# this file has the following sections:
-#
-# initialization
-# api options
-# host magic
-# checks for programs
-# visibility foo
-# typedefs, structures, and compiler characteristics
-# basic functions, headers, libs
-# vars
-# enables
-# unit tests
-# required libs (daq / sfbpf, dnet, hwloc, luajit, openssl / crypto, pcap, pcre, zlib)
-# optional libs (hyperscan, iconv, lzma, safec, uuid)
-# outputs
-#
-# if you add an AC_DEFINE() for a symbol that appears in an exported
-# header, you must also add that symbol to CPPFLAGS.  This ensures that
-# external modules like those in examples can use pkg-config to get the
-# same symbols Snort did.
-#--------------------------------------------------------------------------
-# initialization
-#--------------------------------------------------------------------------
-
-AC_INIT([snort],[3.0.0],[snort-team@cisco.com])
-AC_PREREQ([2.69])
-
-AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_SRCDIR([src/main.h])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h src/framework/api_options.h])
-
-AM_INIT_AUTOMAKE(foreign nostdinc)
-AM_SILENT_RULES([yes])
-
-AC_PROG_CC([clang gcc])
-AC_PROG_CXX([clang++ g++])
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_C_BIGENDIAN
-AC_C_INLINE
-
-CFLAGS="-std=gnu99 $CFLAGS"
-
-AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
-
-LT_INIT
-
-PKG_PROG_PKG_CONFIG
-
-AX_CODE_COVERAGE
-
-#--------------------------------------------------------------------------
-# api options
-#--------------------------------------------------------------------------
-
-# build options which affect plugin compatibility must be appended to this
-# string to ensure issues are caught when loading:
-
-API_OPTIONS=""
-
-# presently such cases were eliminated.  however, if any arise, add a
-# statement like the following after the associated AC_DEFINE() statement:
-
-# AC_DEFINE(([HAVE_OPTION],[1], [option-name is enabled])
-# API_OPTIONS="$API_OPTIONS option-name"
-
-# API_OPTIONS is #defined in config.h but that file is not exported so it
-# is also #defined in api_options.h.
-
-#--------------------------------------------------------------------------
-# host magic :(
-#--------------------------------------------------------------------------
-
-AC_CANONICAL_HOST
-
-linux="no"
-macos="no"
-
-case "$host" in
-  *-linux*)
-    linux="yes"
-    ;;
-  *-apple*)
-    macos="yes"
-esac
-
-#--------------------------------------------------------------------------
-# Checks for programs.
-#--------------------------------------------------------------------------
-
-AC_CHECK_PROG(have_asciidoc,asciidoc,yes,no)
-
-AM_CONDITIONAL(MAKE_HTML_DOC, [test "x$have_asciidoc" = "xyes"])
-
-AC_CHECK_PROG(have_dblatex,dblatex,yes,no)
-
-AM_CONDITIONAL(MAKE_PDF_DOC, [test "x$have_dblatex" = "xyes" -a "x$have_asciidoc" = "xyes"])
-
-AC_CHECK_PROG(have_w3m,w3m,yes,no)
-
-AM_CONDITIONAL(MAKE_TEXT_DOC, [test "x$have_w3m" = "xyes" -a "x$have_asciidoc" = "xyes"])
-
-#--------------------------------------------------------------------------
-# visibility foo (enable it if we can)
-#--------------------------------------------------------------------------
-
-gl_VISIBILITY()
-CPPFLAGS="$CFLAG_VISIBILITY $CPPFLAGS"
-
-#--------------------------------------------------------------------------
-# thread-local storage foo
-#--------------------------------------------------------------------------
-# FIXIT-L should define a macro for try-compile-link-cache-val idiom
-AC_DEFUN([CXX_EXTERN_GNU_TLS],
-[
-    AC_REQUIRE([AC_PROG_CXX])
-    AC_MSG_CHECKING([for extern GNU __thread support])
-    gl_save_CPPFLAGS="$CPPFLAGS"
-
-    AC_LANG_PUSH(C++)
-    AC_CACHE_VAL(gl_cv_cxx_extern_gnu_tls, [
-        CPPFLAGS="-std=c++11 -fPIC -shared -Wl,-undefined,dynamic_lookup"
-        AC_LINK_IFELSE([AC_LANG_SOURCE([[
-            extern __thread int x;
-            void foo() { ++x; }]])],
-            [gl_cv_cxx_extern_gnu_tls="yes"],
-            [gl_cv_cxx_extern_gnu_tls="no"])
-    ])
-    AC_LANG_POP()
-
-    AC_MSG_RESULT([$gl_cv_cxx_extern_gnu_tls])
-    CPPFLAGS="$gl_save_CPPFLAGS"
-])
-CXX_EXTERN_GNU_TLS()
-
-AC_DEFUN([CXX_THREAD_LOCAL],
-[
-    AC_REQUIRE([AC_PROG_CXX])
-    AC_MSG_CHECKING([for thread_local keyword support])
-    gl_save_CPPFLAGS="$CPPFLAGS"
-
-    AC_LANG_PUSH(C++)
-    AC_CACHE_VAL(gl_cv_cxx_thread_local, [
-        CPPFLAGS="-std=c++11"
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-            thread_local int x;]],
-            [[]])],
-            [gl_cv_cxx_thread_local="yes"],
-            [gl_cv_cxx_thread_local="no"])
-    ])
-    AC_LANG_POP()
-
-    AC_MSG_RESULT([$gl_cv_cxx_thread_local])
-    CPPFLAGS="$gl_save_CPPFLAGS"
-])
-CXX_THREAD_LOCAL()
-
-#if test "x$gl_cv_cxx_extern_gnu_tls" = "xno"; then
-#    if test "x$gl_cv_cxx_thread_local" = "xyes"; then
-#        AC_DEFINE([USE_THREAD_LOCAL],[1],
-#            [Define if thread_local keyword should be used])
-#    else
-#        AC_MSG_ERROR([Compiler does not support thread_local OR extern __thread declarations])
-#    fi
-#fi
-
-#--------------------------------------------------------------------------
-# typedefs, structures, and compiler characteristics
-#--------------------------------------------------------------------------
-
-#AC_CHECK_HEADER_STDBOOL
-AC_TYPE_UID_T
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_INT8_T
-AC_TYPE_MODE_T
-AC_TYPE_PID_T
-AC_C_RESTRICT
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_UINT8_T
-
-AC_CHECK_SIZEOF([char])
-AC_CHECK_SIZEOF([short])
-AC_CHECK_SIZEOF([int])
-AC_CHECK_SIZEOF([long int])
-AC_CHECK_SIZEOF([long long int])
-AC_CHECK_SIZEOF([unsigned int])
-AC_CHECK_SIZEOF([unsigned long int])
-AC_CHECK_SIZEOF([unsigned long long int])
-
-# Check for int types
-AC_CHECK_TYPES([uint8_t,uint16_t,uint32_t,uint64_t])
-AC_CHECK_TYPES([int8_t,int16_t,int32_t,int64_t])
-
-#--------------------------------------------------------------------------
-# basic functions, headers, libs
-#--------------------------------------------------------------------------
-
-AC_FUNC_CHOWN
-AC_FUNC_FORK
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_FUNC_STRERROR_R
-AC_FUNC_STRTOD
-AC_FUNC_ALLOCA
-
-AC_CHECK_FUNCS([endgrent endpwent ftruncate getcwd gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir select socket strcasecmp strchr strdup strerror strncasecmp strrchr strstr strtol strtoul mallinfo malloc_trim])
-
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h wchar.h])
-
-AC_CHECK_LIB(dl, dlsym, DLLIB="yes", DLLIB="no")
-
-#--------------------------------------------------------------------------
-# vars
-#--------------------------------------------------------------------------
-
-AC_ARG_VAR(SIGNAL_SNORT_RELOAD, set the SIGNAL_SNORT_RELOAD value)
-
-if test "x$SIGNAL_SNORT_RELOAD" != "x" ; then
-    AC_DEFINE_UNQUOTED([SIGNAL_SNORT_RELOAD], [$SIGNAL_SNORT_RELOAD], [Set by user])
-fi
-
-AC_ARG_VAR(SIGNAL_SNORT_DUMP_STATS, set the SIGNAL_SNORT_DUMP_STATS value)
-
-if test "x$SIGNAL_SNORT_DUMP_STATS" != "x" ; then
-    AC_DEFINE_UNQUOTED([SIGNAL_SNORT_DUMP_STATS], [$SIGNAL_SNORT_DUMP_STATS], [Set by user])
-fi
-
-AC_ARG_VAR(SIGNAL_SNORT_ROTATE_STATS, set the SIGNAL_SNORT_ROTATE_STATS value)
-
-if test "x$SIGNAL_SNORT_ROTATE_STATS" != "x" ; then
-    AC_DEFINE_UNQUOTED([SIGNAL_SNORT_ROTATE_STATS], [$SIGNAL_SNORT_ROTATE_STATS], [Set by user])
-fi
-
-AC_ARG_VAR(SIGNAL_SNORT_READ_ATTR_TBL, set the SIGNAL_SNORT_READ_ATTR_TBL value)
-
-if test "x$SIGNAL_SNORT_READ_ATTR_TBL" != "x" ; then
-    AC_DEFINE_UNQUOTED([SIGNAL_SNORT_READ_ATTR_TBL], [$SIGNAL_SNORT_READ_ATTR_TBL], [Set by user])
-fi
-
-#--------------------------------------------------------------------------
-# enables
-#--------------------------------------------------------------------------
-
-AM_CONDITIONAL(LINUX, [test "x$linux" = "xyes"])
-
-AC_ARG_ENABLE(static-ips-actions,
-    AS_HELP_STRING([--disable-static-ips-actions],[do not include ips actions in binary ]),
-    static_ips_actions="$enableval", static_ips_actions="yes")
-
-AM_CONDITIONAL(STATIC_IPS_ACTIONS, [test "x$static_ips_actions" = "xyes"])
-
-if test "x$static_ips_actions" = "xyes"; then
-    AC_DEFINE(STATIC_IPS_ACTIONS, [1], [include internal ips actions in binary])
-fi
-
-AC_ARG_ENABLE(static-inspectors,
-    AS_HELP_STRING([--disable-static-inspectors],[do not include inspectors in binary ]),
-    static_inspectors="$enableval", static_inspectors="yes")
-
-AM_CONDITIONAL(STATIC_INSPECTORS, [test "x$static_inspectors" = "xyes"])
-
-if test "x$static_inspectors" = "xyes"; then
-    AC_DEFINE(STATIC_INSPECTORS, [1], [include internal inspectors in binary])
-fi
-
-AC_ARG_ENABLE(static-loggers,
-    AS_HELP_STRING([--disable-static-loggers],[do not include loggers in binary ]),
-    static_loggers="$enableval", static_loggers="yes")
-
-AM_CONDITIONAL(STATIC_LOGGERS, [test "x$static_loggers" = "xyes"])
-
-if test "x$static_loggers" = "xyes"; then
-    AC_DEFINE(STATIC_LOGGERS, [1], [include internal loggers in binary])
-fi
-
-AC_ARG_ENABLE(static-ips-options,
-    AS_HELP_STRING([--disable-static-ips-options],[do not include ips options in binary ]),
-    static_ips_options="$enableval", static_ips_options="yes")
-
-AM_CONDITIONAL(STATIC_IPS_OPTIONS, [test "x$static_ips_options" = "xyes"])
-
-if test "x$static_ips_options" = "xyes"; then
-    AC_DEFINE(STATIC_IPS_OPTIONS, [1], [include internal ips options in binary])
-fi
-
-AC_ARG_ENABLE(static-search-engines,
-    AS_HELP_STRING([--disable-static-search-engines],[do not include search engines in binary ]),
-    static_search_engines="$enableval", static_search_engines="yes")
-
-AM_CONDITIONAL(STATIC_SEARCH_ENGINES, [test "x$static_search_engines" = "xyes"])
-
-if test "x$static_search_engines" = "xyes"; then
-    AC_DEFINE(STATIC_SEARCH_ENGINES, [1], [include internal search engines in binary])
-fi
-
-AC_ARG_ENABLE(static-codecs,
-    AS_HELP_STRING([--disable-static-codecs],[do not include codecs in binary ]),
-    static_codecs="$enableval", static_codecs="yes")
-
-AM_CONDITIONAL(STATIC_CODECS, [test "x$static_codecs" = "xyes"])
-
-if test "x$static_codecs" = "xyes"; then
-    AC_DEFINE(STATIC_CODECS, [1], [include internal decoders in binary])
-fi
-
-AC_ARG_ENABLE(shell,
-    AS_HELP_STRING([--enable-shell],[enable command line shell support]),
-    enable_shell="$enableval", enable_shell="no")
-
-if test "x$enable_shell" = "xyes"; then
-    AC_DEFINE(SHELL, [1], [enable shell support])
-fi
-
-AM_CONDITIONAL(ENABLE_SHELL, test "x$enable_shell" = "xyes")
-
-AC_ARG_ENABLE(stdlog,
-    AS_HELP_STRING([--enable-stdlog],[use file descriptor 3 instead of stdout for alerts]),
-    enable_stdlog="$enableval", enable_stdlog="no")
-
-if test "x$enable_stdlog" = "xyes"; then
-    AC_DEFINE(USE_STDLOG, [1], [enable stdlog])
-fi
-
-AC_ARG_ENABLE(tsc-clock,
-    AS_HELP_STRING([--enable-tsc-clock],[use timestamp counter register clock (x86 only)]),
-    enable_tsc_clock="$enableval", enable_tsc_clock="no")
-
-if test "x$enable_tsc_clock" = "xyes"; then
-    AC_DEFINE(USE_TSC_CLOCK, [1], [enable tsc clock])
-fi
-
-AC_ARG_ENABLE(large-pcap,
-    AS_HELP_STRING([--enable-large-pcap],[enable support for pcaps larger than 2 GB]),
-    enable_large_pcap="$enableval", enable_large_pcap="no")
-
-if test "x$enable_large_pcap" = "xyes"; then
-    CPPFLAGS="${CPPFLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-fi
-
-AC_ARG_ENABLE(debug-msgs,
-    AS_HELP_STRING([--enable-debug-msgs],[enable debug printing options (bugreports and developers only)]),
-    enable_debug_msgs="$enableval", enable_debug_msgs="no")
-
-AM_CONDITIONAL(DEBUG_MSGS, test "x$enable_debug_msgs" = "xyes")
-
-if test "x$enable_debug_msgs" = "xyes"; then
-    CPPFLAGS="$CPPFLAGS -DDEBUG_MSGS"
-    AC_DEFINE(DEBUG_MSGS, [1], [enable debug messages])
-fi
-
-AC_ARG_ENABLE(debug,
-    AS_HELP_STRING([--enable-debug],[enable debugging options (bugreports and developers only)]),
-    enable_debug="$enableval", enable_debug="no")
-
-if test "x$enable_debug" = "xyes"; then
-    CPPFLAGS="$CPPFLAGS -g -DDEBUG"
-    AC_DEFINE(DEBUG, [1], [enable debug build])
-else
-    # disable assert()ions
-    AC_DEFINE(NDEBUG, [1], [disable assertions])
-fi
-
-AC_ARG_ENABLE(gdb,
-    AS_HELP_STRING([--disable-gdb],[disable gdb debugging information]),
-    enable_gdb="$enableval", enable_gdb="yes")
-
-if test "x$enable_gdb" = "xyes"; then
-    CFLAGS="$CFLAGS -g -ggdb"
-    CXXFLAGS="$CXXFLAGS -g -ggdb"
-fi
-
-AC_ARG_ENABLE(gprof-profile,
-    AS_HELP_STRING([--enable-gprof-profile],[enable gprof profiling output (developers only)]),
-    enable_gprof_profile="$enableval", enable_gprof_profile="no")
-
-# FIXIT-L need to check for g++ not gcc
-if test "x$enable_gprof_profile" = "xyes"; then
-    if test -n "$GCC"; then
-        CFLAGS="$CFLAGS -pg"
-        CXXFLAGS="$CXXFLAGS -pg"
-    fi
-    AC_DEFINE(PROFILE, [1], [enable gprof profiling])
-fi
-
-AC_ARG_ENABLE(corefiles,
-    AS_HELP_STRING([--disable-corefiles],[prevent Snort from generating core files]),
-    enable_corefiles="$enableval", enable_corefiles="yes")
-
-if test "x$enable_corefiles" = "xno"; then
-    AC_DEFINE(NOCOREFILE, [1], [do not generate a core file on segfault etc.])
-fi
-
-AC_ARG_ENABLE(address-sanitizer,
-    AS_HELP_STRING([--enable-address-sanitizer],[enable address sanitizer support]),
-    [
-        AX_CHECK_COMPILE_FLAG([-fsanitize=address], [SANITIZER_CXXFLAGS="$SANITIZER_CXXFLAGS -fsanitize=address"])
-        AX_CHECK_COMPILE_FLAG([-fno-omit-frame-pointer], [SANITIZER_CXXFLAGS="$SANITIZER_CXXFLAGS -fno-omit-frame-pointer"])
-        AX_CHECK_LINK_FLAG([-fsanitize=address], [SANITIZER_LDFLAGS="$SANITIZER_LDFLAGS -fsanitize=address"], [], [$SANITIZER_LDFLAGS])
-        AX_CHECK_LINK_FLAG([-static-libasan], [SANITIZER_LDFLAGS="$SANITIZER_LDFLAGS -static-libasan"], [], [$SANITIZER_LDFLAGS])
-    ])
-
-AC_ARG_ENABLE(thread-sanitizer,
-    AS_HELP_STRING([--enable-thread-sanitizer],[enable thread sanitizer support]),
-    [
-        AX_CHECK_COMPILE_FLAG([-fsanitize=thread], [SANITIZER_CXXFLAGS="$SANITIZER_CXXFLAGS -fsanitize=thread"])
-        AX_CHECK_COMPILE_FLAG([-fno-omit-frame-pointer], [SANITIZER_CXXFLAGS="$SANITIZER_CXXFLAGS -fno-omit-frame-pointer"])
-        AX_CHECK_LINK_FLAG([-fsanitize=thread], [SANITIZER_LDFLAGS="$SANITIZER_LDFLAGS -fsanitize=thread"], [], [$SANITIZER_LDFLAGS])
-        AX_CHECK_LINK_FLAG([-static-libtsan], [SANITIZER_LDFLAGS="$SANITIZER_LDFLAGS -static-libtsan"], [], [$SANITIZER_LDFLAGS])
-    ])
-
-#--------------------------------------------------------------------------
-# compile-time security features
-#--------------------------------------------------------------------------
-
-# Based on Debian's hardening options (https://wiki.debian.org/Hardening)
-# Desired options:
-# CPPFLAGS: -Wdate-time -D_FORTIFY_SOURCE=2
-# CFLAGS/CXXFLAGS: -fPIE -fstack-protector-strong -Wformat -Werror=format-security
-# LDFLAGS: -fPIE -pie -Wl,-z,relro -Wl,-z,now
-
-AC_ARG_ENABLE(hardened_build,
-    AS_HELP_STRING([--enable-hardened-build], [Detect and use compile-time hardening options]))
-
-if test "x$enable_hardened_build" = "xyes"; then
-
-    save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -Werror"
-
-    AX_CHECK_PREPROC_FLAG([-Wdate-time], [HARD_CPPFLAGS="$HARD_CPPFLAGS -Wdate-time"])
-
-    AX_CHECK_PREPROC_FLAG([-D_FORTIFY_SOURCE=2], [HARD_CPPFLAGS="$HARD_CPPFLAGS -D_FORTIFY_SOURCE=2"])
-
-    AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [HARD_CFLAGS="$HARD_CFLAGS -fstack-protector-strong"])
-
-    AX_CHECK_COMPILE_FLAG([-Wformat], [HARD_CFLAGS="$HARD_CFLAGS -Wformat"])
-
-    AX_CHECK_COMPILE_FLAG([-Werror=format-security], [HARD_CFLAGS="$HARD_CFLAGS -Werror=format-security"])
-
-    AX_CHECK_LINK_FLAG([-Wl,-z,relro], [HARD_LDFLAGS="$HARD_LDFLAGS -Wl,-z,relro"])
-
-    AX_CHECK_LINK_FLAG([-Wl,-z,now], [HARD_LDFLAGS="$HARD_LDFLAGS -Wl,-z,now"])
-
-    CPPFLAGS="$save_CPPFLAGS"
-
-fi
-
-# PIE support gets its own switch since it requires any static libraries Snort wants to link in to
-# be built with PIC, which may or may not be feasible for the user.
-
-AC_ARG_ENABLE(pie,
-    AS_HELP_STRING([--enable-pie], [Attempt to produce a position-independent executable]))
-
-if test "x$enable_pie" = "xyes"; then
-
-    AX_CHECK_COMPILE_FLAG([-fPIE], [HARD_CFLAGS="$HARD_CFLAGS -fPIE"])
-
-    AX_CHECK_LINK_FLAG([-fPIE -pie], [HARD_LDFLAGS="$HARD_LDFLAGS -fPIE -pie"])
-
-fi
-
-AC_ARG_ENABLE(safec,
-    AS_HELP_STRING([--disable-safec], [Do not use libsafec bounds checking even if available]),
-    enable_safec="$enableval", enable_safec="yes")
-
-if test "x$enable_safec" = "xyes"; then
-    AC_DEFINE(ENABLE_SAFEC, [1], [enable libsafec functions if present])
-fi
-
-#--------------------------------------------------------------------------
-# C++11 threads
-#--------------------------------------------------------------------------
-
-AC_LANG_PUSH([C++])
-ax_cxx11_thread_flags="none -pthread"
-for flag in $ax_cxx11_thread_flags ; do
-    case $flag in
-        none)
-        AC_MSG_CHECKING([whether C++11 threads work without any flags])
-        ;;
-
-        -*)
-        AC_MSG_CHECKING([whether C++11 threads work with $flag])
-        CXX11_THREAD_CXXFLAGS="$flag"
-        ;;
-    esac
-
-    save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="$CXX11_THREAD_CXXFLAGS $CXXFLAGS"
-
-    AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <iostream>
-                   #include <thread>
-                   void call_from_thread() { }],
-                   [std::thread t1(call_from_thread); t1.join()])],
-                   [ax_cxx11_thread_ok=yes],
-                   [ax_cxx11_thread_ok=no])
-
-    CXXFLAGS="$save_CXXFLAGS"
-
-    AC_MSG_RESULT([$ax_cxx11_thread_ok])
-    if test "x$ax_cxx11_thread_ok" = xyes ; then
-        break;
-    fi
-
-    CXX11_THREAD_CXXFLAGS=
-done
-AC_LANG_POP([C++])
-if test "x$ax_cxx11_thread_ok" != xyes ; then
-    AC_MSG_ERROR([could not find CXXFLAGS that allow C++11 threads to work])
-fi
-CXXFLAGS="$CXX11_THREAD_CXXFLAGS $CXXFLAGS"
-
-#--------------------------------------------------------------------------
-# unit tests
-#--------------------------------------------------------------------------
-
-AC_ARG_ENABLE(unit_tests,
-    AS_HELP_STRING([--enable-unit-tests],[build unit tests]),
-    enable_unit_tests="$enableval", enable_unit_tests="no")
-
-have_cpputest_pc="no"
-
-if test "x$enable_unit_tests" = "xyes"; then
-    PKG_CHECK_EXISTS([cpputest], [ have_cpputest_pc="yes" ], [ have_cpputest_pc="no" ])
-
-    if test "x${have_cpputest_pc}" = "xyes" ; then
-        CPPUTEST_CPPFLAGS="`${PKG_CONFIG} --cflags cpputest`"
-        CPPUTEST_LDFLAGS="`${PKG_CONFIG} --libs cpputest`"
-    fi
-
-    AC_DEFINE(UNIT_TEST, [1], [enable unit tests in build])
-fi
-
-AM_CONDITIONAL(ENABLE_UNIT_TESTS, test "x$enable_unit_tests" = "xyes")
-AM_CONDITIONAL(BUILD_CPPUTESTS, test "x$have_cpputest_pc" = "xyes")
-
-#--------------------------------------------------------------------------
-# piglet
-#--------------------------------------------------------------------------
-
-AC_ARG_ENABLE(piglet,
-    AS_HELP_STRING([--enable-piglet],[build piglet test harness]),
-    enable_piglet="$enableval", enable_piglet="no")
-
-if test "x$enable_piglet" = "xyes"; then
-    AC_DEFINE(PIGLET, [1], [enable piglet test harness in build])
-fi
-
-AM_CONDITIONAL(ENABLE_PIGLET, test "x$enable_piglet" = "xyes")
-
-#--------------------------------------------------------------------------
-#--------------------------------------------------------------------------
-# Required libraries
-#--------------------------------------------------------------------------
-#--------------------------------------------------------------------------
-
-#--------------------------------------------------------------------------
-# daq / sfbpf
-#--------------------------------------------------------------------------
-
-AC_ARG_WITH(daq_includes,
-    AS_HELP_STRING([--with-daq-includes=DIR],[DAQ include directory]),
-    [with_daq_includes="$withval"],[with_daq_includes="no"])
-
-DAQ_CPPFLAGS=""
-if test "x$with_daq_includes" != "xno"; then
-    DAQ_CPPFLAGS="-I${with_daq_includes}"
-    CPPFLAGS="${CPPFLAGS} ${DAQ_CPPFLAGS}"
-fi
-
-AC_ARG_WITH(daq_libraries,
-    AS_HELP_STRING([--with-daq-libraries=DIR],[DAQ library directory]),
-    [with_daq_libraries="$withval"],[with_daq_libraries="no"])
-
-if test "x$with_daq_libraries" != "xno"; then
-    LDFLAGS="${LDFLAGS} -L${with_daq_libraries}"
-fi
-
-AC_ARG_ENABLE(static_daq,
-    AS_HELP_STRING([--disable-static-daq],[link static DAQ modules]),
-    enable_static_daq="$enableval", enable_static_daq="yes")
-
-if test "$DLLIB" != "no"; then
-    LIBS="${LIBS} -ldl"
-else
-    AC_CHECK_LIB(c, dlsym, DLLIB="yes", DLLIB="no")
-    if test "$DLLIB" = "no"; then
-       echo
-       echo "   ERROR:  programmatic interface to dynamic link loader"
-       echo "   not found.  Cannot build Snort."
-       echo
-       exit 1
-    fi
-fi
-
-if test "x$enable_static_daq" = "xyes"; then
-    LDAQ=""
-    LIBS="${LIBS} `daq-modules-config --static --libs`"
-    AC_CHECK_LIB([daq_static], [daq_load_modules],
-        [LIBS="-ldaq_static ${LIBS}"], [LDAQ="no"], [ ])
-
-    if test "x$LDAQ" = "xno"; then
-        echo
-        echo "   ERROR:  daq_static library not found, go get it from"
-        echo "   http://www.snort.org/."
-        #AC_MSG_ERROR("Fatal!")  # FIXTHIS switch over to this macro
-        exit 1                   # instead of raw exits!
-    fi
-else
-    LDAQ=""
-    AC_CHECK_LIB([daq], [daq_load_modules],
-        [LIBS="${LIBS} -ldaq"], [LDAQ="no"], [ ])
-
-    if test "x$LDAQ" = "xno"; then
-        echo
-        echo "   ERROR:  daq library not found, go get it from"
-        echo "   http://www.snort.org/."
-        #AC_MSG_ERROR("Fatal!")
-        exit 1
-    fi
-fi
-
-AC_CHECK_HEADERS(sfbpf.h,,[SFBPF_H="no"])
-
-if test "x$SFBPF_H" = "xno"; then
-    echo
-    echo "   ERROR:  sfbpf header not found"
-    exit
-fi
-
-AC_CHECK_LIB(sfbpf, sfbpf_compile, [LIBS="${LIBS} -lsfbpf"], [SFBPF="no"])
-
-if test "x$SFBPF" = "xno"; then
-    echo
-    echo "   ERROR:  sfbpf library not found"
-    exit
-fi
-
-#--------------------------------------------------------------------------
-# dnet
-#--------------------------------------------------------------------------
-
-AC_ARG_WITH(dnet_includes,
-    AS_HELP_STRING([--with-dnet-includes=DIR],[libdnet include directory]),
-    [with_dnet_includes="$withval"],[with_dnet_includes="no"])
-
-DNET_CPPFLAGS=""
-if test "x$with_dnet_includes" != "xno"; then
-    DNET_CPPFLAGS="-I${with_dnet_includes}"
-else
-    DNET_CPPFLAGS="`dnet-config --cflags 2>/dev/null`"
-fi
-CPPFLAGS="${CPPFLAGS} ${DNET_CPPFLAGS}"
-
-AC_ARG_WITH(dnet_libraries,
-    AS_HELP_STRING([--with-dnet-libraries=DIR],[libdnet library directory]),
-    [with_dnet_libraries="$withval"],[with_dnet_libraries="no"])
-
-if test "x$with_dnet_libraries" != "xno"; then
-    DNET_LIBS="-L${with_dnet_libraries}"
-else
-    DNET_LIBS="`dnet-config --libs 2>/dev/null`"
-fi
-LDFLAGS="${LDFLAGS} ${DNET_LIBS}"
-
-AC_CHECK_HEADERS(dnet.h,,DNET_H="no")
-AC_CHECK_HEADERS(dumbnet.h,,DUMBNET_H="no")
-
-if test "x$DNET_H" = "xno" -a "x$DUMBNET_H" = "xno"; then
-    echo
-    echo "   ERROR:  dnet header not found, go get it from"
-    echo "   https://github.com/dugsong/libdnet.git or use the --with-dnet-*"
-    echo "   options, if you have it installed in an unusual place"
-    exit
-fi
-
-AC_CHECK_LIB(dnet, eth_set,,[DNET="no"])
-AC_CHECK_LIB(dumbnet, eth_set,,[DUMBNET="no"])
-
-if test "x$DNET" = "xno" -a "x$DUMBNET" = "xno"; then
-    echo
-    echo "   ERROR:  dnet library not found, go get it from"
-    echo "   http://code.google.com/p/libdnet/ or use the --with-dnet-*"
-    echo "   options, if you have it installed in an unusual place"
-    exit
-fi
-
-#--------------------------------------------------------------------------
-# hwloc
-#--------------------------------------------------------------------------
-
-AC_MSG_CHECKING([for hwloc pkg-config presence])
-PKG_CHECK_EXISTS([hwloc], [have_hwloc_pkgconfig="yes"], [have_hwloc_pkgconfig="no"])
-AC_MSG_RESULT(${have_hwloc_pkgconfig})
-
-HWLOC_CPPFLAGS=""
-if test "${have_hwloc_pkgconfig}" = "yes" ; then
-    HWLOC_CPPFLAGS=`${PKG_CONFIG} --cflags hwloc`
-    HWLOC_LDFLAGS=`${PKG_CONFIG} --libs-only-L hwloc`
-fi
-
-AC_ARG_WITH(hwloc_includes,
-    AS_HELP_STRING([--with-hwloc-includes=DIR],[hwloc include directory]),
-    [with_hwloc_includes="$withval"],[with_hwloc_includes="no"])
-
-if test "x$with_hwloc_includes" != "xno"; then
-    HWLOC_CPPFLAGS="-I${with_hwloc_includes}"
-fi
-
-AC_ARG_WITH(hwloc_libraries,
-    AS_HELP_STRING([--with-hwloc-libraries=DIR],[hwloc library directory]),
-    [with_hwloc_libraries="$withval"],[with_hwloc_libraries="no"])
-
-if test "x$with_hwloc_libraries" != "xno"; then
-    HWLOC_LDFLAGS="-L${with_hwloc_libraries}"
-fi
-
-CPPFLAGS="${HWLOC_CPPFLAGS} ${CPPFLAGS}"
-LDFLAGS="${HWLOC_LDFLAGS} ${LDFLAGS}"
-
-AC_CHECK_HEADERS([hwloc.h], , [AC_MSG_ERROR(hwloc header not found.)])
-AC_CHECK_LIB(hwloc, hwloc_set_thread_cpubind, , [AC_MSG_ERROR(Linking against hwloc library failed.)])
-
-#--------------------------------------------------------------------------
-# luajit
-#--------------------------------------------------------------------------
-
-AC_MSG_CHECKING([for luajit pkg-config presence])
-PKG_CHECK_EXISTS([luajit], [ have_luajit_pkgconfig="yes" ], [ have_luajit_pkgconfig="no" ])
-AC_MSG_RESULT(${have_luajit_pkgconfig})
-
-LUAJIT_CPPFLAGS=""
-if test "${have_luajit_pkgconfig}" = "yes" ; then
-    LUAJIT_CPPFLAGS=`${PKG_CONFIG} --cflags luajit`
-    LUAJIT_LDFLAGS=`${PKG_CONFIG} --libs-only-L luajit`
-fi
-
-AC_ARG_WITH(luajit_includes,
-    AS_HELP_STRING([--with-luajit-includes=DIR],[luajit include directory]),
-    [with_luajit_includes="$withval"],[with_luajit_includes="no"])
-
-if test "x$with_luajit_includes" != "xno"; then
-    LUAJIT_CPPFLAGS="-I${with_luajit_includes}"
-fi
-
-AC_ARG_WITH(luajit_libraries,
-    AS_HELP_STRING([--with-luajit-libraries=DIR],[luajit library directory]),
-    [with_luajit_libraries="$withval"],[with_luajit_libraries="no"])
-
-if test "x$with_luajit_libraries" != "xno"; then
-    LUAJIT_LDFLAGS="-L${with_luajit_libraries}"
-fi
-
-if test "x$macos" != "xno"; then
-    LUAJIT_LDFLAGS="${LUAJIT_LDFLAGS} -pagezero_size 10000 -image_base 100000000"
-fi
-
-CPPFLAGS="${CPPFLAGS} ${LUAJIT_CPPFLAGS}"
-LDFLAGS="${LDFLAGS} ${LUAJIT_LDFLAGS}"
-
-AC_LANG_PUSH([C++])
-AC_CHECK_HEADERS([luajit.h lua.hpp], , [AC_MSG_ERROR("LuaJIT headers not found.")])
-AC_CHECK_LIB(luajit-5.1, main, , [AC_MSG_ERROR("Linking against LuaJIT library failed.")])
-AC_LANG_POP([C++])
-
-#--------------------------------------------------------------------------
-# openssl / crypto
-#--------------------------------------------------------------------------
-
-AC_ARG_WITH(openssl_includes,
-    AS_HELP_STRING([--with-openssl-includes=DIR],[openssl include directory]),
-    [with_openssl_includes="$withval"],[with_openssl_includes="no"])
-
-OPENSSL_CPPFLAGS=""
-if test "x$with_openssl_includes" != "xno"; then
-    OPENSSL_CPPFLAGS="-I${with_openssl_includes}"
-    CPPFLAGS="${CPPFLAGS} ${OPENSSL_CPPFLAGS}"
-fi
-
-AC_ARG_WITH(openssl_libraries,
-    AS_HELP_STRING([--with-openssl-libraries=DIR],[openssl library directory]),
-    [with_openssl_libraries="$withval"],[with_openssl_libraries="no"])
-
-if test "x$with_openssl_libraries" != "xno"; then
-    LDFLAGS="${LDFLAGS} -L${with_openssl_libraries}"
-fi
-
-AC_CHECK_HEADERS([openssl/md5.h openssl/sha.h openssl/x509.h], , [AC_MSG_ERROR("OpenSSL headers not found.")])
-AC_CHECK_LIB([crypto], [MD5_Init], , [AC_MSG_ERROR("OpenSSL crypto library not found.")])
-
-#--------------------------------------------------------------------------
-# pcap
-#--------------------------------------------------------------------------
-
-AC_ARG_WITH(pcap_includes,
-    AS_HELP_STRING([--with-pcap-includes=DIR],[libpcap include directory]),
-    [with_libpcap_includes="$withval"],[with_libpcap_includes="no"])
-
-PCAP_CPPFLAGS=""
-if test "x$with_libpcap_includes" != "xno"; then
-    PCAP_CPPFLAGS="-I${with_libpcap_includes}"
-    CPPFLAGS="${CPPFLAGS} ${PCAP_CPPFLAGS}"
-fi
-
-AC_ARG_WITH(pcap_libraries,
-    AS_HELP_STRING([--with-pcap-libraries=DIR],[libpcap library directory]),
-    [with_libpcap_libraries="$withval"],[with_libpcap_libraries="no"])
-
-if test "x$with_libpcap_libraries" != "xno"; then
-    LDFLAGS="${LDFLAGS} -L${with_libpcap_libraries}"
-fi
-
-LPCAP=""
-AC_CHECK_HEADERS([pcap.h],, LPCAP="no")
-AC_CHECK_LIB(pcap, pcap_datalink,, LPCAP="no")
-
-if test "x$LPCAP" = "xno"; then
-    echo
-    echo "   ERROR:  Libpcap library/headers (libpcap.a (or .so)/pcap.h)"
-    echo "   not found, go get it from http://www.tcpdump.org"
-    echo "   or use the --with-pcap-* options, if you have it installed"
-    echo "   in unusual place.  Also check if your libpcap depends on another"
-    echo "   shared library that may be installed in an unusual place"
-    exit 1
-fi
-
-#--------------------------------------------------------------------------
-# pcre
-#--------------------------------------------------------------------------
-
-AC_MSG_CHECKING([for libpcre pkg-config presence])
-PKG_CHECK_EXISTS([libpcre], [ have_libpcre_pkgconfig="yes" ], [ have_libpcre_pkgconfig="no" ])
-AC_MSG_RESULT(${have_libpcre_pkgconfig})
-
-PCRE_CPPFLAGS=""
-if test "${have_libpcre_pkgconfig}" = "yes" ; then
-    PCRE_CPPFLAGS=`${PKG_CONFIG} --cflags libpcre`
-    PCRE_LDFLAGS=`${PKG_CONFIG} --libs-only-L libpcre`
-fi
-
-AC_ARG_WITH(pcre_includes,
-    AS_HELP_STRING([--with-pcre-includes=DIR],[libpcre include directory]),
-    [with_libpcre_includes="$withval"],[with_libpcre_includes="no"])
-
-if test "x$with_libpcre_includes" != "xno"; then
-    PCRE_CPPFLAGS="-I${with_libpcre_includes}"
-elif test "${have_libpcre_pkgconfig}" = "no"; then
-    PCRE_CPPFLAGS="`pcre-config --cflags`"
-fi
-
-AC_ARG_WITH(pcre_libraries,
-    AS_HELP_STRING([--with-pcre-libraries=DIR],[libpcre library directory]),
-    [with_libpcre_libraries="$withval"],[with_libpcre_libraries="no"])
-
-if test "x$with_libpcre_libraries" != "xno"; then
-    PCRE_LDFLAGS="-L${with_libpcre_libraries}"
-elif test "${have_libpcre_pkgconfig}" = "no"; then
-    PCRE_LDFLAGS="`pcre-config --libs`"
-fi
-
-CPPFLAGS="${CPPFLAGS} ${PCRE_CPPFLAGS}"
-LDFLAGS="${LDFLAGS} ${PCRE_LDFLAGS}"
-
-# PCRE configuration (required)
-# Verify that we have the headers
-PCRE_H=""
-AC_CHECK_HEADERS(pcre.h,, PCRE_H="no")
-if test "x$PCRE_H" = "xno"; then
-  echo
-  echo "   ERROR:  Libpcre header not found."
-  echo "   Get it from http://www.pcre.org"
-  exit 1
-fi
-
-# Verify that we have the library
-PCRE_L=""
-AC_CHECK_LIB(pcre, pcre_compile, ,PCRE_L="no")
-if test "x$PCRE_L" = "xno"; then
-    echo
-    echo "   ERROR:  Libpcre library not found."
-    echo "   Get it from http://www.pcre.org"
-    echo
-    exit 1
-fi
-
-#--------------------------------------------------------------------------
-# zlib
-#--------------------------------------------------------------------------
-
-Z_LIB=""
-AC_CHECK_HEADERS(zlib.h,, Z_LIB="no")
-if test "x$Z_LIB" = "xno"; then
-    echo
-    echo "   ERROR:  zlib header not found, go get it from"
-    echo "   http://www.zlib.net"
-    exit
-fi
-
-Z_LIB=""
-AC_CHECK_LIB(z, inflate,, Z_LIB="no")
-if test "x$Z_LIB" = "xno"; then
-    echo
-    echo "   ERROR:  zlib library not found, go get it from"
-    echo "   http://www.zlib.net"
-    exit
-fi
-LIBS="$LIBS -lz"
-
-#--------------------------------------------------------------------------
-#--------------------------------------------------------------------------
-# Optional libraries
-#--------------------------------------------------------------------------
-#--------------------------------------------------------------------------
-
-#--------------------------------------------------------------------------
-# flatbuffers (optional)
-#--------------------------------------------------------------------------
-
-AC_LANG_PUSH(C++)
-
-AC_ARG_WITH(flatbuffers_includes,
-    AS_HELP_STRING([--with-flatbuffers-includes=DIR],[flatbuffers include directory]),
-    [with_flatbuffers_includes="$withval"],[with_flatbuffers_includes="no"])
-
-if test "x$with_flatbuffers_includes" != "xno"; then
-    FLATBUFFERS_CPPFLAGS="-I${with_flatbuffers_includes}"
-fi
-
-AC_ARG_WITH(flatbuffers_libraries,
-    AS_HELP_STRING([--with-flatbuffers-libraries=DIR],[flatbuffers library directory]),
-    [with_flatbuffers_libraries="$withval"],[with_flatbuffers_libraries="no"])
-
-if test "x$with_flatbuffers_libraries" != "xno"; then
-    FLATBUFFERS_LDFLAGS="-L${with_flatbuffers_libraries}"
-fi
-
-CPPFLAGS="${CPPFLAGS} ${FLATBUFFERS_CPPFLAGS}"
-LDFLAGS="${LDFLAGS} ${FLATBUFFERS_LDFLAGS}"
-
-AC_CHECK_HEADERS(flatbuffers/flatbuffers.h, FBS_HEADERS="yes", FBS_HEADERS="no")
-
-SAVED_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -lflatbuffers"
-AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([#include <flatbuffers/flatbuffers.h>],
-    ["flatbuffers::FlatBufferBuilder builder;"])],
-    [TEST_LIBS="$TEST_LIBS -lflatbufferes"] [FBS_LIBS="yes"], 
-    [AC_MSG_WARN([libflatbuffers is not installed.])])
-LDFLAGS=$SAVED_LDFLAGS
-
-if test "x$FBS_LIBS" = "xyes"; then
-    if test "x$FBS_HEADERS" != "xno"; then
-        AC_DEFINE([HAVE_FLATBUFFERS],[1],[can build flatbuffers code])
-        LIBS="${LIBS} -lflatbuffers"
-    fi
-fi
-
-AC_LANG_POP()
-
-AM_CONDITIONAL([HAVE_FLATBUFFERS], [test "x$FBS_HEADERS" = "xyes"])
-
-#--------------------------------------------------------------------------
-# hyperscan (optional)
-#--------------------------------------------------------------------------
-
-AC_MSG_CHECKING([for hyperscan >= 4.4.0 pkg-config presence])
-PKG_CHECK_EXISTS([libhs >= 4.4.0], [ have_hyperscan_pkgconfig="yes" ], [ have_hyperscan_pkgconfig="no" ])
-AC_MSG_RESULT(${have_hyperscan_pkgconfig})
-
-HYPERSCAN_CPPFLAGS=""
-if test "${have_hyperscan_pkgconfig}" = "yes" ; then
-    HYPERSCAN_CPPFLAGS=`${PKG_CONFIG} --cflags libhs`
-    HYPERSCAN_LDFLAGS=`${PKG_CONFIG} --libs-only-L libhs`
-fi
-
-AC_ARG_WITH(hyperscan_includes,
-    AS_HELP_STRING([--with-hyperscan-includes=DIR],[libhs include directory]),
-    [with_hyperscan_includes="$withval"],[with_hyperscan_includes="no"])
-
-if test "x$with_hyperscan_includes" != "xno"; then
-    HYPERSCAN_CPPFLAGS="-I${with_hyperscan_includes}"
-fi
-
-AC_ARG_WITH(hyperscan_libraries,
-    AS_HELP_STRING([--with-hyperscan-libraries=DIR],[libhs library directory]),
-    [with_hyperscan_libraries="$withval"],[with_hyperscan_libraries="no"])
-
-if test "x$with_hyperscan_libraries" != "xno"; then
-    HYPERSCAN_LDFLAGS="-L${with_hyperscan_libraries}"
-fi
-
-CPPFLAGS="${CPPFLAGS} ${HYPERSCAN_CPPFLAGS}"
-LDFLAGS="${LDFLAGS} ${HYPERSCAN_LDFLAGS}"
-
-AC_CHECK_HEADERS(hs.h, HS_HEADERS="yes", HS_HEADERS="no")
-AC_CHECK_LIB(hs, hs_scan, HS_LIB="yes", HS_LIB="no")
-
-if test "x$HS_LIB" != "xno"; then
-    if test "x$HS_HEADERS" != "xno"; then
-        AC_DEFINE([HAVE_HYPERSCAN],[1],[can build hyperscan code])
-        LIBS="${LIBS} -lhs"
-    fi
-fi
-
-AM_CONDITIONAL([HAVE_HYPERSCAN], [test "x$HS_HEADERS" = "xyes" -a "x$HS_LIB" = "xyes"])
-
-#--------------------------------------------------------------------------
-# iconv (optional)
-#--------------------------------------------------------------------------
-AM_ICONV
-
-#--------------------------------------------------------------------------
-# lzma (optional)
-#--------------------------------------------------------------------------
-
-AC_ARG_WITH(lzma_includes,
-    AS_HELP_STRING([--with-lzma-includes=DIR],[liblzma include directory]),
-    [with_lzma_includes="$withval"],[with_lzma_includes="no"])
-
-LZMA_CPPFLAGS=""
-if test "x$with_lzma_includes" != "xno"; then
-    LZMA_CPPFLAGS="-I${with_lzma_includes}"
-    CPPFLAGS="${CPPFLAGS} ${LZMA_CPPFLAGS}"
-fi
-
-AC_ARG_WITH(lzma_libraries,
-    AS_HELP_STRING([--with-lzma-libraries=DIR],[liblzma library directory]),
-    [with_lzma_libraries="$withval"],[with_lzma_libraries="no"])
-
-if test "x$with_lzma_libraries" != "xno"; then
-    LDFLAGS="${LDFLAGS} -L${with_lzma_libraries}"
-fi
-
-AC_CHECK_HEADERS(lzma.h, LZMA_HEADERS="yes", LZMA_HEADERS="no")
-AC_CHECK_LIB(lzma, lzma_code, LZMA_LIB="yes", LZMA_LIB="no")
-
-if test "x$LZMA_LIB" != "xno"; then
-    if test "x$LZMA_HEADERS" != "xno"; then
-        AC_DEFINE([HAVE_LZMA],[1],[can build lzma code])
-        LIBS="${LIBS} -llzma"
-    fi
-fi
-
-#--------------------------------------------------------------------------
-# safec (optional)
-#--------------------------------------------------------------------------
-AC_MSG_CHECKING([for safec pkg-config presence])
-PKG_CHECK_EXISTS([safec-1.0], [ have_safec_pkgconfig="yes" ], [ have_safec_pkgconfig="no" ])
-AC_MSG_RESULT(${have_safec_pkgconfig})
-
-if test "${have_safec_pkgconfig}" = "yes" ; then
-    SAFEC_CFLAGS=`${PKG_CONFIG} --cflags safec-1.0`
-    SAFEC_LDFLAGS=`${PKG_CONFIG} --libs-only-L safec-1.0`
-fi
-
-CPPFLAGS="${CPPFLAGS} ${SAFEC_CFLAGS}"
-LDFLAGS="${LDFLAGS} ${SAFEC_LDFLAGS}"
-
-AC_CHECK_HEADERS(libsafec/safe_lib.h, SAFEC_HEADERS="yes", SAFEC_HEADERS="no")
-AC_CHECK_LIB(safec-1.0, memcpy_s, SAFEC_LIB="yes", SAFEC_LIB="no")
-
-if test "x$SAFEC_LIB" != "xno"; then
-    if test "x$SAFEC_HEADERS" != "xno"; then
-        AC_DEFINE([HAVE_SAFEC],[1],[can build safec code])
-        LIBS="${LIBS} -lsafec-1.0"
-    fi
-fi
-
-#--------------------------------------------------------------------------
-# uuid
-#--------------------------------------------------------------------------
-#
-AC_MSG_CHECKING([for uuid pkg-config presence])
-PKG_CHECK_EXISTS([uuid], [ have_uuid_pkgconfig="yes" ], [ have_uuid_pkgconfig="no" ])
-AC_MSG_RESULT(${have_uuid_pkgconfig})
-
-UUID_CPPFLAGS=""
-if test "${macos}" = "yes"; then
-    UUID_CPPFLAGS="-I/usr/include/uuid"
-    UUID_LDFLAGS="-lSystem"
-    UUID_LIBNAME="System"
-else
-    UUID_LIBNAME="uuid"
-fi
-
-if test "${have_uuid_pkgconfig}" = "yes" ; then
-    UUID_CPPFLAGS=`${PKG_CONFIG} --cflags uuid`
-    UUID_LDFLAGS=`${PKG_CONFIG} --libs-only-L uuid`
-fi
-
-AC_ARG_WITH(uuid_includes,
-    AS_HELP_STRING([--with-uuid-includes=DIR],[uuid include directory]),
-    [with_uuid_includes="$withval"],[with_uuid_includes="no"])
-
-if test "x$with_uuid_includes" != "xno"; then
-    UUID_CPPFLAGS="-I${with_uuid_includes}"
-fi
-
-AC_ARG_WITH(uuid_libraries,
-    AS_HELP_STRING([--with-uuid-libraries=DIR],[uuid library directory]),
-    [with_uuid_libraries="$withval"],[with_uuid_libraries="no"])
-
-if test "x$with_uuid_libraries" != "xno"; then
-    UUID_LDFLAGS="-L${with_uuid_libraries}"
-fi
-
-CPPFLAGS="${CPPFLAGS} ${UUID_CPPFLAGS}"
-LDFLAGS="${LDFLAGS} ${UUID_LDFLAGS}"
-
-# Verify that we have the headers
-UUID_H=""
-AC_CHECK_HEADERS(uuid.h, UUID_H="yes")
-
-# Verify that we have the library
-UUID_L=""
-AC_CHECK_LIB("${UUID_LIBNAME}", uuid_parse, UUID_L="yes")
-
-if test "x$UUID_L" = "xyes"; then
-    if test "x$UUID_H" = "xyes"; then
-        AC_DEFINE([HAVE_UUID],[1],[can build uuid code])
-        LIBS="${LIBS} -l${UUID_LIBNAME}"
-    fi
-fi
-
-#--------------------------------------------------------------------------
-# outputs
-#--------------------------------------------------------------------------
-
-AC_DEFINE_UNQUOTED([API_OPTIONS], ["$API_OPTIONS"], [plugin api related build options])
-
-if test -n "$SANITIZER_CXXFLAGS" ; then
-    CFLAGS="$SANITIZER_CXXFLAGS $CFLAGS"
-    CXXFLAGS="$SANITIZER_CXXFLAGS $CXXFLAGS"
-fi
-
-if test "x${CODE_COVERAGE_ENABLED}" = "xyes" ; then
-    CFLAGS=`echo $CFLAGS | ${SED} 's/-O\w//g'`
-    CXXFLAGS=`echo $CXXFLAGS | ${SED} 's/-O\w//g'`
-fi
-
-# Global defaults for AM_* flags.  Can be overridden on a per-Makefile.am basis.
-AM_CPPFLAGS='-I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/network_inspectors'
-AM_CPPFLAGS="${AM_CPPFLAGS} ${CODE_COVERAGE_CPPFLAGS} ${HARD_CPPFLAGS}"
-AM_CFLAGS="${CODE_COVERAGE_CFLAGS} ${HARD_CFLAGS}"
-AM_CXXFLAGS="${CODE_COVERAGE_CXXFLAGS} ${HARD_CFLAGS}"
-AM_LDFLAGS="${CODE_COVERAGE_LDFLAGS} ${HARD_LDFLAGS}"
-
-# Special AM_CPPFLAGS for snort2lua.
-snort2lua_CPPFLAGS='-I$(top_builddir) -I$(top_srcdir)/tools/snort2lua'
-snort2lua_CPPFLAGS="${snort2lua_CPPFLAGS} ${CODE_COVERAGE_CPPFLAGS}"
-
-AC_SUBST(AM_CPPFLAGS)
-AC_SUBST(AM_CFLAGS)
-AC_SUBST(AM_CXXFLAGS)
-AC_SUBST(AM_LDFLAGS)
-
-AC_SUBST(snort2lua_CPPFLAGS)
-
-AC_SUBST(CPPUTEST_CPPFLAGS)
-AC_SUBST(CPPUTEST_LDFLAGS)
-
-AC_SUBST(PCAP_CPPFLAGS)
-AC_SUBST(HWLOC_CPPFLAGS)
-AC_SUBST(LUAJIT_CPPFLAGS)
-AC_SUBST(PCRE_CPPFLAGS)
-AC_SUBST(UUID_CPPFLAGS)
-AC_SUBST(DNET_CPPFLAGS)
-AC_SUBST(DAQ_CPPFLAGS)
-AC_SUBST(FLATBUFFERS_CPPFLAGS)
-AC_SUBST(LZMA_CPPFLAGS)
-AC_SUBST(OPENSSL_CPPFLAGS)
-AC_SUBST(HYPERSCAN_CPPFLAGS)
-
-AC_SUBST(SANITIZER_LDFLAGS)
-
-AC_CONFIG_FILES([ \
-snort.pc \
-Makefile \
-src/Makefile \
-src/actions/Makefile \
-src/codecs/Makefile \
-src/codecs/root/Makefile \
-src/codecs/link/Makefile \
-src/codecs/ip/Makefile \
-src/codecs/misc/Makefile \
-src/control/Makefile \
-src/decompress/Makefile \
-src/detection/Makefile \
-src/events/Makefile \
-src/file_api/Makefile \
-src/filters/Makefile \
-src/flow/Makefile \
-src/flow/test/Makefile \
-src/framework/Makefile \
-src/hash/Makefile \
-src/hash/test/Makefile \
-src/helpers/Makefile \
-src/lua/Makefile \
-src/ips_options/Makefile \
-src/ips_options/test/Makefile \
-src/latency/Makefile \
-src/log/Makefile \
-src/log/test/Makefile \
-src/loggers/Makefile    \
-src/main/Makefile \
-src/managers/Makefile \
-src/memory/Makefile \
-src/mime/Makefile \
-src/pub_sub/Makefile \
-src/stream/Makefile \
-src/stream/base/Makefile \
-src/stream/ip/Makefile \
-src/stream/icmp/Makefile \
-src/stream/libtcp/Makefile \
-src/stream/tcp/Makefile \
-src/stream/udp/Makefile \
-src/stream/user/Makefile \
-src/stream/file/Makefile \
-src/stream/test/Makefile \
-src/network_inspectors/Makefile \
-src/network_inspectors/appid/Makefile \
-src/network_inspectors/appid/test/Makefile \
-src/network_inspectors/appid/detector_plugins/test/Makefile \
-src/network_inspectors/appid/service_plugins/test/Makefile \
-src/network_inspectors/arp_spoof/Makefile \
-src/network_inspectors/binder/Makefile \
-src/network_inspectors/normalize/Makefile \
-src/network_inspectors/packet_capture/Makefile \
-src/network_inspectors/perf_monitor/Makefile \
-src/network_inspectors/port_scan/Makefile \
-src/network_inspectors/reputation/Makefile \
-src/packet_io/Makefile \
-src/parser/Makefile \
-src/piglet/Makefile \
-src/piglet_plugins/Makefile \
-src/service_inspectors/Makefile     \
-src/service_inspectors/back_orifice/Makefile \
-src/service_inspectors/dce_rpc/Makefile \
-src/service_inspectors/dnp3/Makefile \
-src/service_inspectors/dns/Makefile \
-src/service_inspectors/ftp_telnet/Makefile \
-src/service_inspectors/gtp/Makefile \
-src/service_inspectors/imap/Makefile \
-src/service_inspectors/modbus/Makefile \
-src/service_inspectors/http_inspect/Makefile \
-src/service_inspectors/http_inspect/test/Makefile \
-src/service_inspectors/http2_inspect/Makefile \
-src/service_inspectors/pop/Makefile \
-src/service_inspectors/rpc_decode/Makefile \
-src/service_inspectors/sip/Makefile \
-src/service_inspectors/smtp/Makefile \
-src/service_inspectors/ssh/Makefile \
-src/service_inspectors/ssl/Makefile \
-src/service_inspectors/wizard/Makefile \
-src/ports/Makefile \
-src/protocols/Makefile \
-src/search_engines/Makefile \
-src/search_engines/test/Makefile \
-src/sfip/Makefile \
-src/side_channel/Makefile \
-src/side_channel/test/Makefile \
-src/connectors/Makefile \
-src/connectors/file_connector/Makefile \
-src/connectors/file_connector/test/Makefile \
-src/connectors/tcp_connector/Makefile \
-src/connectors/tcp_connector/test/Makefile \
-src/sfrt/Makefile \
-src/target_based/Makefile \
-src/host_tracker/Makefile \
-src/host_tracker/test/Makefile \
-src/catch/Makefile \
-src/time/Makefile \
-src/profiler/Makefile \
-src/utils/Makefile \
-lua/Makefile \
-doc/Makefile \
-daqs/Makefile \
-tools/Makefile \
-tools/flatbuffers/Makefile \
-tools/u2boat/Makefile \
-tools/u2spewfoo/Makefile \
-tools/snort2lua/Makefile \
-tools/snort2lua/config_states/Makefile \
-tools/snort2lua/data/Makefile \
-tools/snort2lua/data/data_types/Makefile \
-tools/snort2lua/keyword_states/Makefile \
-tools/snort2lua/output_states/Makefile \
-tools/snort2lua/preprocessor_states/Makefile \
-tools/snort2lua/rule_states/Makefile \
-tools/snort2lua/helpers/Makefile \
-])
-
-AC_OUTPUT
-AC_MSG_RESULT([
-    $PACKAGE $VERSION
-    ========
-
-    prefix:         ${prefix}
-    sysconfdir:     ${sysconfdir}
-    libdir:         ${libdir}
-    includedir:     ${includedir}
-
-    compiler:       ${CC}
-    compiler++:     ${CXX}
-    cflags:         ${CFLAGS}
-    cxxflags:       ${CXXFLAGS}
-    cppflags:       ${CPPFLAGS}
-    ldflags:        ${LDFLAGS}
-    libs:           ${LIBS}
-
-    am_cppflags:    ${AM_CPPFLAGS}
-    am_cflags:      ${AM_CFLAGS}
-    am_cxxflags:    ${AM_CXXFLAGS}
-    am_ldflags:     ${AM_LDFLAGS}
-])
diff --git a/daqs/Makefile.am b/daqs/Makefile.am
deleted file mode 100644 (file)
index b7c7bca..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-x_includedir = $(pkgincludedir)/daqs
-x_include_HEADERS = daq_user.h
-
-daqlibdir = $(pkglibdir)/daqs
-
-daqlib_LTLIBRARIES = daq_file.la
-daq_file_la_CFLAGS = $(AM_CFLAGS) -DBUILDING_SO
-daq_file_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-daq_file_la_SOURCES = daq_file.c
-
-daqlib_LTLIBRARIES += daq_hext.la
-daq_hext_la_CFLAGS = $(AM_CFLAGS) -DBUILDING_SO
-daq_hext_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-daq_hext_la_SOURCES = daq_hext.c
-
index 8185a8ba58e43177c898e77d12f2091fd1dba613..1a115740db9ca8fc655a419cc06c2d402220e415 100644 (file)
@@ -142,7 +142,7 @@ if ( RUBY_EXECUTABLE )
     )
     list ( APPEND BUILT_SOURCES config_changes.txt )
 
-elseif ( RUBY_EXECUTABLE )
+else ( RUBY_EXECUTABLE )
     list ( APPEND UNBUILT_SOURCES config_changes.txt )
 
 endif ( RUBY_EXECUTABLE )
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644 (file)
index 26a5979..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-
-BUILT_SOURCES = \
-builtin.txt \
-commands.txt \
-config.txt \
-counts.txt \
-gids.txt \
-help.txt \
-modules.txt \
-options.txt \
-plugins.txt \
-signals.txt \
-version.txt \
-basic.txt \
-codec.txt \
-connector.txt \
-inspector.txt \
-ips_action.txt \
-ips_option.txt \
-logger.txt  \
-snort2lua_cmds.txt \
-search_engine.txt
-
-# currently no modules for these
-#so_rule.txt
-
-unbuilt_sources = \
-appid.txt \
-binder.txt \
-bugs.txt \
-building.txt \
-byte_extract.txt \
-byte_jump.txt \
-byte_math.txt \
-byte_test.txt \
-concepts.txt \
-config_changes.txt \
-connectors.txt \
-daq.txt \
-daq_readme.txt \
-dcerpc.txt \
-differences.txt \
-enviro.txt \
-errors.txt \
-extending.txt \
-features.txt \
-file_processing.txt \
-high_availability.txt \
-http_inspect.txt \
-overview.txt \
-params.txt \
-perf_monitor.txt \
-pop_imap.txt \
-reference.txt \
-sensitive_data.txt \
-port_scan.txt \
-side_channel.txt \
-smtp.txt \
-snort2lua.txt \
-snort2x.png \
-snort3x.png \
-snort_manual.txt \
-snorty.png \
-style.txt \
-terms.txt \
-testing_numerical_values.txt \
-tutorial.txt \
-usage.txt \
-wizard.txt
-
-all_sources = \
-$(unbuilt_sources) \
-$(BUILT_SOURCES)
-
-EXTRA_DIST = \
-snort_manual.text \
-snort_manual.html \
-snort_manual.pdf \
-online_manual.sh \
-dev_guide.sh
-
-dist_doc_DATA = \
-$(unbuilt_sources)
-
-snort = $(top_builddir)/src/snort
-snort2lua = $(top_builddir)/tools/snort2lua/snort2lua
-plugin_path = $(if $(shell echo $$SNORT_PLUGIN_PATH), --plugin-path=$(SNORT_PLUGIN_PATH) )
-
-FORCE:
-$(unbuilt_sources): FORCE
-       [ "$(srcdir)/$@" = "$(builddir)/$@" -o $(srcdir)/$@ -ot $(builddir)/$@ ] || \
-               cp $(srcdir)/$@ $(builddir)/$@
-
-builtin.txt: $(snort)
-       $(snort) $(plugin_path) --markup --list-builtin | sort -n -t : -k 1.4 -k 2 > $@
-
-commands.txt: $(snort)
-       $(snort) $(plugin_path) --markup --help-commands | sort > $@
-
-config.txt: $(snort)
-       $(snort) $(plugin_path) --markup --help-config | sort -k 3 > $@
-
-counts.txt: $(snort)
-       $(snort) $(plugin_path) --markup --help-counts | sort -k 2 > $@
-
-gids.txt: $(snort)
-       $(snort) $(plugin_path) --markup --list-gids | sort -n  -k 1.4 > $@
-
-modules.txt: $(snort)
-       $(snort) $(plugin_path) --markup --help-modules > $@
-
-plugins.txt: $(snort)
-       $(snort) $(plugin_path) --markup --help-plugins > $@
-
-help.txt: $(snort)
-       $(snort) --help > $@
-
-basic.txt: $(snort)
-       for m in `$(snort) --list-modules basic` ; do \
-               $(snort) --markup --help-module $$m ; \
-       done > $@
-
-codec.txt: $(snort)
-       for m in `$(snort) $(plugin_path) --list-modules codec` ; do \
-               $(snort) $(plugin_path)  --markup --help-module $$m ; \
-       done > $@
-
-connector.txt: $(snort)
-       for m in `$(snort) $(plugin_path) --list-modules connector` ; do \
-               $(snort) $(plugin_path)  --markup --help-module $$m ; \
-       done > $@
-
-inspector.txt: $(snort)
-       for m in `$(snort) $(plugin_path) --list-modules inspector` ; do \
-               $(snort) $(plugin_path) --markup --help-module $$m ; \
-       done > $@
-
-ips_action.txt: $(snort)
-       for m in `$(snort) $(plugin_path) --list-modules ips_action` ; do \
-               $(snort) $(plugin_path) --markup --help-module $$m ; \
-       done > $@
-
-ips_option.txt: $(snort)
-       for m in `$(snort) $(plugin_path) --list-modules ips_option` ; do \
-               $(snort) $(plugin_path) --markup --help-module $$m ; \
-       done > $@
-
-logger.txt: $(snort)
-       for m in `$(snort) $(plugin_path) --list-modules logger` ; do \
-               $(snort) $(plugin_path) --markup --help-module $$m ; \
-       done > $@
-
-search_engine.txt: $(snort)
-       for m in `$(snort) $(plugin_path) --list-modules search_engine` ; do \
-               $(snort) $(plugin_path) --markup --help-module $$m ; \
-       done > $@
-
-#so_rule.txt: $(snort)
-#      for m in `$(snort) --list-modules so_rule` ; do \
-#              $(snort) $(plugin_path) --markup --help-module $$m ; \
-#      done > $@
-
-options.txt: $(snort)
-       $(snort) --markup --help-options | sort > $@
-
-signals.txt: $(snort)
-       $(snort) --markup --help-signals | sort > $@
-
-version.txt: $(snort)
-       $(snort) -V 2>&1 | grep -v Using > $@
-
-snort2lua_cmds.txt: $(snort2lua)
-       $(snort2lua) --markup --help > $@
-
-snort_src = snort_manual.txt
-
-pdf_args = -a imagesdir=.
-
-html_args = \
-    --copy --attribute linkcss --attribute stylesdir \
-    --attribute disable-javascript --attribute quirks! \
-       --xsltproc-opts="--stringparam chunk.tocs.and.lots 1" \
-       $(pdf_args)
-
-# FIXIT no fuschia for visited; all should be sans serif extracted
-# asciidoc.css doesn't seem to work with -a linkcss asciidoc native html
-# generation; buggy passthru of base64 data.
-if MAKE_HTML_DOC
-html: $(all_sources)
-       a2x -f chunked $(html_args) $(snort_src)
-       tar zcf snort_manual.tgz snort_manual.chunked
-       asciidoc -b xhtml11 -a toc2 -a icons -a imagesdir=. $(snort_src)
-endif
-
-if MAKE_PDF_DOC
-pdf: $(all_sources)
-       a2x -f pdf $(pdf_args) $(snort_src)
-endif
-
-if MAKE_TEXT_DOC
-text: $(all_sources)
-       a2x -f text $(snort_src)
-endif
-
-if MAKE_HTML_DOC
-# autotools makes doesn't seem to like directory targets, especially ones
-# with an unspecified set of files.  to avoid these issues, we generate
-# a tarball and then explode that upon install with a hook.  note that
-# there is no default for chunked.
-#
-# after changing the target from all to html, exploding the tarball must
-# be conditional, but install fails with this hook:
-#
-#install-data-hook:
-#      [ -e $(builddir)/snort_manual.tgz ] && \
-#              tar zxf $(builddir)/snort_manual.tgz -C $(DESTDIR)$(docdir)/
-#
-#uninstall-hook:
-#      rm -rf $(DESTDIR)$(docdir)/snort_manual.chunked
-
-snort_online.html: $(all_sources)
-       $(srcdir)/online_manual.sh
-
-dev_guide.html: $(snort)
-       $(srcdir)/dev_guide.sh $(top_srcdir)
-endif
-
-delete_unbuilt = $(if $(and $(findstring $(builddir),$(srcdir)),$(findstring $(srcdir),$(builddir))), ,$(unbuilt_sources))
-
-clean-local:
-       rm -f $(BUILT_SOURCES)
-       rm -f $(delete_unbuilt)
-       rm -f snort_manual.{fo,xml}
-       rm -rf snort_manual.chunked
-       rm -f *.css *.tgz
-       rm -f {online_manual,dev_guide}.html
-
index d67e8cb59fcb6d285e7d1dc8cbec9032c39728ef..c43009177cb8f6991d6f7d38360dae140500a3e8 100644 (file)
@@ -80,13 +80,7 @@ Optional:
 
 * Now do one of the following:
 
-a. To build with autotools, simply do the usual from the top level directory:
-
-    ./configure --prefix=$my_path
-    make -j 8
-    make install
-
-b. To build with cmake and make, run configure_cmake.sh.  It will
+a. To build with cmake and make, run configure_cmake.sh.  It will
    automatically create and populate a new subdirectory named 'build'.
 
     ./configure_cmake.sh --prefix=$my_path
@@ -95,11 +89,11 @@ b. To build with cmake and make, run configure_cmake.sh.  It will
     make install
     ln -s $my_path/conf $my_path/etc
 
-c. You can also specify a cmake project generator:
+b. You can also specify a cmake project generator:
 
     ./configure_cmake.sh --generator=Xcode --prefix=$my_path
 
-d. Or use ccmake directly to configure and generate from an arbitrary build
+c. Or use ccmake directly to configure and generate from an arbitrary build
    directory like one of these:
 
     ccmake -G Xcode /path/to/Snort++/tree
index 0c930cddfe55e639f41f6dc29fcf8c76618b93e7..be3589b025f9d65211fa5b1c2c113d83426d364e 100644 (file)
@@ -3,7 +3,7 @@ project( snort_extra CXX C )
 
 set (EXTRA_VERSION_MAJOR 1)
 set (EXTRA_VERSION_MINOR 0)
-set (EXTRA_VERSION_BUILD 0-a4)
+set (EXTRA_VERSION_PATCH 0)
 
 set (CMAKE_CXX_STANDARD 11)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -16,20 +16,18 @@ set (CMAKE_C_EXTENSIONS ON)
 # Pull in definitions of various install directories
 include (GNUInstallDirs)
 
-set (AUTOTOOL_FILES "autom4te.cache;m4;configure.ac;Makefile.am")
-
 set (CPACK_GENERATOR TGZ)
 set (CPACK_PACKAGE_NAME "snort_extra")
 set (CPACK_PACKAGE_VENDOR "Cisco")
 set (CPACK_PACKAGE_VERSION_MAJOR "${EXTRA_VERSION_MAJOR}")
 set (CPACK_PACKAGE_VERSION_MINOR "${EXTRA_VERSION_MINOR}")
-set (CPACK_PACKAGE_VERSION_PATCH "${EXTRA_VERSION_BUILD}")
+set (CPACK_PACKAGE_VERSION_PATCH "${EXTRA_VERSION_PATCH}")
 set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/doc/images/snort.png")
 set (CPACK_PACKAGE_INSTALL_DIRECTORY "snort")
 set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set (CPACK_SOURCE_IGNORE_FILES "${AUTOTOOL_FILES}")
+set (CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}/*")
 set (CPACK_SOURCE_GENERATOR TGZ)
 
 include(CPack)
diff --git a/extra/Makefile.am b/extra/Makefile.am
deleted file mode 100644 (file)
index 09ec3c4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
-
-SUBDIRS = src
index 33973a04a282dd74183ea0f4d2ae4793a2239f6e..3c04b03f4dcbd4962a95cf4b0d558768544d6528 100644 (file)
@@ -27,10 +27,9 @@ The following things are pluggable in Snort++:
 
 DOWNLOAD
 
-There are two extra tarballs, one for autotools and one for cmake:
+There is one extra tarball:
 
-    snort_extra-1.0.0-a1-130-auto.tar.gz
-    snort_extra-1.0.0-a1-130-cmake.tar.gz
+    snort_extra-1.0.0-a1-130.tar.gz
 
 If you cloned from github, you have already have everything.
 
@@ -55,23 +54,13 @@ Follow these steps:
 
 3.  Compile and install:
 
-* To build with autotools, simply do the usual from the top level directory:
-
-    ./configure --prefix=$my_path
-    make
-    make install
-
-* To build with cmake and make:
-
-    mkdir -p build
+    ./configure_cmake.sh
     cd build
-    cmake -DCMAKE_INSTALL_PREFIX=$my_path ..
     make
     make install
 
 Note:
 
-* If you are using autotools with a github clone, first do autoreconf -isvf.
 * cmake --help will list any available generators, such as Xcode.  Feel
   free to use one, however help with those will be provided separately.
 * each individual plugin directory is a standalone cmake project, and does
diff --git a/extra/configure.ac b/extra/configure.ac
deleted file mode 100644 (file)
index 1433d95..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-AC_INIT([snort_extra],[1.0.0-a4],[snort-team@cisco.com])
-AC_CONFIG_AUX_DIR([build-aux])
-AC_PREREQ([2.69])
-AC_CONFIG_MACRO_DIRS([m4])
-
-AM_INIT_AUTOMAKE([foreign])
-AM_SILENT_RULES([yes])
-
-AC_PROG_INSTALL
-AC_PROG_CC([clang gcc])
-AC_PROG_CXX([clang++ g++])
-
-LT_INIT
-
-AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
-
-gl_VISIBILITY()
-CPPFLAGS="$CFLAG_VISIBILITY $CPPFLAGS"
-
-PKG_CHECK_MODULES([SNORT3], [snort >= 3])
-
-for i in `pkg-config --variable=cpp_opts snort`; do
-    CPPFLAGS_VAL=`pkg-config --variable=${i}_CPPFLAGS snort`
-    CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_VAL}"
-done
-
-AC_SUBST([SNORT3_CFLAGS])
-AC_SUBST([CPPFLAGS])
-
-AC_CONFIG_FILES([
-Makefile \
-src/Makefile \
-src/codecs/Makefile \
-src/codecs/cd_eapol/Makefile \
-src/codecs/cd_linux_sll/Makefile \
-src/codecs/cd_null/Makefile \
-src/codecs/cd_pflog/Makefile \
-src/codecs/cd_pbb/Makefile \
-src/codecs/cd_ppp/Makefile \
-src/codecs/cd_raw4/Makefile \
-src/codecs/cd_raw6/Makefile \
-src/codecs/cd_slip/Makefile \
-src/codecs/cd_token_ring/Makefile \
-src/codecs/cd_wlan/Makefile \
-src/daqs/Makefile \
-src/daqs/daq_socket/Makefile \
-src/daqs/daq_regtest/Makefile \
-src/inspectors/Makefile \
-src/inspectors/data_log/Makefile \
-src/inspectors/dpx/Makefile \
-src/inspectors/reg_test/Makefile \
-src/ips_options/Makefile \
-src/ips_options/find/Makefile \
-src/ips_options/ips_pkt_num/Makefile \
-src/ips_options/ips_mss/Makefile \
-src/ips_options/ips_urg/Makefile \
-src/ips_options/ips_wscale/Makefile \
-src/loggers/Makefile \
-src/loggers/alert_ex/Makefile \
-src/loggers/alert_json/Makefile \
-src/loggers/alert_lua/Makefile \
-src/loggers/alert_unixsock/Makefile \
-src/loggers/log_null/Makefile \
-src/search_engines/Makefile \
-src/search_engines/lowmem/Makefile \
-src/so_rules/Makefile \
-src/so_rules/sid_18758/Makefile
-])
-
-AC_OUTPUT
-
-AC_MSG_RESULT([
-    $PACKAGE $VERSION
-    ========
-
-    prefix:         ${prefix}
-    sysconfdir:     ${sysconfdir}
-    libdir:         ${libdir}
-    includedir:     ${includedir}
-
-    compiler:       ${CC}
-    compiler++:     ${CXX}
-    cflags:         ${CFLAGS}
-    cxxflags:       ${CXXFLAGS}
-    cppflags:       ${CPPFLAGS}
-    ldflags:        ${LDFLAGS}
-    libs:           ${LIBS}
-])
index 4729c5d8d268f2d377c8fb0a33d698a46c05ffa7..9fef33850d5b907f005d9ed2feb4a1f671f09903 100755 (executable)
@@ -15,7 +15,6 @@ EXPAND=${SCRIPT_PATH}/expand_template.rb
 
 boilerplate=(
   ${TEMPLATE_PATH}/CMakeLists.txt.erb
-  ${TEMPLATE_PATH}/Makefile.am.erb
 )
 
 [[ -n $DRY_RUN ]] && ECHO=echo || ECHO=
diff --git a/extra/m4/ax_cxx_compile_stdcxx.m4 b/extra/m4/ax_cxx_compile_stdcxx.m4
deleted file mode 100644 (file)
index 2c18e49..0000000
+++ /dev/null
@@ -1,562 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
-#   or '14' (for the C++14 standard).
-#
-#   The second argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The third argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline support for the specified C++ standard is
-#   required and that the macro should error out if no mode with that
-#   support is found.  If specified 'optional', then configuration proceeds
-#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-#   supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 4
-
-dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-dnl  (serial version number 13).
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-  m4_if([$1], [11], [],
-        [$1], [14], [],
-        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
-        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$2], [], [],
-        [$2], [ext], [],
-        [$2], [noext], [],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-  ax_cv_cxx_compile_cxx$1,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-    [ax_cv_cxx_compile_cxx$1=yes],
-    [ax_cv_cxx_compile_cxx$1=no])])
-  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$2], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=gnu++$1 -std=gnu++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$2], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    dnl HP's aCC needs +std=c++11 according to:
-    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-    dnl Cray's crayCC needs "-h std=c++11"
-    for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-    fi
-  fi
-  if test x$ac_success = xno; then
-    HAVE_CXX$1=0
-    AC_MSG_NOTICE([No compiler with C++$1 support was found])
-  else
-    HAVE_CXX$1=1
-    AC_DEFINE(HAVE_CXX$1,1,
-              [define if the compiler supports basic C++$1 syntax])
-  fi
-  AC_SUBST(HAVE_CXX$1)
-])
-
-
-dnl  Test body for checking C++11 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-)
-
-
-dnl  Test body for checking C++14 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-)
-
-
-dnl  Tests for new features in C++11
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
-  namespace test_static_assert
-  {
-
-    template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-  }
-
-  namespace test_final_override
-  {
-
-    struct Base
-    {
-      virtual void f() {}
-    };
-
-    struct Derived : public Base
-    {
-      virtual void f() override {}
-    };
-
-  }
-
-  namespace test_double_right_angle_brackets
-  {
-
-    template < typename T >
-    struct check {};
-
-    typedef check<void> single_type;
-    typedef check<check<void>> double_type;
-    typedef check<check<check<void>>> triple_type;
-    typedef check<check<check<check<void>>>> quadruple_type;
-
-  }
-
-  namespace test_decltype
-  {
-
-    int
-    f()
-    {
-      int a = 1;
-      decltype(a) b = 2;
-      return a + b;
-    }
-
-  }
-
-  namespace test_type_deduction
-  {
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static const bool value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static const bool value = true;
-    };
-
-    template < typename T1, typename T2 >
-    auto
-    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-    {
-      return a1 + a2;
-    }
-
-    int
-    test(const int c, volatile int v)
-    {
-      static_assert(is_same<int, decltype(0)>::value == true, "");
-      static_assert(is_same<int, decltype(c)>::value == false, "");
-      static_assert(is_same<int, decltype(v)>::value == false, "");
-      auto ac = c;
-      auto av = v;
-      auto sumi = ac + av + 'x';
-      auto sumf = ac + av + 1.0;
-      static_assert(is_same<int, decltype(ac)>::value == true, "");
-      static_assert(is_same<int, decltype(av)>::value == true, "");
-      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-      return (sumf > 0.0) ? sumi : add(c, v);
-    }
-
-  }
-
-  namespace test_noexcept
-  {
-
-    int f() { return 0; }
-    int g() noexcept { return 0; }
-
-    static_assert(noexcept(f()) == false, "");
-    static_assert(noexcept(g()) == true, "");
-
-  }
-
-  namespace test_constexpr
-  {
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-    {
-      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-    }
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c(const CharT *const s) noexcept
-    {
-      return strlen_c_r(s, 0UL);
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("1") == 1UL, "");
-    static_assert(strlen_c("example") == 7UL, "");
-    static_assert(strlen_c("another\0example") == 7UL, "");
-
-  }
-
-  namespace test_rvalue_references
-  {
-
-    template < int N >
-    struct answer
-    {
-      static constexpr int value = N;
-    };
-
-    answer<1> f(int&)       { return answer<1>(); }
-    answer<2> f(const int&) { return answer<2>(); }
-    answer<3> f(int&&)      { return answer<3>(); }
-
-    void
-    test()
-    {
-      int i = 0;
-      const int c = 0;
-      static_assert(decltype(f(i))::value == 1, "");
-      static_assert(decltype(f(c))::value == 2, "");
-      static_assert(decltype(f(0))::value == 3, "");
-    }
-
-  }
-
-  namespace test_uniform_initialization
-  {
-
-    struct test
-    {
-      static const int zero {};
-      static const int one {1};
-    };
-
-    static_assert(test::zero == 0, "");
-    static_assert(test::one == 1, "");
-
-  }
-
-  namespace test_lambdas
-  {
-
-    void
-    test1()
-    {
-      auto lambda1 = [](){};
-      auto lambda2 = lambda1;
-      lambda1();
-      lambda2();
-    }
-
-    int
-    test2()
-    {
-      auto a = [](int i, int j){ return i + j; }(1, 2);
-      auto b = []() -> int { return '0'; }();
-      auto c = [=](){ return a + b; }();
-      auto d = [&](){ return c; }();
-      auto e = [a, &b](int x) mutable {
-        const auto identity = [](int y){ return y; };
-        for (auto i = 0; i < a; ++i)
-          a += b--;
-        return x + identity(a + b);
-      }(0);
-      return a + b + c + d + e;
-    }
-
-    int
-    test3()
-    {
-      const auto nullary = [](){ return 0; };
-      const auto unary = [](int x){ return x; };
-      using nullary_t = decltype(nullary);
-      using unary_t = decltype(unary);
-      const auto higher1st = [](nullary_t f){ return f(); };
-      const auto higher2nd = [unary](nullary_t f1){
-        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-      };
-      return higher1st(nullary) + higher2nd(nullary)(unary);
-    }
-
-  }
-
-  namespace test_variadic_templates
-  {
-
-    template <int...>
-    struct sum;
-
-    template <int N0, int... N1toN>
-    struct sum<N0, N1toN...>
-    {
-      static constexpr auto value = N0 + sum<N1toN...>::value;
-    };
-
-    template <>
-    struct sum<>
-    {
-      static constexpr auto value = 0;
-    };
-
-    static_assert(sum<>::value == 0, "");
-    static_assert(sum<1>::value == 1, "");
-    static_assert(sum<23>::value == 23, "");
-    static_assert(sum<1, 2>::value == 3, "");
-    static_assert(sum<5, 5, 11>::value == 21, "");
-    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
-  }
-
-  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-  // because of this.
-  namespace test_template_alias_sfinae
-  {
-
-    struct foo {};
-
-    template<typename T>
-    using member = typename T::member_type;
-
-    template<typename T>
-    void func(...) {}
-
-    template<typename T>
-    void func(member<T>*) {}
-
-    void test();
-
-    void test() { func<foo>(0); }
-
-  }
-
-}  // namespace cxx11
-
-#endif  // __cplusplus >= 201103L
-
-]])
-
-
-dnl  Tests for new features in C++14
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201402L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
-  namespace test_polymorphic_lambdas
-  {
-
-    int
-    test()
-    {
-      const auto lambda = [](auto&&... args){
-        const auto istiny = [](auto x){
-          return (sizeof(x) == 1UL) ? 1 : 0;
-        };
-        const int aretiny[] = { istiny(args)... };
-        return aretiny[0];
-      };
-      return lambda(1, 1L, 1.0f, '1');
-    }
-
-  }
-
-  namespace test_binary_literals
-  {
-
-    constexpr auto ivii = 0b0000000000101010;
-    static_assert(ivii == 42, "wrong value");
-
-  }
-
-  namespace test_generalized_constexpr
-  {
-
-    template < typename CharT >
-    constexpr unsigned long
-    strlen_c(const CharT *const s) noexcept
-    {
-      auto length = 0UL;
-      for (auto p = s; *p; ++p)
-        ++length;
-      return length;
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("x") == 1UL, "");
-    static_assert(strlen_c("test") == 4UL, "");
-    static_assert(strlen_c("another\0test") == 7UL, "");
-
-  }
-
-  namespace test_lambda_init_capture
-  {
-
-    int
-    test()
-    {
-      auto x = 0;
-      const auto lambda1 = [a = x](int b){ return a + b; };
-      const auto lambda2 = [a = lambda1(x)](){ return a; };
-      return lambda2();
-    }
-
-  }
-
-  namespace test_digit_seperators
-  {
-
-    constexpr auto ten_million = 100'000'000;
-    static_assert(ten_million == 100000000, "");
-
-  }
-
-  namespace test_return_type_deduction
-  {
-
-    auto f(int& x) { return x; }
-    decltype(auto) g(int& x) { return x; }
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static constexpr auto value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static constexpr auto value = true;
-    };
-
-    int
-    test()
-    {
-      auto x = 0;
-      static_assert(is_same<int, decltype(f(x))>::value, "");
-      static_assert(is_same<int&, decltype(g(x))>::value, "");
-      return x;
-    }
-
-  }
-
-}  // namespace cxx14
-
-#endif  // __cplusplus >= 201402L
-
-]])
diff --git a/extra/m4/ax_cxx_compile_stdcxx_11.m4 b/extra/m4/ax_cxx_compile_stdcxx_11.m4
deleted file mode 100644 (file)
index 3dd5cf9..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++11
-#   standard; if necessary, add switches to CXX and CXXCPP to enable
-#   support.
-#
-#   This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
-#   macro with the version set to C++11.  The two optional arguments are
-#   forwarded literally as the second and third argument respectively.
-#   Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
-#   more information.  If you want to use this macro, you also need to
-#   download the ax_cxx_compile_stdcxx.m4 file.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 16
-
-include([ax_cxx_compile_stdcxx.m4])
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])])
diff --git a/extra/m4/visibility.m4 b/extra/m4/visibility.m4
deleted file mode 100644 (file)
index 77f760c..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-# visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl Tests whether the compiler supports the command-line option
-dnl -fvisibility=hidden and the function and variable attributes
-dnl __attribute__((__visibility__("hidden"))) and
-dnl __attribute__((__visibility__("default"))).
-dnl Does *not* test for __visibility__("protected") - which has tricky
-dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl Mac OS X.
-dnl Does *not* test for __visibility__("internal") - which has processor
-dnl dependent semantics.
-dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
-dnl "really only recommended for legacy code".
-dnl Set the variable CFLAG_VISIBILITY.
-dnl Defines and sets the variable HAVE_VISIBILITY.
-
-AC_DEFUN([gl_VISIBILITY],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  CFLAG_VISIBILITY=
-  HAVE_VISIBILITY=0
-  if test -n "$GCC"; then
-    dnl First, check whether -Werror can be added to the command line, or
-    dnl whether it leads to an error because of some other option that the
-    dnl user has put into $CC $CFLAGS $CPPFLAGS.
-    AC_MSG_CHECKING([whether the -Werror option is usable])
-    AC_CACHE_VAL([gl_cv_cc_vis_werror], [
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -Werror"
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[]], [[]])],
-        [gl_cv_cc_vis_werror=yes],
-        [gl_cv_cc_vis_werror=no])
-      CFLAGS="$gl_save_CFLAGS"])
-    AC_MSG_RESULT([$gl_cv_cc_vis_werror])
-    dnl Now check whether visibility declarations are supported.
-    AC_MSG_CHECKING([for simple visibility declarations])
-    AC_CACHE_VAL([gl_cv_cc_visibility], [
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -fvisibility=hidden"
-      dnl We use the option -Werror and a function dummyfunc, because on some
-      dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
-      dnl "visibility attribute not supported in this configuration; ignored"
-      dnl at the first function definition in every compilation unit, and we
-      dnl don't want to use the option in this case.
-      if test $gl_cv_cc_vis_werror = yes; then
-        CFLAGS="$CFLAGS -Werror"
-      fi
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-             extern __attribute__((__visibility__("default"))) int exportedvar;
-             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-           ]],
-           [[]])],
-        [gl_cv_cc_visibility=yes],
-        [gl_cv_cc_visibility=no])
-      CFLAGS="$gl_save_CFLAGS"])
-    AC_MSG_RESULT([$gl_cv_cc_visibility])
-    if test $gl_cv_cc_visibility = yes; then
-      CFLAG_VISIBILITY="-fvisibility=hidden"
-      HAVE_VISIBILITY=1
-    fi
-  fi
-  AC_SUBST([CFLAG_VISIBILITY])
-  AC_SUBST([HAVE_VISIBILITY])
-  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
-    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
-])
diff --git a/extra/src/Makefile.am b/extra/src/Makefile.am
deleted file mode 100644 (file)
index 89b4c48..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS = \
-codecs \
-daqs \
-inspectors \
-ips_options \
-loggers \
-search_engines \
-so_rules
-
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CFLAGS= @AM_CFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-SNORT3_CFLAGS= @SNORT3_CFLAGS@
diff --git a/extra/src/codecs/Makefile.am b/extra/src/codecs/Makefile.am
deleted file mode 100644 (file)
index a9a1bf8..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS = \
-cd_eapol \
-cd_linux_sll \
-cd_null \
-cd_pflog \
-cd_pbb \
-cd_ppp \
-cd_raw4 \
-cd_raw6 \
-cd_slip \
-cd_token_ring \
-cd_wlan
-
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CFLAGS= @AM_CFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-SNORT3_CFLAGS= @SNORT3_CFLAGS@
diff --git a/extra/src/codecs/cd_eapol/Makefile.am b/extra/src/codecs/cd_eapol/Makefile.am
deleted file mode 100644 (file)
index 2990eb3..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cd_eapollibdir = $(pkglibdir)/codecs
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-cd_eapollib_LTLIBRARIES = cd_eapol.la
-cd_eapol_la_CXXFLAGS = $(AM_CXXFLAGS)
-cd_eapol_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-cd_eapol_la_SOURCES  = cd_eapol.cc
diff --git a/extra/src/codecs/cd_linux_sll/Makefile.am b/extra/src/codecs/cd_linux_sll/Makefile.am
deleted file mode 100644 (file)
index 94dedd1..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cd_linux_slllibdir = $(pkglibdir)/codecs
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-cd_linux_slllib_LTLIBRARIES = cd_linux_sll.la
-cd_linux_sll_la_CXXFLAGS = $(AM_CXXFLAGS)
-cd_linux_sll_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-cd_linux_sll_la_SOURCES  = cd_linux_sll.cc
diff --git a/extra/src/codecs/cd_null/Makefile.am b/extra/src/codecs/cd_null/Makefile.am
deleted file mode 100644 (file)
index b0d8f6d..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cd_nulllibdir = $(pkglibdir)/codecs
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-cd_nulllib_LTLIBRARIES = cd_null.la
-cd_null_la_CXXFLAGS = $(AM_CXXFLAGS)
-cd_null_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-cd_null_la_SOURCES  = cd_null.cc
diff --git a/extra/src/codecs/cd_pbb/Makefile.am b/extra/src/codecs/cd_pbb/Makefile.am
deleted file mode 100644 (file)
index 4a7c980..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cd_pbblibdir = $(pkglibdir)/codecs
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-cd_pbblib_LTLIBRARIES = cd_pbb.la
-cd_pbb_la_CXXFLAGS = $(AM_CXXFLAGS)
-cd_pbb_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-cd_pbb_la_SOURCES  = cd_pbb.cc
diff --git a/extra/src/codecs/cd_pflog/Makefile.am b/extra/src/codecs/cd_pflog/Makefile.am
deleted file mode 100644 (file)
index 8ab8449..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cd_pfloglibdir = $(pkglibdir)/codecs
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-cd_pfloglib_LTLIBRARIES = cd_pflog.la
-cd_pflog_la_CXXFLAGS = $(AM_CXXFLAGS)
-cd_pflog_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-cd_pflog_la_SOURCES  = cd_pflog.cc
diff --git a/extra/src/codecs/cd_ppp/Makefile.am b/extra/src/codecs/cd_ppp/Makefile.am
deleted file mode 100644 (file)
index 66609f3..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cd_ppplibdir = $(pkglibdir)/codecs
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-cd_ppplib_LTLIBRARIES = cd_ppp.la
-cd_ppp_la_CXXFLAGS = $(AM_CXXFLAGS)
-cd_ppp_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-cd_ppp_la_SOURCES  = cd_ppp.cc
diff --git a/extra/src/codecs/cd_raw4/Makefile.am b/extra/src/codecs/cd_raw4/Makefile.am
deleted file mode 100644 (file)
index 3822fac..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cd_raw4libdir = $(pkglibdir)/codecs
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-cd_raw4lib_LTLIBRARIES = cd_raw4.la
-cd_raw4_la_CXXFLAGS = $(AM_CXXFLAGS)
-cd_raw4_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-cd_raw4_la_SOURCES  = cd_raw4.cc
diff --git a/extra/src/codecs/cd_raw6/Makefile.am b/extra/src/codecs/cd_raw6/Makefile.am
deleted file mode 100644 (file)
index a95053d..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cd_raw6libdir = $(pkglibdir)/codecs
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-cd_raw6lib_LTLIBRARIES = cd_raw6.la
-cd_raw6_la_CXXFLAGS = $(AM_CXXFLAGS)
-cd_raw6_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-cd_raw6_la_SOURCES  = cd_raw6.cc
diff --git a/extra/src/codecs/cd_slip/Makefile.am b/extra/src/codecs/cd_slip/Makefile.am
deleted file mode 100644 (file)
index 44f29c1..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cd_sliplibdir = $(pkglibdir)/codecs
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-cd_sliplib_LTLIBRARIES = cd_slip.la
-cd_slip_la_CXXFLAGS = $(AM_CXXFLAGS)
-cd_slip_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-cd_slip_la_SOURCES  = cd_slip.cc
diff --git a/extra/src/codecs/cd_token_ring/Makefile.am b/extra/src/codecs/cd_token_ring/Makefile.am
deleted file mode 100644 (file)
index 0877593..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cd_token_ringlibdir = $(pkglibdir)/codecs
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-cd_token_ringlib_LTLIBRARIES = cd_token_ring.la
-cd_token_ring_la_CXXFLAGS = $(AM_CXXFLAGS)
-cd_token_ring_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-cd_token_ring_la_SOURCES  = cd_token_ring.cc
diff --git a/extra/src/codecs/cd_wlan/Makefile.am b/extra/src/codecs/cd_wlan/Makefile.am
deleted file mode 100644 (file)
index e3e6c53..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cd_wlanlibdir = $(pkglibdir)/codecs
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-cd_wlanlib_LTLIBRARIES = cd_wlan.la
-cd_wlan_la_CXXFLAGS = $(AM_CXXFLAGS)
-cd_wlan_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-cd_wlan_la_SOURCES  = cd_wlan.cc
diff --git a/extra/src/daqs/Makefile.am b/extra/src/daqs/Makefile.am
deleted file mode 100644 (file)
index 52e41c9..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS = \
-daq_socket \
-daq_regtest
-
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-
-#SNORT3_CFLAGS = @SNORT3_CFLAGS@
-
diff --git a/extra/src/daqs/daq_regtest/Makefile.am b/extra/src/daqs/daq_regtest/Makefile.am
deleted file mode 100644 (file)
index 440984c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-daq_regtestlibdir = $(pkglibdir)/daqs
-
-AM_CFLAGS   = @SNORT3_CFLAGS@ -std=gnu99
-
-daq_regtestlib_LTLIBRARIES = daq_regtest.la
-daq_regtest_la_CFLAGS   = $(AM_CFLAGS)
-daq_regtest_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-daq_regtest_la_SOURCES  = daq_regtest.c
diff --git a/extra/src/daqs/daq_socket/Makefile.am b/extra/src/daqs/daq_socket/Makefile.am
deleted file mode 100644 (file)
index 4ced902..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-daq_socketlibdir = $(pkglibdir)/daqs
-
-AM_CFLAGS   = @SNORT3_CFLAGS@ -std=gnu99
-
-daq_socketlib_LTLIBRARIES = daq_socket.la
-daq_socket_la_CFLAGS   = $(AM_CFLAGS)
-daq_socket_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-daq_socket_la_SOURCES  = daq_socket.c
diff --git a/extra/src/inspectors/Makefile.am b/extra/src/inspectors/Makefile.am
deleted file mode 100644 (file)
index 56a393b..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-SUBDIRS = \
-data_log \
-dpx \
-reg_test
-
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CFLAGS= @AM_CFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-SNORT3_CFLAGS= @SNORT3_CFLAGS@
diff --git a/extra/src/inspectors/data_log/Makefile.am b/extra/src/inspectors/data_log/Makefile.am
deleted file mode 100644 (file)
index 11eba96..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-data_loglibdir = $(pkglibdir)/inspectors
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-data_loglib_LTLIBRARIES = data_log.la
-data_log_la_CXXFLAGS = $(AM_CXXFLAGS)
-data_log_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-data_log_la_SOURCES  = data_log.cc
diff --git a/extra/src/inspectors/dpx/Makefile.am b/extra/src/inspectors/dpx/Makefile.am
deleted file mode 100644 (file)
index dbd2a05..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-dpxlibdir = $(pkglibdir)/inspectors
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-dpxlib_LTLIBRARIES = dpx.la
-dpx_la_CXXFLAGS = $(AM_CXXFLAGS)
-dpx_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-dpx_la_SOURCES  = dpx.cc
diff --git a/extra/src/inspectors/reg_test/Makefile.am b/extra/src/inspectors/reg_test/Makefile.am
deleted file mode 100644 (file)
index 50c503c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-reg_testlibdir = $(pkglibdir)/inspectors
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-reg_testlib_LTLIBRARIES = reg_test.la
-reg_test_la_CXXFLAGS = $(AM_CXXFLAGS)
-reg_test_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-reg_test_la_SOURCES  = reg_test.cc
diff --git a/extra/src/ips_options/Makefile.am b/extra/src/ips_options/Makefile.am
deleted file mode 100644 (file)
index ef987c5..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-SUBDIRS = \
-find \
-ips_pkt_num \
-ips_mss \
-ips_urg \
-ips_wscale
-
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CFLAGS= @AM_CFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-SNORT3_CFLAGS= @SNORT3_CFLAGS@
diff --git a/extra/src/ips_options/find/Makefile.am b/extra/src/ips_options/find/Makefile.am
deleted file mode 100644 (file)
index 26a9769..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-findlibdir = $(pkglibdir)/ips_options
-
-dist_findlib_SCRIPTS = find.lua
index 56cd1844cf9f91b2444335dabce24de8aa4fbc65..5f4f6c3fc05b97d677c23d72eee2030b7b0e1d1c 100755 (executable)
@@ -5,7 +5,7 @@
 --
 -- configure snort with
 --
---     ./configure --prefix my/prefix
+--     ./configure_cmake.sh --prefix=my/prefix
 --
 -- then set up the path as follows:
 --
diff --git a/extra/src/ips_options/ips_mss/Makefile.am b/extra/src/ips_options/ips_mss/Makefile.am
deleted file mode 100644 (file)
index cc1c295..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-ips_msslibdir = $(pkglibdir)/ips_options
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-ips_msslib_LTLIBRARIES = ips_mss.la
-ips_mss_la_CXXFLAGS = $(AM_CXXFLAGS)
-ips_mss_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-ips_mss_la_SOURCES  = ips_mss.cc
diff --git a/extra/src/ips_options/ips_pkt_num/Makefile.am b/extra/src/ips_options/ips_pkt_num/Makefile.am
deleted file mode 100644 (file)
index f0d7a03..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-ips_pkt_numlibdir = $(pkglibdir)/ips_options
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-ips_pkt_numlib_LTLIBRARIES = ips_pkt_num.la
-ips_pkt_num_la_CXXFLAGS = $(AM_CXXFLAGS)
-ips_pkt_num_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-ips_pkt_num_la_SOURCES  = ips_pkt_num.cc
diff --git a/extra/src/ips_options/ips_urg/Makefile.am b/extra/src/ips_options/ips_urg/Makefile.am
deleted file mode 100644 (file)
index 42f2090..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-ips_urglibdir = $(pkglibdir)/ips_options
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-ips_urglib_LTLIBRARIES = ips_urg.la
-ips_urg_la_CXXFLAGS = $(AM_CXXFLAGS)
-ips_urg_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-ips_urg_la_SOURCES  = ips_urg.cc
diff --git a/extra/src/ips_options/ips_wscale/Makefile.am b/extra/src/ips_options/ips_wscale/Makefile.am
deleted file mode 100644 (file)
index a1bfc09..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-ips_wscalelibdir = $(pkglibdir)/ips_options
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-ips_wscalelib_LTLIBRARIES = ips_wscale.la
-ips_wscale_la_CXXFLAGS = $(AM_CXXFLAGS)
-ips_wscale_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-ips_wscale_la_SOURCES  = ips_wscale.cc
diff --git a/extra/src/loggers/Makefile.am b/extra/src/loggers/Makefile.am
deleted file mode 100644 (file)
index 035f988..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-SUBDIRS = \
-alert_ex \
-alert_json \
-alert_lua \
-alert_unixsock \
-log_null
-
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CFLAGS= @AM_CFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-SNORT3_CFLAGS= @SNORT3_CFLAGS@
diff --git a/extra/src/loggers/alert_ex/Makefile.am b/extra/src/loggers/alert_ex/Makefile.am
deleted file mode 100644 (file)
index d89743f..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-alert_exlibdir = $(pkglibdir)/loggers
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-alert_exlib_LTLIBRARIES = alert_ex.la
-alert_ex_la_CXXFLAGS = $(AM_CXXFLAGS)
-alert_ex_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-alert_ex_la_SOURCES  = alert_ex.cc
diff --git a/extra/src/loggers/alert_json/Makefile.am b/extra/src/loggers/alert_json/Makefile.am
deleted file mode 100644 (file)
index 649fcb2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-alert_jsonlibdir = $(pkglibdir)/loggers
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-alert_jsonlib_LTLIBRARIES = alert_json.la
-alert_json_la_CXXFLAGS = $(AM_CXXFLAGS)
-alert_json_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-alert_json_la_SOURCES  = alert_json.cc
diff --git a/extra/src/loggers/alert_lua/Makefile.am b/extra/src/loggers/alert_lua/Makefile.am
deleted file mode 100644 (file)
index 0c34243..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-alert_lualibdir = $(pkglibdir)/loggers
-
-dist_alert_lualib_SCRIPTS = alert.lua
index 03476b9d50a957d348271e3f2eb434363c519eab..511c89ccd85deb714af73d7e081527acbc583da4 100755 (executable)
@@ -5,7 +5,7 @@
 --
 -- configure snort with
 --
---     ./configure --prefix my/prefix
+--     ./configure_cmake.sh --prefix=my/prefix
 --
 -- then set up the path as follows:
 --
diff --git a/extra/src/loggers/alert_unixsock/Makefile.am b/extra/src/loggers/alert_unixsock/Makefile.am
deleted file mode 100644 (file)
index 34bf518..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-alert_unixsocklibdir = $(pkglibdir)/loggers
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-alert_unixsocklib_LTLIBRARIES = alert_unixsock.la
-alert_unixsock_la_CXXFLAGS = $(AM_CXXFLAGS)
-alert_unixsock_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-alert_unixsock_la_SOURCES  = alert_unixsock.cc
diff --git a/extra/src/loggers/log_null/Makefile.am b/extra/src/loggers/log_null/Makefile.am
deleted file mode 100644 (file)
index e66b70f..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-log_nulllibdir = $(pkglibdir)/loggers
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-log_nulllib_LTLIBRARIES = log_null.la
-log_null_la_CXXFLAGS = $(AM_CXXFLAGS)
-log_null_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-log_null_la_SOURCES  = log_null.cc
diff --git a/extra/src/search_engines/Makefile.am b/extra/src/search_engines/Makefile.am
deleted file mode 100644 (file)
index f60e0cc..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS = \
-lowmem
-
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CFLAGS= @AM_CFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-SNORT3_CFLAGS= @SNORT3_CFLAGS@
diff --git a/extra/src/search_engines/lowmem/Makefile.am b/extra/src/search_engines/lowmem/Makefile.am
deleted file mode 100644 (file)
index de2a3b7..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-lowmemlibdir = $(pkglibdir)/search_engines
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-lowmemlib_LTLIBRARIES = lowmem.la
-lowmem_la_CXXFLAGS = $(AM_CXXFLAGS)
-lowmem_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-lowmem_la_SOURCES  = lowmem.cc sfksearch.cc sfksearch.h trie_api.cc
diff --git a/extra/src/so_rules/Makefile.am b/extra/src/so_rules/Makefile.am
deleted file mode 100644 (file)
index 2ad4995..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS = \
-sid_18758
-
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CFLAGS= @AM_CFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-SNORT3_CFLAGS= @SNORT3_CFLAGS@
diff --git a/extra/src/so_rules/sid_18758/Makefile.am b/extra/src/so_rules/sid_18758/Makefile.am
deleted file mode 100644 (file)
index 6c7d02f..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-sid_18758libdir = $(pkglibdir)/so_rules
-
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-
-sid_18758lib_LTLIBRARIES = sid_18758.la
-sid_18758_la_CXXFLAGS = $(AM_CXXFLAGS)
-sid_18758_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-sid_18758_la_SOURCES  = sid_18758.cc sid_18758.h
-
-EXTRA_DIST = sid_18758.txt
diff --git a/extra/templates/Makefile.am.erb b/extra/templates/Makefile.am.erb
deleted file mode 100644 (file)
index 520b7b9..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<%= @project.libname %>libdir = $(pkglibdir)/<%= @project.dirname %>
-%if !@project.sources.empty?
-
-%if @project.language == "CXX"
-AM_CXXFLAGS = @SNORT3_CFLAGS@ -std=c++11
-%elsif @project.language == "C"
-AM_CFLAGS   = @SNORT3_CFLAGS@ -std=gnu99
-%end
-
-<%= @project.libname %>lib_LTLIBRARIES = <%= @project.libname %>.la
-%if @project.language == "CXX"
-<%= @project.libname %>_la_CXXFLAGS = $(AM_CXXFLAGS)
-%elsif @project.language == "C"
-<%= @project.libname %>_la_CFLAGS   = $(AM_CFLAGS)
-%end
-<%= @project.libname %>_la_LDFLAGS  = -module -export-dynamic -avoid-version -shared
-<%= @project.libname %>_la_SOURCES  =<% for source in @project.sources %> <%= source %><% end %>
-%end
-%if !@project.scripts.empty?
-
-dist_<%= @project.libname %>lib_SCRIPTS =<% for script in @project.scripts %> <%= script %><% end %>
-%end
-% if !@project.miscs.empty?
-
-EXTRA_DIST =<% for misc in @project.miscs %> <%= misc %><% end %>
-%end
diff --git a/lua/Makefile.am b/lua/Makefile.am
deleted file mode 100644 (file)
index 4b9387c..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-x_includedir = $(sysconfdir)/snort
-
-x_include_HEADERS = \
-file_magic.lua \
-snort.lua \
-snort_defaults.lua
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
deleted file mode 100644 (file)
index ca36397..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's compiler
-#   or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
-  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/m4/ax_check_link_flag.m4 b/m4/ax_check_link_flag.m4
deleted file mode 100644 (file)
index eb01a6c..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the linker or gives an error.
-#   (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
-#   when the check is done.  The check is thus made with the flags: "LDFLAGS
-#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
-#   issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_LINK_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_CHECK_LINK_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
-AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS $4 $1"
-  AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  LDFLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_LINK_FLAGS
diff --git a/m4/ax_check_preproc_flag.m4 b/m4/ax_check_preproc_flag.m4
deleted file mode 100644 (file)
index ca1d5ee..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_preproc_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_PREPROC_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's
-#   preprocessor or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the preprocessor's default
-#   flags when the check is done.  The check is thus made with the flags:
-#   "CPPFLAGS EXTRA-FLAGS FLAG".  This can for example be used to force the
-#   preprocessor to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_PREPROC_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{COMPILE,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_CHECK_PREPROC_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]cppflags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG preprocessor accepts $1], CACHEVAR, [
-  ax_check_save_flags=$CPPFLAGS
-  CPPFLAGS="$CPPFLAGS $4 $1"
-  AC_PREPROC_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  CPPFLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_PREPROC_FLAGS
diff --git a/m4/ax_code_coverage.m4 b/m4/ax_code_coverage.m4
deleted file mode 100644 (file)
index 5793e4a..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-# ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_code_coverage.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CODE_COVERAGE()
-#
-# DESCRIPTION
-#
-#   Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS,
-#   CODE_COVERAGE_CXXFLAGS and CODE_COVERAGE_LIBS which should be included
-#   in the CPPFLAGS, CFLAGS CXXFLAGS and LIBS/LIBADD variables of every
-#   build target (program or library) which should be built with code
-#   coverage support. Also defines CODE_COVERAGE_RULES which should be
-#   substituted in your Makefile; and $enable_code_coverage which can be
-#   used in subsequent configure output. CODE_COVERAGE_ENABLED is defined
-#   and substituted, and corresponds to the value of the
-#   --enable-code-coverage option, which defaults to being disabled.
-#
-#   Test also for gcov program and create GCOV variable that could be
-#   substituted.
-#
-#   Note that all optimisation flags in CFLAGS must be disabled when code
-#   coverage is enabled.
-#
-#   Usage example:
-#
-#   configure.ac:
-#
-#     AX_CODE_COVERAGE
-#
-#   Makefile.am:
-#
-#     @CODE_COVERAGE_RULES@
-#     my_program_LIBS = ... $(CODE_COVERAGE_LIBS) ...
-#     my_program_CPPFLAGS = ... $(CODE_COVERAGE_CPPFLAGS) ...
-#     my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ...
-#     my_program_CXXFLAGS = ... $(CODE_COVERAGE_CXXFLAGS) ...
-#
-#   This results in a "check-code-coverage" rule being added to any
-#   Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module
-#   has been configured with --enable-code-coverage). Running `make
-#   check-code-coverage` in that directory will run the module's test suite
-#   (`make check`) and build a code coverage report detailing the code which
-#   was touched, then print the URI for the report.
-#
-#   In earlier versions of this macro, CODE_COVERAGE_LDFLAGS was defined
-#   instead of CODE_COVERAGE_LIBS. They are both still defined, but use of
-#   CODE_COVERAGE_LIBS is preferred for clarity; CODE_COVERAGE_LDFLAGS is
-#   deprecated. They have the same value.
-#
-#   This code was derived from Makefile.decl in GLib, originally licenced
-#   under LGPLv2.1+.
-#
-# LICENSE
-#
-#   Copyright (c) 2012, 2016 Philip Withnall
-#   Copyright (c) 2012 Xan Lopez
-#   Copyright (c) 2012 Christian Persch
-#   Copyright (c) 2012 Paolo Borelli
-#   Copyright (c) 2012 Dan Winship
-#   Copyright (c) 2015 Bastien ROUCARIES
-#
-#   This library is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation; either version 2.1 of the License, or (at
-#   your option) any later version.
-#
-#   This library is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#serial 20
-
-AC_DEFUN([AX_CODE_COVERAGE],[
-       dnl Check for --enable-code-coverage
-       AC_REQUIRE([AC_PROG_SED])
-
-       # allow to override gcov location
-       AC_ARG_WITH([gcov],
-         [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])],
-         [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov],
-         [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov])
-
-       AC_MSG_CHECKING([whether to build with code coverage support])
-       AC_ARG_ENABLE([code-coverage],
-         AS_HELP_STRING([--enable-code-coverage],
-         [Whether to enable code coverage support]),,
-         enable_code_coverage=no)
-
-       AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes])
-       AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
-       AC_MSG_RESULT($enable_code_coverage)
-
-       AS_IF([ test "$enable_code_coverage" = "yes" ], [
-               # check for gcov
-               AC_CHECK_TOOL([GCOV],
-                 [$_AX_CODE_COVERAGE_GCOV_PROG_WITH],
-                 [:])
-               AS_IF([test "X$GCOV" = "X:"],
-                 [AC_MSG_ERROR([gcov is needed to do coverage])])
-               AC_SUBST([GCOV])
-
-               dnl Check if gcc is being used
-               AS_IF([ test "$GCC" = "no" ], [
-                       AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
-               ])
-
-               AC_CHECK_PROG([LCOV], [lcov], [lcov])
-               AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
-
-               AS_IF([ test -z "$LCOV" ], [
-                       AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed])
-               ])
-
-               AS_IF([ test -z "$GENHTML" ], [
-                       AC_MSG_ERROR([Could not find genhtml from the lcov package])
-               ])
-
-               dnl Build the code coverage flags
-               dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility
-               dnl Snort++ - removing -DNDEBUG from CODE_COVERAGE_CPPFLAGS for now
-               dnl CODE_COVERAGE_CPPFLAGS="-DNDEBUG"
-               CODE_COVERAGE_CPPFLAGS=""
-               CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-               CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-               CODE_COVERAGE_LIBS="-lgcov"
-               CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS"
-
-               AC_SUBST([CODE_COVERAGE_CPPFLAGS])
-               AC_SUBST([CODE_COVERAGE_CFLAGS])
-               AC_SUBST([CODE_COVERAGE_CXXFLAGS])
-               AC_SUBST([CODE_COVERAGE_LIBS])
-               AC_SUBST([CODE_COVERAGE_LDFLAGS])
-
-               [CODE_COVERAGE_RULES_CHECK='
-       -$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check
-       $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
-']
-               [CODE_COVERAGE_RULES_CAPTURE='
-       $(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS)
-       $(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS)
-       -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
-       $(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
-       @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
-']
-               [CODE_COVERAGE_RULES_CLEAN='
-clean: code-coverage-clean
-distclean: code-coverage-clean
-code-coverage-clean:
-       -$(LCOV) --directory $(top_builddir) -z
-       -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
-       -find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
-']
-       ], [
-               [CODE_COVERAGE_RULES_CHECK='
-       @echo "Need to reconfigure with --enable-code-coverage"
-']
-               CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK"
-               CODE_COVERAGE_RULES_CLEAN=''
-       ])
-
-[CODE_COVERAGE_RULES='
-# Code coverage
-#
-# Optional:
-#  - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting.
-#    Multiple directories may be specified, separated by whitespace.
-#    (Default: $(top_builddir))
-#  - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated
-#    by lcov for code coverage. (Default:
-#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info)
-#  - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage
-#    reports to be created. (Default:
-#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage)
-#  - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage,
-#    set to 0 to disable it and leave empty to stay with the default.
-#    (Default: empty)
-#  - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov
-#    instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
-#  - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov
-#    instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
-#  - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov
-#  - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the
-#    collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
-#  - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov
-#    instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
-#  - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering
-#    lcov instance. (Default: empty)
-#  - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov
-#    instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
-#  - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the
-#    genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
-#  - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml
-#    instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
-#  - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore
-#
-# The generated report will be titled using the $(PACKAGE_NAME) and
-# $(PACKAGE_VERSION). In order to add the current git hash to the title,
-# use the git-version-gen script, available online.
-
-# Optional variables
-CODE_COVERAGE_DIRECTORY ?= $(top_builddir)
-CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info
-CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage
-CODE_COVERAGE_BRANCH_COVERAGE ?=
-CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
---rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
-CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
-CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)"
-CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
-CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
-CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?=
-CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
-CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\
-$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
---rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
-CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULTS)
-CODE_COVERAGE_IGNORE_PATTERN ?=
-
-code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V))
-code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_lcov_cap_0 = @echo "  LCOV   --capture"\
- $(CODE_COVERAGE_OUTPUT_FILE);
-code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V))
-code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_lcov_ign_0 = @echo "  LCOV   --remove /tmp/*"\
- $(CODE_COVERAGE_IGNORE_PATTERN);
-code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V))
-code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_genhtml_0 = @echo "  GEN   " $(CODE_COVERAGE_OUTPUT_DIRECTORY);
-code_coverage_quiet = $(code_coverage_quiet_$(V))
-code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY))
-code_coverage_quiet_0 = --quiet
-
-# sanitizes the test-name: replaces with underscores: dashes and dots
-code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1)))
-
-# Use recursive makes in order to ignore errors during check
-check-code-coverage:'"$CODE_COVERAGE_RULES_CHECK"'
-
-# Capture code coverage data
-code-coverage-capture: code-coverage-capture-hook'"$CODE_COVERAGE_RULES_CAPTURE"'
-
-# Hook rule executed before code-coverage-capture, overridable by the user
-code-coverage-capture-hook:
-
-'"$CODE_COVERAGE_RULES_CLEAN"'
-
-GITIGNOREFILES ?=
-GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
-
-A''M_DISTCHECK_CONFIGURE_FLAGS ?=
-A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
-
-.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean
-']
-
-       AC_SUBST([CODE_COVERAGE_RULES])
-       m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])])
-])
diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
deleted file mode 100644 (file)
index b61fcb6..0000000
+++ /dev/null
@@ -1,982 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
-#   or '14' (for the C++14 standard).
-#
-#   The second argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The third argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline support for the specified C++ standard is
-#   required and that the macro should error out if no mode with that
-#   support is found.  If specified 'optional', then configuration proceeds
-#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-#   supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#   Copyright (c) 2016 Krzesimir Nowak <qdlacz@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 6
-
-dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-dnl  (serial version number 13).
-
-AX_REQUIRE_DEFINED([AC_MSG_WARN])
-AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
-        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
-        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
-        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$2], [], [],
-        [$2], [ext], [],
-        [$2], [noext], [],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-  ax_cv_cxx_compile_cxx$1,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-    [ax_cv_cxx_compile_cxx$1=yes],
-    [ax_cv_cxx_compile_cxx$1=no])])
-  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$2], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      switch="-std=gnu++${alternative}"
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$2], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    dnl HP's aCC needs +std=c++11 according to:
-    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-    dnl Cray's crayCC needs "-h std=c++11"
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                       $cachevar,
-          [ac_save_CXX="$CXX"
-           CXX="$CXX $switch"
-           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-            [eval $cachevar=yes],
-            [eval $cachevar=no])
-           CXX="$ac_save_CXX"])
-        if eval test x\$$cachevar = xyes; then
-          CXX="$CXX $switch"
-          if test -n "$CXXCPP" ; then
-            CXXCPP="$CXXCPP $switch"
-          fi
-          ac_success=yes
-          break
-        fi
-      done
-      if test x$ac_success = xyes; then
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-    fi
-  fi
-  if test x$ac_success = xno; then
-    HAVE_CXX$1=0
-    AC_MSG_NOTICE([No compiler with C++$1 support was found])
-  else
-    HAVE_CXX$1=1
-    AC_DEFINE(HAVE_CXX$1,1,
-              [define if the compiler supports basic C++$1 syntax])
-  fi
-  AC_SUBST(HAVE_CXX$1)
-  m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])])
-])
-
-
-dnl  Test body for checking C++11 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-)
-
-
-dnl  Test body for checking C++14 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-)
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-)
-
-dnl  Tests for new features in C++11
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
-  namespace test_static_assert
-  {
-
-    template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-  }
-
-  namespace test_final_override
-  {
-
-    struct Base
-    {
-      virtual void f() {}
-    };
-
-    struct Derived : public Base
-    {
-      virtual void f() override {}
-    };
-
-  }
-
-  namespace test_double_right_angle_brackets
-  {
-
-    template < typename T >
-    struct check {};
-
-    typedef check<void> single_type;
-    typedef check<check<void>> double_type;
-    typedef check<check<check<void>>> triple_type;
-    typedef check<check<check<check<void>>>> quadruple_type;
-
-  }
-
-  namespace test_decltype
-  {
-
-    int
-    f()
-    {
-      int a = 1;
-      decltype(a) b = 2;
-      return a + b;
-    }
-
-  }
-
-  namespace test_type_deduction
-  {
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static const bool value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static const bool value = true;
-    };
-
-    template < typename T1, typename T2 >
-    auto
-    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-    {
-      return a1 + a2;
-    }
-
-    int
-    test(const int c, volatile int v)
-    {
-      static_assert(is_same<int, decltype(0)>::value == true, "");
-      static_assert(is_same<int, decltype(c)>::value == false, "");
-      static_assert(is_same<int, decltype(v)>::value == false, "");
-      auto ac = c;
-      auto av = v;
-      auto sumi = ac + av + 'x';
-      auto sumf = ac + av + 1.0;
-      static_assert(is_same<int, decltype(ac)>::value == true, "");
-      static_assert(is_same<int, decltype(av)>::value == true, "");
-      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-      return (sumf > 0.0) ? sumi : add(c, v);
-    }
-
-  }
-
-  namespace test_noexcept
-  {
-
-    int f() { return 0; }
-    int g() noexcept { return 0; }
-
-    static_assert(noexcept(f()) == false, "");
-    static_assert(noexcept(g()) == true, "");
-
-  }
-
-  namespace test_constexpr
-  {
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-    {
-      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-    }
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c(const CharT *const s) noexcept
-    {
-      return strlen_c_r(s, 0UL);
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("1") == 1UL, "");
-    static_assert(strlen_c("example") == 7UL, "");
-    static_assert(strlen_c("another\0example") == 7UL, "");
-
-  }
-
-  namespace test_rvalue_references
-  {
-
-    template < int N >
-    struct answer
-    {
-      static constexpr int value = N;
-    };
-
-    answer<1> f(int&)       { return answer<1>(); }
-    answer<2> f(const int&) { return answer<2>(); }
-    answer<3> f(int&&)      { return answer<3>(); }
-
-    void
-    test()
-    {
-      int i = 0;
-      const int c = 0;
-      static_assert(decltype(f(i))::value == 1, "");
-      static_assert(decltype(f(c))::value == 2, "");
-      static_assert(decltype(f(0))::value == 3, "");
-    }
-
-  }
-
-  namespace test_uniform_initialization
-  {
-
-    struct test
-    {
-      static const int zero {};
-      static const int one {1};
-    };
-
-    static_assert(test::zero == 0, "");
-    static_assert(test::one == 1, "");
-
-  }
-
-  namespace test_lambdas
-  {
-
-    void
-    test1()
-    {
-      auto lambda1 = [](){};
-      auto lambda2 = lambda1;
-      lambda1();
-      lambda2();
-    }
-
-    int
-    test2()
-    {
-      auto a = [](int i, int j){ return i + j; }(1, 2);
-      auto b = []() -> int { return '0'; }();
-      auto c = [=](){ return a + b; }();
-      auto d = [&](){ return c; }();
-      auto e = [a, &b](int x) mutable {
-        const auto identity = [](int y){ return y; };
-        for (auto i = 0; i < a; ++i)
-          a += b--;
-        return x + identity(a + b);
-      }(0);
-      return a + b + c + d + e;
-    }
-
-    int
-    test3()
-    {
-      const auto nullary = [](){ return 0; };
-      const auto unary = [](int x){ return x; };
-      using nullary_t = decltype(nullary);
-      using unary_t = decltype(unary);
-      const auto higher1st = [](nullary_t f){ return f(); };
-      const auto higher2nd = [unary](nullary_t f1){
-        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-      };
-      return higher1st(nullary) + higher2nd(nullary)(unary);
-    }
-
-  }
-
-  namespace test_variadic_templates
-  {
-
-    template <int...>
-    struct sum;
-
-    template <int N0, int... N1toN>
-    struct sum<N0, N1toN...>
-    {
-      static constexpr auto value = N0 + sum<N1toN...>::value;
-    };
-
-    template <>
-    struct sum<>
-    {
-      static constexpr auto value = 0;
-    };
-
-    static_assert(sum<>::value == 0, "");
-    static_assert(sum<1>::value == 1, "");
-    static_assert(sum<23>::value == 23, "");
-    static_assert(sum<1, 2>::value == 3, "");
-    static_assert(sum<5, 5, 11>::value == 21, "");
-    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
-  }
-
-  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-  // because of this.
-  namespace test_template_alias_sfinae
-  {
-
-    struct foo {};
-
-    template<typename T>
-    using member = typename T::member_type;
-
-    template<typename T>
-    void func(...) {}
-
-    template<typename T>
-    void func(member<T>*) {}
-
-    void test();
-
-    void test() { func<foo>(0); }
-
-  }
-
-}  // namespace cxx11
-
-#endif  // __cplusplus >= 201103L
-
-]])
-
-
-dnl  Tests for new features in C++14
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201402L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
-  namespace test_polymorphic_lambdas
-  {
-
-    int
-    test()
-    {
-      const auto lambda = [](auto&&... args){
-        const auto istiny = [](auto x){
-          return (sizeof(x) == 1UL) ? 1 : 0;
-        };
-        const int aretiny[] = { istiny(args)... };
-        return aretiny[0];
-      };
-      return lambda(1, 1L, 1.0f, '1');
-    }
-
-  }
-
-  namespace test_binary_literals
-  {
-
-    constexpr auto ivii = 0b0000000000101010;
-    static_assert(ivii == 42, "wrong value");
-
-  }
-
-  namespace test_generalized_constexpr
-  {
-
-    template < typename CharT >
-    constexpr unsigned long
-    strlen_c(const CharT *const s) noexcept
-    {
-      auto length = 0UL;
-      for (auto p = s; *p; ++p)
-        ++length;
-      return length;
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("x") == 1UL, "");
-    static_assert(strlen_c("test") == 4UL, "");
-    static_assert(strlen_c("another\0test") == 7UL, "");
-
-  }
-
-  namespace test_lambda_init_capture
-  {
-
-    int
-    test()
-    {
-      auto x = 0;
-      const auto lambda1 = [a = x](int b){ return a + b; };
-      const auto lambda2 = [a = lambda1(x)](){ return a; };
-      return lambda2();
-    }
-
-  }
-
-  namespace test_digit_separators
-  {
-
-    constexpr auto ten_million = 100'000'000;
-    static_assert(ten_million == 100000000, "");
-
-  }
-
-  namespace test_return_type_deduction
-  {
-
-    auto f(int& x) { return x; }
-    decltype(auto) g(int& x) { return x; }
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static constexpr auto value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static constexpr auto value = true;
-    };
-
-    int
-    test()
-    {
-      auto x = 0;
-      static_assert(is_same<int, decltype(f(x))>::value, "");
-      static_assert(is_same<int&, decltype(g(x))>::value, "");
-      return x;
-    }
-
-  }
-
-}  // namespace cxx14
-
-#endif  // __cplusplus >= 201402L
-
-]])
-
-
-dnl  Tests for new features in C++17
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
-
-// If the compiler admits that it is not ready for C++17, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus <= 201402L
-
-#error "This is not a C++17 compiler"
-
-#else
-
-#if defined(__clang__)
-  #define REALLY_CLANG
-#else
-  #if defined(__GNUC__)
-    #define REALLY_GCC
-  #endif
-#endif
-
-#include <initializer_list>
-#include <utility>
-#include <type_traits>
-
-namespace cxx17
-{
-
-#if !defined(REALLY_CLANG)
-  namespace test_constexpr_lambdas
-  {
-
-    // TODO: test it with clang++ from git
-
-    constexpr int foo = [](){return 42;}();
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-  namespace test::nested_namespace::definitions
-  {
-
-  }
-
-  namespace test_fold_expression
-  {
-
-    template<typename... Args>
-    int multiply(Args... args)
-    {
-      return (args * ... * 1);
-    }
-
-    template<typename... Args>
-    bool all(Args... args)
-    {
-      return (args && ...);
-    }
-
-  }
-
-  namespace test_extended_static_assert
-  {
-
-    static_assert (true);
-
-  }
-
-  namespace test_auto_brace_init_list
-  {
-
-    auto foo = {5};
-    auto bar {5};
-
-    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
-    static_assert(std::is_same<int, decltype(bar)>::value);
-  }
-
-  namespace test_typename_in_template_template_parameter
-  {
-
-    template<template<typename> typename X> struct D;
-
-  }
-
-  namespace test_fallthrough_nodiscard_maybe_unused_attributes
-  {
-
-    int f1()
-    {
-      return 42;
-    }
-
-    [[nodiscard]] int f2()
-    {
-      [[maybe_unused]] auto unused = f1();
-
-      switch (f1())
-      {
-      case 17:
-        f1();
-        [[fallthrough]];
-      case 42:
-        f1();
-      }
-      return f1();
-    }
-
-  }
-
-  namespace test_extended_aggregate_initialization
-  {
-
-    struct base1
-    {
-      int b1, b2 = 42;
-    };
-
-    struct base2
-    {
-      base2() {
-        b3 = 42;
-      }
-      int b3;
-    };
-
-    struct derived : base1, base2
-    {
-        int d;
-    };
-
-    derived d1 {{1, 2}, {}, 4};  // full initialization
-    derived d2 {{}, {}, 4};      // value-initialized bases
-
-  }
-
-  namespace test_general_range_based_for_loop
-  {
-
-    struct iter
-    {
-      int i;
-
-      int& operator* ()
-      {
-        return i;
-      }
-
-      const int& operator* () const
-      {
-        return i;
-      }
-
-      iter& operator++()
-      {
-        ++i;
-        return *this;
-      }
-    };
-
-    struct sentinel
-    {
-      int i;
-    };
-
-    bool operator== (const iter& i, const sentinel& s)
-    {
-      return i.i == s.i;
-    }
-
-    bool operator!= (const iter& i, const sentinel& s)
-    {
-      return !(i == s);
-    }
-
-    struct range
-    {
-      iter begin() const
-      {
-        return {0};
-      }
-
-      sentinel end() const
-      {
-        return {5};
-      }
-    };
-
-    void f()
-    {
-      range r {};
-
-      for (auto i : r)
-      {
-        [[maybe_unused]] auto v = i;
-      }
-    }
-
-  }
-
-  namespace test_lambda_capture_asterisk_this_by_value
-  {
-
-    struct t
-    {
-      int i;
-      int foo()
-      {
-        return [*this]()
-        {
-          return i;
-        }();
-      }
-    };
-
-  }
-
-  namespace test_enum_class_construction
-  {
-
-    enum class byte : unsigned char
-    {};
-
-    byte foo {42};
-
-  }
-
-  namespace test_constexpr_if
-  {
-
-    template <bool cond>
-    int f ()
-    {
-      if constexpr(cond)
-      {
-        return 13;
-      }
-      else
-      {
-        return 42;
-      }
-    }
-
-  }
-
-  namespace test_selection_statement_with_initializer
-  {
-
-    int f()
-    {
-      return 13;
-    }
-
-    int f2()
-    {
-      if (auto i = f(); i > 0)
-      {
-        return 3;
-      }
-
-      switch (auto i = f(); i + 4)
-      {
-      case 17:
-        return 2;
-
-      default:
-        return 1;
-      }
-    }
-
-  }
-
-#if !defined(REALLY_CLANG)
-  namespace test_template_argument_deduction_for_class_templates
-  {
-
-    // TODO: test it with clang++ from git
-
-    template <typename T1, typename T2>
-    struct pair
-    {
-      pair (T1 p1, T2 p2)
-        : m1 {p1},
-          m2 {p2}
-      {}
-
-      T1 m1;
-      T2 m2;
-    };
-
-    void f()
-    {
-      [[maybe_unused]] auto p = pair{13, 42u};
-    }
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-  namespace test_non_type_auto_template_parameters
-  {
-
-    template <auto n>
-    struct B
-    {};
-
-    B<5> b1;
-    B<'a'> b2;
-
-  }
-
-#if !defined(REALLY_CLANG)
-  namespace test_structured_bindings
-  {
-
-    // TODO: test it with clang++ from git
-
-    int arr[2] = { 1, 2 };
-    std::pair<int, int> pr = { 1, 2 };
-
-    auto f1() -> int(&)[2]
-    {
-      return arr;
-    }
-
-    auto f2() -> std::pair<int, int>&
-    {
-      return pr;
-    }
-
-    struct S
-    {
-      int x1 : 2;
-      volatile double y1;
-    };
-
-    S f3()
-    {
-      return {};
-    }
-
-    auto [ x1, y1 ] = f1();
-    auto& [ xr1, yr1 ] = f1();
-    auto [ x2, y2 ] = f2();
-    auto& [ xr2, yr2 ] = f2();
-    const auto [ x3, y3 ] = f3();
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-#if !defined(REALLY_CLANG)
-  namespace test_exception_spec_type_system
-  {
-
-    // TODO: test it with clang++ from git
-
-    struct Good {};
-    struct Bad {};
-
-    void g1() noexcept;
-    void g2();
-
-    template<typename T>
-    Bad
-    f(T*, T*);
-
-    template<typename T1, typename T2>
-    Good
-    f(T1*, T2*);
-
-    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-  namespace test_inline_variables
-  {
-
-    template<class T> void f(T)
-    {}
-
-    template<class T> inline T g(T)
-    {
-      return T{};
-    }
-
-    template<> inline void f<>(int)
-    {}
-
-    template<> int g<>(int)
-    {
-      return 5;
-    }
-
-  }
-
-}  // namespace cxx17
-
-#endif  // __cplusplus <= 201402L
-
-]])
diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4
deleted file mode 100644 (file)
index 0aadeaf..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++11
-#   standard; if necessary, add switches to CXX and CXXCPP to enable
-#   support.
-#
-#   This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
-#   macro with the version set to C++11.  The two optional arguments are
-#   forwarded literally as the second and third argument respectively.
-#   Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
-#   more information.  If you want to use this macro, you also need to
-#   download the ax_cxx_compile_stdcxx.m4 file.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 17
-
-AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])])
diff --git a/m4/iconv.m4 b/m4/iconv.m4
deleted file mode 100644 (file)
index b33ecd0..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-# iconv.m4 serial 21
-dnl Copyright (C) 2000-2002, 2007-2014, 2016-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[
-#include <stdlib.h>
-#include <iconv.h>
-         ]],
-         [[iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);]])],
-      [am_cv_func_iconv=yes])
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-#include <stdlib.h>
-#include <iconv.h>
-           ]],
-           [[iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);]])],
-        [am_cv_lib_iconv=yes]
-        [am_cv_func_iconv=yes])
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
-      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
-      dnl Solaris 10.
-      am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      am_cv_func_iconv_works=no
-      for ac_iconv_const in '' 'const'; do
-        AC_RUN_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
-#include <iconv.h>
-#include <string.h>
-
-#ifndef ICONV_CONST
-# define ICONV_CONST $ac_iconv_const
-#endif
-             ]],
-             [[int result = 0;
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 1;
-        iconv_close (cd_utf8_to_88591);
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\263";
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 2;
-        iconv_close (cd_ascii_to_88591);
-      }
-  }
-  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304";
-        static char buf[2] = { (char)0xDE, (char)0xAD };
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = 1;
-        char *outptr = buf;
-        size_t outbytesleft = 1;
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          result |= 8;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  {
-    /* Try standardized names.  */
-    iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
-    /* Try IRIX, OSF/1 names.  */
-    iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
-    /* Try AIX names.  */
-    iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
-    /* Try HP-UX names.  */
-    iconv_t cd4 = iconv_open ("utf8", "eucJP");
-    if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
-        && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
-    if (cd1 != (iconv_t)(-1))
-      iconv_close (cd1);
-    if (cd2 != (iconv_t)(-1))
-      iconv_close (cd2);
-    if (cd3 != (iconv_t)(-1))
-      iconv_close (cd3);
-    if (cd4 != (iconv_t)(-1))
-      iconv_close (cd4);
-  }
-  return result;
-]])],
-          [am_cv_func_iconv_works=yes], ,
-          [case "$host_os" in
-             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-             *)            am_cv_func_iconv_works="guessing yes" ;;
-           esac])
-        test "$am_cv_func_iconv_works" = no || break
-      done
-      LIBS="$am_save_LIBS"
-    ])
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-    AC_DEFINE([HAVE_ICONV], [1],
-      [Define if you have the iconv() function and it works.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST([LIBICONV])
-  AC_SUBST([LTLIBICONV])
-])
-
-dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
-dnl avoid warnings like
-dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl   warnings.
-m4_define([gl_iconv_AC_DEFUN],
-  m4_version_prereq([2.64],
-    [[AC_DEFUN_ONCE(
-        [$1], [$2])]],
-    [m4_ifdef([gl_00GNULIB],
-       [[AC_DEFUN_ONCE(
-           [$1], [$2])]],
-       [[AC_DEFUN(
-           [$1], [$2])]])]))
-gl_iconv_AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL([am_cv_proto_iconv], [
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-           ]],
-           [[]])],
-        [am_cv_proto_iconv_arg1=""],
-        [am_cv_proto_iconv_arg1="const"])
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([
-         $am_cv_proto_iconv])
-  else
-    dnl When compiling GNU libiconv on a system that does not have iconv yet,
-    dnl pick the POSIX compliant declaration without 'const'.
-    am_cv_proto_iconv_arg1=""
-  fi
-  AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
-    [Define as const if the declaration of iconv() needs const.])
-  dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
-  m4_ifdef([gl_ICONV_H_DEFAULTS],
-    [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
-     if test -n "$am_cv_proto_iconv_arg1"; then
-       ICONV_CONST="const"
-     fi
-    ])
-])
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
deleted file mode 100644 (file)
index 8b8a26e..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-# lib-ld.m4 serial 7
-dnl Copyright (C) 1996-2003, 2009-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
-dnl collision with libtool.m4.
-
-dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
-*)
-  acl_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-2.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-        [assume the C compiler uses GNU ld [default=no]])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-if test -n "$LD"; then
-  AC_MSG_CHECKING([for ld])
-elif test "$GCC" = yes; then
-  AC_MSG_CHECKING([for ld used by $CC])
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-if test -n "$LD"; then
-  # Let the user override the test with a path.
-  :
-else
-  AC_CACHE_VAL([acl_cv_path_LD],
-  [
-    acl_cv_path_LD= # Final result of this test
-    ac_prog=ld # Program to search in $PATH
-    if test "$GCC" = yes; then
-      # Check if gcc -print-prog-name=ld gives a path.
-      case $host in
-        *-*-mingw*)
-          # gcc leaves a trailing carriage return which upsets mingw
-          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-        *)
-          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
-      esac
-      case $acl_output in
-        # Accept absolute paths.
-        [[\\/]]* | ?:[[\\/]]*)
-          re_direlt='/[[^/]][[^/]]*/\.\./'
-          # Canonicalize the pathname of ld
-          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
-          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
-            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
-          done
-          # Got the pathname. No search in PATH is needed.
-          acl_cv_path_LD="$acl_output"
-          ac_prog=
-          ;;
-        "")
-          # If it fails, then pretend we aren't using GCC.
-          ;;
-        *)
-          # If it is relative, then search for the first ld in PATH.
-          with_gnu_ld=unknown
-          ;;
-      esac
-    fi
-    if test -n "$ac_prog"; then
-      # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-      for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
-        test -z "$ac_dir" && ac_dir=.
-        if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-          acl_cv_path_LD="$ac_dir/$ac_prog"
-          # Check to see if the program is GNU ld.  I'd rather use --version,
-          # but apparently some variants of GNU ld only accept -v.
-          # Break only if it was the GNU/non-GNU ld that we prefer.
-          case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
-            *GNU* | *'with BFD'*)
-              test "$with_gnu_ld" != no && break
-              ;;
-            *)
-              test "$with_gnu_ld" != yes && break
-              ;;
-          esac
-        fi
-      done
-      IFS="$acl_save_ifs"
-    fi
-    case $host in
-      *-*-aix*)
-        AC_EGREP_CPP([yes],
-          [#if defined __powerpc64__ || defined _ARCH_PPC64
-           yes
-           #endif
-          ],
-          [# The compiler produces 64-bit code. Add option '-b64' so that the
-           # linker groks 64-bit object files.
-           case "$acl_cv_path_LD " in
-             *" -b64 "*) ;;
-             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
-           esac
-          ], [])
-        ;;
-    esac
-  ])
-  LD="$acl_cv_path_LD"
-fi
-if test -n "$LD"; then
-  AC_MSG_RESULT([$LD])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([no acceptable ld found in \$PATH])
-fi
-AC_LIB_PROG_LD_GNU
-])
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
deleted file mode 100644 (file)
index 1ce9a5a..0000000
+++ /dev/null
@@ -1,777 +0,0 @@
-# lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ([2.54])
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  popdef([NAME])
-  popdef([Name])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. The missing-message
-dnl defaults to 'no' and may contain additional hints for the user.
-dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
-dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
-    dnl because these -l options might require -L options that are present in
-    dnl LIBS. -l options benefit only from the -L options listed before it.
-    dnl Otherwise, add it to the front of LIBS, because it may be a static
-    dnl library that depends on another static library that is present in LIBS.
-    dnl Static libraries benefit only from the static libraries listed after
-    dnl it.
-    case " $LIB[]NAME" in
-      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
-      *)       LIBS="$LIB[]NAME $LIBS" ;;
-    esac
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM([[$3]], [[$4]])],
-      [ac_cv_lib[]Name=yes],
-      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-    LIB[]NAME[]_PREFIX=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
-  popdef([NAME])
-  popdef([Name])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl   acl_libext,
-dnl   acl_shlibext,
-dnl   acl_libname_spec,
-dnl   acl_library_names_spec,
-dnl   acl_hardcode_libdir_flag_spec,
-dnl   acl_hardcode_libdir_separator,
-dnl   acl_hardcode_direct,
-dnl   acl_hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
-  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE([rpath],
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_FROMPACKAGE(name, package)
-dnl declares that libname comes from the given package. The configure file
-dnl will then not have a --with-libname-prefix option but a
-dnl --with-package-prefix option. Several libraries can come from the same
-dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
-dnl macro call that searches for libname.
-AC_DEFUN([AC_LIB_FROMPACKAGE],
-[
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  define([acl_frompackage_]NAME, [$2])
-  popdef([NAME])
-  pushdef([PACK],[$2])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  define([acl_libsinpackage_]PACKUP,
-    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
-  popdef([PACKUP])
-  popdef([PACK])
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
-dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
-  dnl Autoconf >= 2.61 supports dots in --with options.
-  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_ARG_WITH(P_A_C_K[-prefix],
-[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
-  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
-      fi
-    fi
-])
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  LIB[]NAME[]_PREFIX=
-  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
-  dnl computed. So it has to be reset here.
-  HAVE_LIB[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            dir="$additional_libdir"
-            dnl The same code as in the loop below:
-            dnl First look for a shared library.
-            if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
-              else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
-              fi
-            fi
-            dnl Then look for a static library.
-            if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  dnl First look for a shared library.
-                  if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                  dnl Then look for a static library.
-                  if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$acl_hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-  popdef([P_A_C_K])
-  popdef([PACKLIBS])
-  popdef([PACKUP])
-  popdef([PACK])
-  popdef([NAME])
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])
-
-dnl For those cases where a variable contains several -L and -l options
-dnl referring to unknown libraries and directories, this macro determines the
-dnl necessary additional linker options for the runtime path.
-dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
-dnl otherwise linking without libtool is assumed.
-AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
-[
-  AC_REQUIRE([AC_LIB_RPATH])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  $1=
-  if test "$enable_rpath" != no; then
-    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-      dnl Use an explicit option to hardcode directories into the resulting
-      dnl binary.
-      rpathdirs=
-      next=
-      for opt in $2; do
-        if test -n "$next"; then
-          dir="$next"
-          dnl No need to hardcode the standard /usr/lib.
-          if test "X$dir" != "X/usr/$acl_libdirstem" \
-             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
-            rpathdirs="$rpathdirs $dir"
-          fi
-          next=
-        else
-          case $opt in
-            -L) next=yes ;;
-            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
-                 dnl No need to hardcode the standard /usr/lib.
-                 if test "X$dir" != "X/usr/$acl_libdirstem" \
-                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
-                   rpathdirs="$rpathdirs $dir"
-                 fi
-                 next= ;;
-            *) next= ;;
-          esac
-        fi
-      done
-      if test "X$rpathdirs" != "X"; then
-        if test -n ""$3""; then
-          dnl libtool is used for linking. Use -R options.
-          for dir in $rpathdirs; do
-            $1="${$1}${$1:+ }-R$dir"
-          done
-        else
-          dnl The linker is used for linking directly.
-          if test -n "$acl_hardcode_libdir_separator"; then
-            dnl Weird platform: only the last -rpath option counts, the user
-            dnl must pass all path elements in one option.
-            alldirs=
-            for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
-            done
-            acl_save_libdir="$libdir"
-            libdir="$alldirs"
-            eval flag=\"$acl_hardcode_libdir_flag_spec\"
-            libdir="$acl_save_libdir"
-            $1="$flag"
-          else
-            dnl The -rpath options are cumulative.
-            for dir in $rpathdirs; do
-              acl_save_libdir="$libdir"
-              libdir="$dir"
-              eval flag=\"$acl_hardcode_libdir_flag_spec\"
-              libdir="$acl_save_libdir"
-              $1="${$1}${$1:+ }$flag"
-            done
-          fi
-        fi
-      fi
-    fi
-  fi
-  AC_SUBST([$1])
-])
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
deleted file mode 100644 (file)
index 0d03dc2..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-# lib-prefix.m4 serial 8
-dnl Copyright (C) 2001-2005, 2008-2017 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib-prefix],
-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_PREPARE_MULTILIB creates
-dnl - a variable acl_libdirstem, containing the basename of the libdir, either
-dnl   "lib" or "lib64" or "lib/64",
-dnl - a variable acl_libdirstem2, as a secondary possible value for
-dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
-dnl   "lib/amd64".
-AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
-[
-  dnl There is no formal standard regarding lib and lib64.
-  dnl On glibc systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
-  dnl the compiler's default mode by looking at the compiler's library search
-  dnl path. If at least one of its elements ends in /lib64 or points to a
-  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
-  dnl Otherwise we use the default, namely "lib".
-  dnl On Solaris systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
-  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  dnl Allow the user to override the result by setting acl_cv_libdirstems.
-  AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
-    [acl_cv_libdirstems],
-    [acl_libdirstem=lib
-     acl_libdirstem2=
-     case "$host_os" in
-       solaris*)
-         dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
-         dnl <https://docs.oracle.com/cd/E19253-01/816-5138/dev-env/index.html>.
-         dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
-         dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
-         dnl symlink is missing, so we set acl_libdirstem2 too.
-         AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
-           [AC_EGREP_CPP([sixtyfour bits], [
-#ifdef _LP64
-sixtyfour bits
-#endif
-              ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
-           ])
-         if test $gl_cv_solaris_64bit = yes; then
-           acl_libdirstem=lib/64
-           case "$host_cpu" in
-             sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-             i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
-           esac
-         fi
-         ;;
-       *)
-         dnl The result is a property of the system. However, non-system
-         dnl compilers sometimes have odd library search paths. Therefore
-         dnl prefer asking /usr/bin/gcc, if available, rather than $CC.
-         searchpath=`(if test -f /usr/bin/gcc \
-                         && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
-                        LC_ALL=C /usr/bin/gcc -print-search-dirs; \
-                      else \
-                        LC_ALL=C $CC -print-search-dirs; \
-                      fi) 2>/dev/null \
-                     | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-         if test -n "$searchpath"; then
-           acl_save_IFS="${IFS=        }"; IFS=":"
-           for searchdir in $searchpath; do
-             if test -d "$searchdir"; then
-               case "$searchdir" in
-                 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-                 */../ | */.. )
-                   # Better ignore directories of this form. They are misleading.
-                   ;;
-                 *) searchdir=`cd "$searchdir" && pwd`
-                    case "$searchdir" in
-                      */lib64 ) acl_libdirstem=lib64 ;;
-                    esac ;;
-               esac
-             fi
-           done
-           IFS="$acl_save_IFS"
-         fi
-         ;;
-     esac
-     test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-     acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
-    ])
-  # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
-  acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
-  acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
-])
diff --git a/m4/visibility.m4 b/m4/visibility.m4
deleted file mode 100644 (file)
index 77f760c..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-# visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl Tests whether the compiler supports the command-line option
-dnl -fvisibility=hidden and the function and variable attributes
-dnl __attribute__((__visibility__("hidden"))) and
-dnl __attribute__((__visibility__("default"))).
-dnl Does *not* test for __visibility__("protected") - which has tricky
-dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl Mac OS X.
-dnl Does *not* test for __visibility__("internal") - which has processor
-dnl dependent semantics.
-dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
-dnl "really only recommended for legacy code".
-dnl Set the variable CFLAG_VISIBILITY.
-dnl Defines and sets the variable HAVE_VISIBILITY.
-
-AC_DEFUN([gl_VISIBILITY],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  CFLAG_VISIBILITY=
-  HAVE_VISIBILITY=0
-  if test -n "$GCC"; then
-    dnl First, check whether -Werror can be added to the command line, or
-    dnl whether it leads to an error because of some other option that the
-    dnl user has put into $CC $CFLAGS $CPPFLAGS.
-    AC_MSG_CHECKING([whether the -Werror option is usable])
-    AC_CACHE_VAL([gl_cv_cc_vis_werror], [
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -Werror"
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[]], [[]])],
-        [gl_cv_cc_vis_werror=yes],
-        [gl_cv_cc_vis_werror=no])
-      CFLAGS="$gl_save_CFLAGS"])
-    AC_MSG_RESULT([$gl_cv_cc_vis_werror])
-    dnl Now check whether visibility declarations are supported.
-    AC_MSG_CHECKING([for simple visibility declarations])
-    AC_CACHE_VAL([gl_cv_cc_visibility], [
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -fvisibility=hidden"
-      dnl We use the option -Werror and a function dummyfunc, because on some
-      dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
-      dnl "visibility attribute not supported in this configuration; ignored"
-      dnl at the first function definition in every compilation unit, and we
-      dnl don't want to use the option in this case.
-      if test $gl_cv_cc_vis_werror = yes; then
-        CFLAGS="$CFLAGS -Werror"
-      fi
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-             extern __attribute__((__visibility__("default"))) int exportedvar;
-             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-           ]],
-           [[]])],
-        [gl_cv_cc_visibility=yes],
-        [gl_cv_cc_visibility=no])
-      CFLAGS="$gl_save_CFLAGS"])
-    AC_MSG_RESULT([$gl_cv_cc_visibility])
-    if test $gl_cv_cc_visibility = yes; then
-      CFLAG_VISIBILITY="-fvisibility=hidden"
-      HAVE_VISIBILITY=1
-    fi
-  fi
-  AC_SUBST([CFLAG_VISIBILITY])
-  AC_SUBST([HAVE_VISIBILITY])
-  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
-    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
-])
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644 (file)
index 548e34d..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-
-bin_PROGRAMS = snort
-
-snort_SOURCES = \
-main.cc \
-main.h
-
-if STATIC_INSPECTORS
-lib_list = \
-network_inspectors/arp_spoof/libarp_spoof.a \
-network_inspectors/packet_capture/libpacket_capture.a \
-service_inspectors/back_orifice/libback_orifice.a \
-service_inspectors/dce_rpc/libdce_rpc.a \
-service_inspectors/dnp3/libdnp3.a \
-service_inspectors/dns/libdns.a \
-service_inspectors/ftp_telnet/libftp_telnet.a \
-service_inspectors/gtp/libgtp_inspect.a \
-service_inspectors/modbus/libmodbus.a \
-service_inspectors/rpc_decode/librpc_decode.a \
-service_inspectors/ssh/libssh.a \
-service_inspectors/wizard/libwizard.a
-endif
-
-if STATIC_CODECS
-codec_list = \
-codecs/root/libroot_codecs.a \
-codecs/link/liblink_codecs.a
-endif
-
-if ENABLE_UNIT_TESTS
-test_list = catch/libcatch_tests.a
-endif
-
-if ENABLE_PIGLET
-pig_list = \
-piglet/libpiglet.a \
-piglet_plugins/libpiglet_plugins.a
-endif
-
-snort_LDFLAGS = $(SANITIZER_LDFLAGS) $(AM_LDFLAGS) -export-dynamic
-
-# order libs to avoid undefined symbols
-# from gnu linker
-snort_LDADD = \
-$(test_list) \
-managers/libmanagers.a \
-main/libmain.a \
-codecs/libcodecs.a \
-codecs/ip/libip_codecs.a \
-codecs/misc/libmisc_codecs.a \
-$(codec_list) \
-loggers/libloggers.a \
-network_inspectors/libnetwork_inspectors.a \
-network_inspectors/appid/libappid.a \
-network_inspectors/binder/libbinder.a \
-network_inspectors/normalize/libnormalize.a \
-network_inspectors/perf_monitor/libperf_monitor.a \
-network_inspectors/reputation/libreputation.a \
-service_inspectors/libservice_inspectors.a \
-service_inspectors/http_inspect/libhttp_inspect.a \
-service_inspectors/http2_inspect/libhttp2_inspect.a \
-service_inspectors/sip/libsip.a \
-$(lib_list) \
-pub_sub/libpub_sub.a \
-service_inspectors/imap/libimap.a \
-service_inspectors/pop/libpop.a \
-service_inspectors/smtp/libsmtp.a \
-service_inspectors/ssl/libssl.a \
-network_inspectors/port_scan/libport_scan.a \
-stream/libstream.a \
-stream/base/libstream_base.a \
-stream/ip/libstream_ip.a \
-stream/icmp/libstream_icmp.a \
-stream/tcp/libstream_tcp.a \
-stream/libtcp/libstream_libtcp.a \
-stream/udp/libstream_udp.a \
-stream/user/libstream_user.a \
-stream/file/libstream_file.a \
-stream/libstream_paf.a \
-mime/libmime.a \
-ips_options/libips_options.a \
-search_engines/libsearch_engines.a \
-target_based/libtarget_based.a \
-$(pig_list) \
-codecs/libcodec_module.a \
-memory/libmemory.a \
-host_tracker/libhost_tracker.a \
-parser/libparser.a \
-flow/libflow.a \
-control/libcontrol.a \
-filters/libfilter.a \
-detection/libdetection.a \
-framework/libframework.a \
-file_api/libfile_api.a \
-latency/liblatency.a \
-profiler/libprofiler.a \
-time/libtime.a \
-actions/libips_actions.a \
-events/libevents.a \
-hash/libhash.a \
-log/liblog.a \
-packet_io/libpacket_io.a \
-helpers/libhelpers.a \
-lua/liblua.a \
-decompress/libdecompress.a \
-sfip/libsfip.a \
-sfrt/libsfrt.a \
-protocols/libprotocols.a \
-connectors/libconnectors.a \
-connectors/file_connector/libfile_connector.a \
-connectors/tcp_connector/libtcp_connector.a \
-side_channel/libside_channel.a \
-ports/libports.a \
-utils/libutils.a \
-@LTLIBICONV@
-
-SUBDIRS = \
-actions \
-codecs \
-control \
-decompress \
-detection \
-events \
-file_api \
-filters \
-flow \
-framework \
-hash \
-helpers \
-host_tracker \
-latency \
-lua \
-ips_options \
-log \
-loggers \
-main \
-managers \
-memory \
-mime \
-network_inspectors \
-packet_io \
-parser \
-ports \
-protocols \
-pub_sub \
-search_engines \
-service_inspectors \
-sfip \
-sfrt \
-side_channel \
-connectors \
-stream \
-target_based \
-time \
-profiler \
-utils
-
-if ENABLE_UNIT_TESTS
-SUBDIRS += catch
-endif
-
-if ENABLE_PIGLET
-SUBDIRS += piglet piglet_plugins
-endif
diff --git a/src/actions/Makefile.am b/src/actions/Makefile.am
deleted file mode 100644 (file)
index 37fbdab..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-
-x_includedir = $(pkgincludedir)/actions
-
-noinst_LIBRARIES = libips_actions.a
-
-x_include_HEADERS = \
-actions.h
-
-plugin_list = \
-act_react.cc \
-act_reject.cc
-
-libips_actions_a_SOURCES = \
-actions.cc \
-ips_actions.cc \
-ips_actions.h \
-act_replace.cc \
-act_replace.h
-
-if STATIC_IPS_ACTIONS
-libips_actions_a_SOURCES += $(plugin_list)
-else
-actlibdir = $(pkglibdir)/ips_actions
-
-actlib_LTLIBRARIES = act_react.la
-act_react_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-act_react_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-act_react_la_SOURCES = act_react.cc
-
-actlib_LTLIBRARIES += act_reject.la
-act_reject_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-act_reject_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-act_reject_la_SOURCES = act_reject.cc
-endif
diff --git a/src/catch/Makefile.am b/src/catch/Makefile.am
deleted file mode 100644 (file)
index 2c94616..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-x_includedir = $(pkgincludedir)/catch
-
-noinst_LIBRARIES = libcatch_tests.a
-
-x_include_HEADERS = \
-catch.hpp \
-snort_catch.h
-
-libcatch_tests_a_SOURCES = \
-catch.hpp \
-snort_catch.h \
-unit_test.cc \
-unit_test.h \
-unit_test_main.h
-
-libcatch_tests_a_LDFLAGS = -export-dynamic
-
diff --git a/src/codecs/Makefile.am b/src/codecs/Makefile.am
deleted file mode 100644 (file)
index cba1be8..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-x_includedir = $(pkgincludedir)/codecs
-
-noinst_LIBRARIES = libcodecs.a libcodec_module.a
-
-x_include_HEADERS = \
-codec_module.h
-
-libcodecs_a_SOURCES = \
-codec_api.cc \
-codec_api.h
-
-libcodec_module_a_SOURCES = \
-codec_module.cc
-
-SUBDIRS = \
-ip \
-link \
-misc \
-root
-
diff --git a/src/codecs/ip/Makefile.am b/src/codecs/ip/Makefile.am
deleted file mode 100644 (file)
index 2be428f..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-
-noinst_LIBRARIES = libip_codecs.a
-
-libip_codecs_a_SOURCES = \
-cd_ipv4.cc \
-cd_hop_opts.cc \
-cd_tcp.cc
-
-
-plugin_list = \
-cd_auth.cc \
-cd_bad_proto.cc \
-cd_dst_opts.cc \
-cd_esp.cc \
-cd_frag.cc \
-cd_gre.cc \
-cd_icmp4.cc \
-cd_icmp6.cc \
-cd_igmp.cc \
-cd_ipv6.cc \
-cd_mobility.cc \
-cd_no_next.cc \
-cd_pgm.cc \
-cd_routing.cc \
-cd_udp.cc \
-checksum.h
-
-
-if STATIC_CODECS
-libip_codecs_a_SOURCES += $(plugin_list)
-
-else
-
-ehlibdir = $(pkglibdir)/codecs
-
-ehlib_LTLIBRARIES = cd_auth.la
-cd_auth_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_auth_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_auth_la_SOURCES = cd_auth.cc
-
-ehlib_LTLIBRARIES += cd_bad_proto.la
-cd_bad_proto_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_bad_proto_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_bad_proto_la_SOURCES = cd_bad_proto.cc
-
-ehlib_LTLIBRARIES += cd_esp.la
-cd_esp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_esp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_esp_la_SOURCES = cd_esp.cc
-
-ehlib_LTLIBRARIES += cd_gre.la
-cd_gre_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_gre_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_gre_la_SOURCES = cd_gre.cc
-
-ehlib_LTLIBRARIES += cd_icmp4.la
-cd_icmp4_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_icmp4_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_icmp4_la_SOURCES = cd_icmp4.cc checksum.h
-
-ehlib_LTLIBRARIES += cd_icmp6.la
-cd_icmp6_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_icmp6_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_icmp6_la_SOURCES = cd_icmp6.cc checksum.h
-
-ehlib_LTLIBRARIES += cd_igmp.la
-cd_igmp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_igmp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_igmp_la_SOURCES = cd_igmp.cc
-
-ehlib_LTLIBRARIES += cd_ipv6.la
-cd_ipv6_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_ipv6_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_ipv6_la_SOURCES = cd_ipv6.cc checksum.h
-
-ehlib_LTLIBRARIES += cd_mobility.la
-cd_mobility_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_mobility_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_mobility_la_SOURCES = cd_mobility.cc
-
-ehlib_LTLIBRARIES += cd_pgm.la
-cd_pgm_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_pgm_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_pgm_la_SOURCES = cd_pgm.cc checksum.h
-
-ehlib_LTLIBRARIES += cd_dst_opts.la
-cd_dst_opts_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_dst_opts_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_dst_opts_la_SOURCES = cd_dst_opts.cc
-
-ehlib_LTLIBRARIES += cd_frag.la
-cd_frag_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_frag_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_frag_la_SOURCES = cd_frag.cc
-
-ehlib_LTLIBRARIES += cd_no_next.la
-cd_no_next_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_no_next_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_no_next_la_SOURCES = cd_no_next.cc
-
-ehlib_LTLIBRARIES += cd_routing.la
-cd_routing_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_routing_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_routing_la_SOURCES = cd_routing.cc
-
-ehlib_LTLIBRARIES += cd_udp.la
-cd_udp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_udp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_udp_la_SOURCES = cd_udp.cc checksum.h
-
-endif
-
diff --git a/src/codecs/link/Makefile.am b/src/codecs/link/Makefile.am
deleted file mode 100644 (file)
index e57edcc..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-if STATIC_CODECS
-noinst_LIBRARIES = liblink_codecs.a
-
-liblink_codecs_a_SOURCES = \
-cd_arp.cc \
-cd_erspan2.cc \
-cd_erspan3.cc \
-cd_ciscometadata.cc \
-cd_fabricpath.cc \
-cd_mpls.cc \
-cd_ppp_encap.cc \
-cd_pppoe.cc \
-cd_trans_bridge.cc \
-cd_vlan.cc
-
-else
-ehlibdir = $(pkglibdir)/codecs
-
-ehlib_LTLIBRARIES = cd_arp.la
-cd_arp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_arp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_arp_la_SOURCES = cd_arp.cc
-
-ehlib_LTLIBRARIES += cd_erspan2.la
-cd_erspan2_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_erspan2_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_erspan2_la_SOURCES = cd_erspan2.cc
-
-ehlib_LTLIBRARIES += cd_erspan3.la
-cd_erspan3_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_erspan3_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_erspan3_la_SOURCES = cd_erspan3.cc
-
-ehlib_LTLIBRARIES += cd_ciscometadata.la
-cd_ciscometadata_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_ciscometadata_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_ciscometadata_la_SOURCES = cd_ciscometadata.cc
-
-ehlib_LTLIBRARIES += cd_fabricpath.la
-cd_fabricpath_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_fabricpath_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_fabricpath_la_SOURCES = cd_fabricpath.cc
-
-ehlib_LTLIBRARIES += cd_mpls.la
-cd_mpls_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_mpls_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_mpls_la_SOURCES = cd_mpls.cc
-
-ehlib_LTLIBRARIES += cd_vlan.la
-cd_vlan_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_vlan_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_vlan_la_SOURCES = cd_vlan.cc
-
-ehlib_LTLIBRARIES += cd_ppp_encap.la
-cd_ppp_encap_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_ppp_encap_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_ppp_encap_la_SOURCES = cd_ppp_encap.cc
-
-ehlib_LTLIBRARIES += cd_trans_bridge.la
-cd_trans_bridge_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_trans_bridge_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_trans_bridge_la_SOURCES = cd_trans_bridge.cc
-
-ehlib_LTLIBRARIES += cd_pppoe.la
-cd_pppoe_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_pppoe_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_pppoe_la_SOURCES = cd_pppoe.cc
-endif
diff --git a/src/codecs/misc/Makefile.am b/src/codecs/misc/Makefile.am
deleted file mode 100644 (file)
index 9e2da95..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-
-noinst_LIBRARIES = libmisc_codecs.a
-libmisc_codecs_a_SOURCES = \
-cd_default.cc
-
-plugin_list = \
-cd_gtp.cc \
-cd_icmp4_ip.cc \
-cd_icmp6_ip.cc \
-cd_llc.cc \
-cd_teredo.cc \
-cd_user.cc
-
-if STATIC_CODECS
-libmisc_codecs_a_SOURCES += $(plugin_list)
-
-else
-cdlibdir = $(pkglibdir)/codecs
-
-cdlib_LTLIBRARIES = cd_gtp.la
-cd_gtp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_gtp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_gtp_la_SOURCES = cd_gtp.cc
-
-cdlib_LTLIBRARIES += cd_icmp4_ip.la
-cd_icmp4_ip_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_icmp4_ip_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_icmp4_ip_la_SOURCES = cd_icmp4_ip.cc
-
-cdlib_LTLIBRARIES += cd_icmp6_ip.la
-cd_icmp6_ip_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_icmp6_ip_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_icmp6_ip_la_SOURCES = cd_icmp6_ip.cc
-
-cdlib_LTLIBRARIES += cd_llc.la
-cd_llc_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_llc_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_llc_la_SOURCES = cd_llc.cc
-
-cdlib_LTLIBRARIES += cd_teredo.la
-cd_teredo_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_teredo_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_teredo_la_SOURCES = cd_teredo.cc
-
-cdlib_LTLIBRARIES += cd_user.la
-cd_user_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_user_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_user_la_SOURCES = cd_user.cc
-endif
-
diff --git a/src/codecs/root/Makefile.am b/src/codecs/root/Makefile.am
deleted file mode 100644 (file)
index 614e6df..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-
-if STATIC_CODECS
-noinst_LIBRARIES = libroot_codecs.a
-
-libroot_codecs_a_SOURCES = \
-cd_eth.cc
-
-else
-ehlibdir = $(pkglibdir)/codecs
-
-ehlib_LTLIBRARIES = cd_eth.la
-cd_eth_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-cd_eth_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-cd_eth_la_SOURCES =  cd_eth.cc
-endif
diff --git a/src/connectors/Makefile.am b/src/connectors/Makefile.am
deleted file mode 100644 (file)
index a888224..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-noinst_LIBRARIES = libconnectors.a
-
-libconnectors_a_SOURCES = \
-connectors.cc \
-connectors.h
-
-SUBDIRS = \
-file_connector \
-tcp_connector
-
diff --git a/src/connectors/file_connector/Makefile.am b/src/connectors/file_connector/Makefile.am
deleted file mode 100644 (file)
index 2281a9e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-
-noinst_LIBRARIES = libfile_connector.a
-
-libfile_connector_a_SOURCES = \
-file_connector.cc \
-file_connector.h \
-file_connector_config.h \
-file_connector_module.cc \
-file_connector_module.h
-
-if ENABLE_UNIT_TESTS
-SUBDIRS = test
-endif
-
diff --git a/src/connectors/file_connector/test/Makefile.am b/src/connectors/file_connector/test/Makefile.am
deleted file mode 100644 (file)
index f9d8d2f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-file_connector_test \
-file_connector_module_test
-
-TESTS = $(check_PROGRAMS)
-
-file_connector_test_CPPFLAGS = @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-file_connector_test_LDADD = \
-../file_connector.o \
-../../../framework/libframework.a \
-@CPPUTEST_LDFLAGS@
-
-file_connector_module_test_CPPFLAGS = @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-file_connector_module_test_LDADD = \
-../file_connector_module.o \
-../../../framework/libframework.a \
-../../../sfip/libsfip.a \
-../../../catch/libcatch_tests.a \
-@CPPUTEST_LDFLAGS@
-
diff --git a/src/connectors/tcp_connector/Makefile.am b/src/connectors/tcp_connector/Makefile.am
deleted file mode 100644 (file)
index 9e937fb..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-
-noinst_LIBRARIES = libtcp_connector.a
-
-libtcp_connector_a_SOURCES = \
-tcp_connector.cc \
-tcp_connector.h \
-tcp_connector_config.h \
-tcp_connector_module.cc \
-tcp_connector_module.h
-
-if ENABLE_UNIT_TESTS
-SUBDIRS = test
-endif
-
diff --git a/src/connectors/tcp_connector/test/Makefile.am b/src/connectors/tcp_connector/test/Makefile.am
deleted file mode 100644 (file)
index afe5638..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-tcp_connector_test \
-tcp_connector_module_test
-
-TESTS = $(check_PROGRAMS)
-
-tcp_connector_test_CPPFLAGS = @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-tcp_connector_test_LDADD = \
-../tcp_connector.o \
-../../../framework/libframework.a \
-@CPPUTEST_LDFLAGS@
-
-tcp_connector_module_test_CPPFLAGS = @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-tcp_connector_module_test_LDADD = \
-../tcp_connector_module.o \
-../../../framework/libframework.a \
-../../../sfip/libsfip.a \
-../../../catch/libcatch_tests.a \
-@CPPUTEST_LDFLAGS@
-
diff --git a/src/control/Makefile.am b/src/control/Makefile.am
deleted file mode 100644 (file)
index 6c28888..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-noinst_LIBRARIES = libcontrol.a
-
-libcontrol_a_SOURCES = \
-idle_processing.cc \
-idle_processing.h
-
diff --git a/src/decompress/Makefile.am b/src/decompress/Makefile.am
deleted file mode 100644 (file)
index 7d34b79..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-
-noinst_LIBRARIES = libdecompress.a
-
-x_includedir = $(pkgincludedir)/decompress
-
-x_include_HEADERS = \
-file_decomp.h
-
-libdecompress_a_SOURCES = \
-file_decomp.cc \
-file_decomp_pdf.cc \
-file_decomp_pdf.h \
-file_decomp_swf.cc \
-file_decomp_swf.h
-
diff --git a/src/detection/Makefile.am b/src/detection/Makefile.am
deleted file mode 100644 (file)
index 4488549..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-
-noinst_LIBRARIES = libdetection.a
-
-x_includedir = $(pkgincludedir)/detection
-
-x_include_HEADERS = \
-detect.h \
-detection_engine.h \
-detection_options.h \
-detection_util.h \
-detect_trace.h \
-ips_context.h \
-regex_offload.h \
-rule_option_types.h \
-rules.h \
-signature.h \
-treenodes.h
-
-libdetection_a_SOURCES = \
-context_switcher.cc \
-context_switcher.h \
-detect.cc \
-detection_engine.cc \
-detection_options.cc \
-detection_options.h \
-detection_util.cc \
-detect_trace.cc \
-fp_config.cc \
-fp_config.h \
-fp_create.cc \
-fp_create.h \
-fp_detect.cc \
-fp_detect.h \
-fp_utils.cc \
-fp_utils.h \
-ips_context.cc \
-pattern_match_data.h \
-pcrm.cc \
-pcrm.h \
-regex_offload.cc \
-rtn_checks.cc \
-rtn_checks.h \
-service_map.cc \
-service_map.h \
-sfrim.cc \
-sfrim.h \
-signature.cc \
-treenodes.cc \
-tag.cc \
-tag.h
-
diff --git a/src/events/Makefile.am b/src/events/Makefile.am
deleted file mode 100644 (file)
index be1b85a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-
-noinst_LIBRARIES = libevents.a
-
-x_includedir = $(pkgincludedir)/events
-
-x_include_HEADERS = \
-event.h \
-event_queue.h
-
-libevents_a_SOURCES = \
-event.cc \
-event_queue.cc \
-sfeventq.cc \
-sfeventq.h
-
diff --git a/src/file_api/Makefile.am b/src/file_api/Makefile.am
deleted file mode 100644 (file)
index 33d8a6d..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-
-noinst_LIBRARIES = libfile_api.a
-
-x_includedir = $(pkgincludedir)/file_api
-
-x_include_HEADERS = \
-file_api.h \
-file_config.h \
-file_flows.h \
-file_identifier.h \
-file_lib.h \
-file_module.h \
-file_policy.h \
-file_segment.h \
-file_service.h
-
-libfile_api_a_SOURCES = \
-circular_buffer.cc circular_buffer.h \
-file_capture.cc file_capture.h \
-file_cache.cc file_cache.h \
-file_config.cc \
-file_flows.cc \
-file_enforcer.cc file_enforcer.h \
-file_identifier.cc \
-file_log.cc \
-file_lib.cc \
-file_mempool.cc file_mempool.h \
-file_module.cc file_module.h \
-file_policy.cc \
-file_segment.cc file_segment.h \
-file_service.cc \
-file_stats.cc file_stats.h
diff --git a/src/filters/Makefile.am b/src/filters/Makefile.am
deleted file mode 100644 (file)
index 0bc84e3..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-noinst_LIBRARIES = libfilter.a
-
-libfilter_a_SOURCES = \
-detection_filter.cc \
-detection_filter.h \
-rate_filter.cc \
-rate_filter.h \
-sfthreshold.cc \
-sfthreshold.h \
-sfrf.h \
-sfrf.cc \
-sfthd.cc \
-sfthd.h
-
-if ENABLE_UNIT_TESTS
-libfilter_a_SOURCES += \
-sfrf_test.cc \
-sfthd_test.cc
-endif
-
diff --git a/src/flow/Makefile.am b/src/flow/Makefile.am
deleted file mode 100644 (file)
index ed97ca6..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-noinst_LIBRARIES = libflow.a
-
-x_includedir = $(pkgincludedir)/flow
-
-x_include_HEADERS = \
-expect_cache.h \
-flow.h \
-flow_key.h
-
-libflow_a_SOURCES = \
-expect_cache.cc \
-flow.cc \
-flow_key.cc \
-flow_cache.cc flow_cache.h \
-flow_config.h \
-flow_control.cc flow_control.h \
-ha.cc ha.h \
-ha_module.cc ha_module.h \
-prune_stats.h \
-session.h
-
-AM_CXXFLAGS = @AM_CXXFLAGS@
-
-if ENABLE_UNIT_TESTS
-SUBDIRS = test
-endif
-
diff --git a/src/flow/test/Makefile.am b/src/flow/test/Makefile.am
deleted file mode 100644 (file)
index 3a529e2..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-ha_test \
-ha_module_test
-
-TESTS = $(check_PROGRAMS)
-
-ha_test_CPPFLAGS = @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-ha_module_test_CPPFLAGS = @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-
-ha_test_LDADD = \
-../ha.o \
-@CPPUTEST_LDFLAGS@
-
-ha_module_test_LDADD = \
-../ha_module.o \
-../../framework/libframework.a \
-../../sfip/libsfip.a \
-../../catch/libcatch_tests.a \
-@CPPUTEST_LDFLAGS@
-
diff --git a/src/framework/Makefile.am b/src/framework/Makefile.am
deleted file mode 100644 (file)
index ac9e4ad..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-
-x_includedir = $(pkgincludedir)/framework
-
-noinst_LIBRARIES = libframework.a
-
-x_include_HEADERS = \
-connector.h \
-api_options.h \
-base_api.h \
-bits.h \
-codec.h \
-counts.h \
-cursor.h \
-data_bus.h \
-decode_data.h \
-endianness.h \
-inspector.h \
-ips_action.h \
-ips_option.h \
-logger.h \
-lua_api.h \
-module.h \
-mpse.h \
-parameter.h \
-range.h \
-so_rule.h \
-value.h
-
-libframework_a_SOURCES = \
-codec.cc \
-cursor.cc \
-data_bus.cc \
-inspector.cc \
-ips_option.cc \
-parameter.cc \
-module.cc \
-mpse.cc \
-range.cc \
-value.cc
-
diff --git a/src/hash/Makefile.am b/src/hash/Makefile.am
deleted file mode 100644 (file)
index 267c64e..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-noinst_LIBRARIES = libhash.a
-
-x_includedir = $(pkgincludedir)/hash
-
-x_include_HEADERS = \
-hashes.h \
-ghash.h \
-xhash.h \
-hashfcn.h
-
-libhash_a_SOURCES = \
-hashes.cc \
-lru_cache_shared.cc \
-lru_cache_shared.h \
-ghash.cc \
-hashfcn.cc \
-primetable.cc primetable.h \
-xhash.cc \
-zhash.cc zhash.h
-
-if BUILD_CPPUTESTS
-SUBDIRS = test
-endif
-
diff --git a/src/hash/test/Makefile.am b/src/hash/test/Makefile.am
deleted file mode 100644 (file)
index 2c33494..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-lru_cache_shared_test \
-ghash_test
-
-TESTS = $(check_PROGRAMS)
-
-lru_cache_shared_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-lru_cache_shared_test_LDADD = ../lru_cache_shared.o @CPPUTEST_LDFLAGS@
-
-ghash_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-ghash_test_LDADD = ../libhash.a @CPPUTEST_LDFLAGS@
diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am
deleted file mode 100644 (file)
index d77b22f..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-x_includedir = $(pkgincludedir)/helpers
-
-noinst_LIBRARIES = libhelpers.a
-
-x_include_HEADERS = \
-base64_encoder.h
-
-libhelpers_a_SOURCES = \
-base64_encoder.cc \
-chunk.cc \
-chunk.h \
-directory.cc \
-directory.h \
-flag_context.h \
-markup.cc \
-markup.h \
-process.cc \
-process.h \
-ring.h \
-ring_logic.h
diff --git a/src/host_tracker/Makefile.am b/src/host_tracker/Makefile.am
deleted file mode 100644 (file)
index aabdd59..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-
-noinst_LIBRARIES = libhost_tracker.a
-
-libhost_tracker_a_SOURCES = \
-host_cache.cc \
-host_cache.h \
-host_cache_module.cc \
-host_cache_module.h \
-host_tracker_module.cc \
-host_tracker_module.h \
-host_tracker.cc \
-host_tracker.h
-
-if ENABLE_UNIT_TESTS
-SUBDIRS = test
-endif
-
-
diff --git a/src/host_tracker/test/Makefile.am b/src/host_tracker/test/Makefile.am
deleted file mode 100644 (file)
index c709486..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-host_tracker_module_test \
-host_cache_module_test \
-host_cache_test \
-host_tracker_test
-
-TESTS = $(check_PROGRAMS)
-
-host_cache_module_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-host_tracker_module_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-host_cache_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-host_tracker_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-
-host_cache_module_test_LDADD = ../host_cache_module.o ../host_cache.o ../host_tracker.o ../../framework/libframework.a ../../catch/libcatch_tests.a ../../sfip/libsfip.a ../../hash/libhash.a @CPPUTEST_LDFLAGS@
-host_tracker_module_test_LDADD = ../host_tracker_module.o ../host_cache.o ../host_tracker.o ../../framework/libframework.a ../../catch/libcatch_tests.a ../../sfip/libsfip.a @CPPUTEST_LDFLAGS@
-host_cache_test_LDADD = ../host_cache.o ../host_tracker.o ../../sfip/libsfip.a @CPPUTEST_LDFLAGS@
-host_tracker_test_LDADD = ../host_tracker.o ../../sfip/libsfip.a @CPPUTEST_LDFLAGS@
-
diff --git a/src/ips_options/Makefile.am b/src/ips_options/Makefile.am
deleted file mode 100644 (file)
index 044a120..0000000
+++ /dev/null
@@ -1,280 +0,0 @@
-
-noinst_LIBRARIES = libips_options.a
-
-plugin_list = \
-asn1_detect.cc asn1_detect.h \
-asn1_util.cc asn1_util.h \
-ips_ack.cc \
-ips_asn1.cc \
-ips_base64.cc \
-ips_bufferlen.cc \
-ips_byte_extract.cc \
-ips_byte_jump.cc \
-ips_byte_math.cc \
-ips_byte_test.cc \
-ips_cvs.cc \
-ips_file_type.cc \
-ips_flags.cc \
-ips_fragbits.cc \
-ips_fragoffset.cc \
-ips_gid.cc \
-ips_icmp_id.cc \
-ips_icmp_seq.cc \
-ips_icode.cc \
-ips_id.cc \
-ips_ipopts.cc \
-ips_ip_proto.cc \
-ips_isdataat.cc \
-ips_itype.cc \
-ips_msg.cc \
-ips_priority.cc \
-ips_raw_data.cc \
-ips_rem.cc \
-ips_rev.cc \
-ips_rpc.cc \
-ips_seq.cc \
-ips_session.cc \
-ips_sid.cc \
-ips_soid.cc \
-ips_tag.cc \
-ips_target.cc \
-ips_tos.cc \
-ips_ttl.cc \
-ips_window.cc
-
-libips_options_a_SOURCES = \
-extract.cc extract.h \
-ips_classtype.cc \
-ips_content.cc \
-ips_detection_filter.cc \
-ips_dsize.cc \
-ips_file_data.cc \
-ips_flow.cc ips_flow.h \
-ips_flowbits.cc ips_flowbits.h \
-ips_hash.cc \
-ips_luajit.cc \
-ips_metadata.cc \
-ips_options.cc ips_options.h \
-ips_pcre.cc ips_pcre.h \
-ips_pkt_data.cc \
-ips_reference.cc \
-ips_replace.cc \
-ips_service.cc \
-ips_so.cc
-
-if HAVE_HYPERSCAN
-libips_options_a_SOURCES += ips_regex.cc ips_regex.h
-libips_options_a_SOURCES += ips_sd_pattern.cc ips_sd_pattern.h sd_credit_card.cc sd_credit_card.h
-endif
-
-if STATIC_IPS_OPTIONS
-libips_options_a_SOURCES += $(plugin_list)
-else
-optlibdir = $(pkglibdir)/ips_options
-
-optlib_LTLIBRARIES = ips_ack.la
-ips_ack_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_ack_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_ack_la_SOURCES = ips_ack.cc
-
-optlib_LTLIBRARIES += ips_asn1.la
-ips_asn1_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_asn1_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_asn1_la_SOURCES = ips_asn1.cc asn1_detect.cc asn1_detect.h asn1_util.h asn1_util.cc
-
-optlib_LTLIBRARIES += ips_base64.la
-ips_base64_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_base64_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_base64_la_SOURCES = ips_base64.cc
-
-optlib_LTLIBRARIES += ips_bufferlen.la
-ips_bufferlen_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_bufferlen_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_bufferlen_la_SOURCES = ips_bufferlen.cc
-
-optlib_LTLIBRARIES += ips_byte_test.la
-ips_byte_test_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_byte_test_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_byte_test_la_SOURCES = ips_byte_test.cc
-
-optlib_LTLIBRARIES += ips_byte_jump.la
-ips_byte_jump_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_byte_jump_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_byte_jump_la_SOURCES = ips_byte_jump.cc
-
-optlib_LTLIBRARIES += ips_byte_extract.la
-ips_byte_extract_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_byte_extract_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_byte_extract_la_SOURCES = ips_byte_extract.cc
-
-optlib_LTLIBRARIES += ips_byte_math.la
-ips_byte_math_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_byte_math_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_byte_math_la_SOURCES = ips_byte_math.cc
-
-#optlib_LTLIBRARIES += ips_content.la
-#ips_content_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#ips_content_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#ips_content_la_SOURCES = ips_content.cc
-
-optlib_LTLIBRARIES += ips_cvs.la
-ips_cvs_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_cvs_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_cvs_la_SOURCES = ips_cvs.cc
-
-optlib_LTLIBRARIES += ips_file_type.la
-ips_file_type_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_file_type_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_file_type_la_SOURCES = ips_file_type.cc
-
-#optlib_LTLIBRARIES += ips_dsize.la
-#ips_dsize_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#ips_dsize_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#ips_dsize_la_SOURCES = ips_dsize.cc
-
-optlib_LTLIBRARIES += ips_flags.la
-ips_flags_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_flags_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_flags_la_SOURCES = ips_flags.cc
-
-optlib_LTLIBRARIES += ips_fragbits.la
-ips_fragbits_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_fragbits_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_fragbits_la_SOURCES = ips_fragbits.cc
-
-optlib_LTLIBRARIES += ips_fragoffset.la
-ips_fragoffset_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_fragoffset_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_fragoffset_la_SOURCES = ips_fragoffset.cc
-
-optlib_LTLIBRARIES += ips_gid.la
-ips_gid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_gid_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_gid_la_SOURCES = ips_gid.cc
-
-# can't be linked dynamically yet
-#optlib_LTLIBRARIES += ips_hash.la
-#ips_hash_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#ips_hash_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#ips_hash_la_SOURCES = ips_hash.cc
-
-optlib_LTLIBRARIES += ips_icmp_id.la
-ips_icmp_id_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_icmp_id_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_icmp_id_la_SOURCES = ips_icmp_id.cc
-
-optlib_LTLIBRARIES += ips_icmp_seq.la
-ips_icmp_seq_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_icmp_seq_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_icmp_seq_la_SOURCES = ips_icmp_seq.cc
-
-optlib_LTLIBRARIES += ips_icode.la
-ips_icode_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_icode_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_icode_la_SOURCES = ips_icode.cc
-
-optlib_LTLIBRARIES += ips_id.la
-ips_id_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_id_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_id_la_SOURCES = ips_id.cc
-
-optlib_LTLIBRARIES += ips_ipopts.la
-ips_ipopts_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_ipopts_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_ipopts_la_SOURCES = ips_ipopts.cc
-
-optlib_LTLIBRARIES += ips_ip_proto.la
-ips_ip_proto_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_ip_proto_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_ip_proto_la_SOURCES = ips_ip_proto.cc
-
-optlib_LTLIBRARIES += ips_isdataat.la
-ips_isdataat_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_isdataat_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_isdataat_la_SOURCES = ips_isdataat.cc
-
-optlib_LTLIBRARIES += ips_itype.la
-ips_itype_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_itype_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_itype_la_SOURCES = ips_itype.cc
-
-optlib_LTLIBRARIES += ips_msg.la
-ips_msg_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_msg_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_msg_la_SOURCES = ips_msg.cc
-
-optlib_LTLIBRARIES += ips_priority.la
-ips_priority_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_priority_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_priority_la_SOURCES = ips_priority.cc
-
-optlib_LTLIBRARIES += ips_raw_data.la
-ips_raw_data_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_raw_data_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_raw_data_la_SOURCES = ips_raw_data.cc
-
-optlib_LTLIBRARIES += ips_rem.la
-ips_rem_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_rem_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_rem_la_SOURCES = ips_rem.cc
-
-optlib_LTLIBRARIES += ips_rev.la
-ips_rev_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_rev_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_rev_la_SOURCES = ips_rev.cc
-
-optlib_LTLIBRARIES += ips_rpc.la
-ips_rpc_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_rpc_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_rpc_la_SOURCES = ips_rpc.cc
-
-optlib_LTLIBRARIES += ips_seq.la
-ips_seq_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_seq_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_seq_la_SOURCES = ips_seq.cc
-
-optlib_LTLIBRARIES += ips_session.la
-ips_session_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_session_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_session_la_SOURCES = ips_session.cc
-
-optlib_LTLIBRARIES += ips_sid.la
-ips_sid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_sid_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_sid_la_SOURCES = ips_sid.cc
-
-optlib_LTLIBRARIES += ips_soid.la
-ips_soid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_soid_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_soid_la_SOURCES = ips_soid.cc
-
-optlib_LTLIBRARIES += ips_tag.la
-ips_tag_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_tag_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_tag_la_SOURCES = ips_tag.cc
-
-optlib_LTLIBRARIES += ips_target.la
-ips_target_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_target_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_target_la_SOURCES = ips_target.cc
-
-optlib_LTLIBRARIES += ips_tos.la
-ips_tos_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_tos_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_tos_la_SOURCES = ips_tos.cc
-
-optlib_LTLIBRARIES += ips_ttl.la
-ips_ttl_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_ttl_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_ttl_la_SOURCES = ips_ttl.cc
-
-optlib_LTLIBRARIES += ips_window.la
-ips_window_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ips_window_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ips_window_la_SOURCES = ips_window.cc
-endif
-
-if BUILD_CPPUTESTS
-SUBDIRS = test
-endif
-
diff --git a/src/ips_options/test/Makefile.am b/src/ips_options/test/Makefile.am
deleted file mode 100644 (file)
index cf36e13..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-if HAVE_HYPERSCAN
-check_PROGRAMS = \
-ips_regex_test
-
-TESTS = $(check_PROGRAMS)
-
-ips_regex_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-
-ips_regex_test_LDADD = \
-../ips_regex.o \
-../../catch/unit_test.o \
-../../framework/ips_option.o \
-../../framework/module.o \
-../../framework/value.o \
-../../sfip/sf_ip.o \
-../../sfip/sf_cidr.o \
-@CPPUTEST_LDFLAGS@
-endif
-
diff --git a/src/latency/Makefile.am b/src/latency/Makefile.am
deleted file mode 100644 (file)
index 46cbd1d..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-noinst_LIBRARIES = liblatency.a
-
-liblatency_a_SOURCES = \
-latency_config.h \
-latency_rules.h \
-latency_stats.h \
-latency_timer.h \
-latency_util.h \
-latency_module.h \
-latency_module.cc \
-packet_latency.h \
-packet_latency.cc \
-packet_latency_config.h \
-rule_latency_config.h \
-rule_latency_state.h \
-rule_latency.h \
-rule_latency.cc
diff --git a/src/log/Makefile.am b/src/log/Makefile.am
deleted file mode 100644 (file)
index 1d6afea..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-
-noinst_LIBRARIES = liblog.a
-
-x_includedir = $(pkgincludedir)/log
-
-x_include_HEADERS = \
-log.h \
-log_text.h \
-messages.h \
-obfuscator.h \
-text_log.h \
-u2_packet.h \
-unified2.h
-
-liblog_a_SOURCES = \
-log.cc \
-log_text.cc \
-messages.cc \
-obfuscator.cc \
-packet_tracer.cc \
-packet_tracer.h \
-text_log.cc \
-u2_packet.cc
-
-if ENABLE_UNIT_TESTS
-SUBDIRS = test
-endif
-
diff --git a/src/log/test/Makefile.am b/src/log/test/Makefile.am
deleted file mode 100644 (file)
index cb1e066..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-obfuscator_test
-
-TESTS = $(check_PROGRAMS)
-
-obfuscator_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-
-obfuscator_test_LDADD = ../obfuscator.o \
-                                               @CPPUTEST_LDFLAGS@
-
diff --git a/src/loggers/Makefile.am b/src/loggers/Makefile.am
deleted file mode 100644 (file)
index ebe861f..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-
-noinst_LIBRARIES = libloggers.a
-libloggers_a_SOURCES = \
-alert_luajit.cc \
-alert_sf_socket.cc \
-log_codecs.cc \
-loggers.cc \
-loggers.h
-
-plugin_list = \
-alert_csv.cc \
-alert_fast.cc \
-alert_full.cc \
-alert_syslog.cc \
-log_hext.cc \
-log_pcap.cc \
-unified2.cc
-
-if STATIC_LOGGERS
-libloggers_a_SOURCES += $(plugin_list)
-
-else
-ehlibdir = $(pkglibdir)/loggers
-
-ehlib_LTLIBRARIES = alert_csv.la
-alert_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-alert_csv_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-alert_csv_la_SOURCES = alert_csv.cc
-
-ehlib_LTLIBRARIES += alert_fast.la
-alert_fast_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-alert_fast_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-alert_fast_la_SOURCES = alert_fast.cc
-
-ehlib_LTLIBRARIES += alert_full.la
-alert_full_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-alert_full_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-alert_full_la_SOURCES = alert_full.cc
-
-ehlib_LTLIBRARIES += alert_syslog.la
-alert_syslog_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-alert_syslog_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-alert_syslog_la_SOURCES = alert_syslog.cc
-
-ehlib_LTLIBRARIES += log_hext.la
-log_hext_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-log_hext_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-log_hext_la_SOURCES = log_hext.cc
-
-ehlib_LTLIBRARIES += log_pcap.la
-log_pcap_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-log_pcap_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-log_pcap_la_SOURCES = log_pcap.cc
-
-ehlib_LTLIBRARIES += unified2.la
-unified2_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-unified2_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-unified2_la_SOURCES = unified2.cc
-endif
-
diff --git a/src/lua/Makefile.am b/src/lua/Makefile.am
deleted file mode 100644 (file)
index 813f562..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-AUTOMAKE_OPTIONS=foreign no-dependencies
-
-noinst_LIBRARIES = liblua.a
-
-liblua_a_SOURCES = \
-lua.cc \
-lua.h \
-lua_arg.h \
-lua_iface.h \
-lua_ref.cc \
-lua_ref.h \
-lua_stack.h \
-lua_table.h \
-lua_test_common.h \
-lua_util.cc \
-lua_util.h
-
-if ENABLE_UNIT_TESTS
-liblua_a_SOURCES += lua_stack_test.cc
-endif
-
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
deleted file mode 100644 (file)
index 8f8f49e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-
-x_includedir = $(pkgincludedir)/main
-
-noinst_LIBRARIES = libmain.a
-
-x_include_HEADERS = \
-analyzer_command.h \
-policy.h \
-snort_config.h \
-snort_debug.h \
-snort_types.h \
-thread.h
-
-libmain_a_SOURCES = \
-analyzer.cc \
-analyzer.h \
-analyzer_command.cc \
-build.h \
-help.cc \
-help.h \
-inclusion.h \
-modules.cc \
-modules.h \
-policy.cc \
-request.cc \
-request.h \
-shell.cc \
-shell.h \
-snort.cc \
-snort.h \
-snort_config.cc \
-snort_config.h \
-snort_module.cc \
-snort_module.h \
-swapper.cc \
-swapper.h \
-thread.cc \
-thread_config.h \
-thread_config.cc
-
-if DEBUG_MSGS
-libmain_a_SOURCES += snort_debug.cc
-endif
-
-if ENABLE_SHELL
-libmain_a_SOURCES += \
-control.cc \
-control.h \
-control_mgmt.cc \
-control_mgmt.h
-endif
diff --git a/src/managers/Makefile.am b/src/managers/Makefile.am
deleted file mode 100644 (file)
index f585253..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-
-x_luadir = $(pkgincludedir)/lua
-
-x_lua_HEADERS = \
-snort_config.lua \
-snort_plugin.lua
-
-x_mgrdir = $(pkgincludedir)/managers
-
-x_mgr_HEADERS = \
-codec_manager.h \
-inspector_manager.h
-
-noinst_LIBRARIES = libmanagers.a
-
-libmanagers_a_SOURCES = \
-action_manager.cc action_manager.h \
-codec_manager.cc codec_manager.h \
-connector_manager.cc connector_manager.h \
-event_manager.cc event_manager.h \
-inspector_manager.cc \
-ips_manager.cc ips_manager.h \
-lua_plugin_defs.h \
-module_manager.cc module_manager.h \
-mpse_manager.cc mpse_manager.h \
-plugin_manager.cc plugin_manager.h \
-script_manager.cc script_manager.h \
-so_manager.cc so_manager.h
-
-EXTRA_DIST = ffi_wrap.sh
-CLEANFILES = snort_plugin.lua
-
-snort_plugin.lua:
-       $(srcdir)/ffi_wrap.sh $(srcdir)/lua_plugin_defs.h >$@
diff --git a/src/memory/Makefile.am b/src/memory/Makefile.am
deleted file mode 100644 (file)
index b329be2..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-noinst_LIBRARIES = libmemory.a
-
-libmemory_a_SOURCES = \
-memory_allocator.cc \
-memory_allocator.h \
-memory_cap.cc \
-memory_cap.h \
-memory_module.cc \
-memory_module.h \
-memory_config.h \
-memory_manager.cc \
-prune_handler.cc \
-prune_handler.h
diff --git a/src/mime/Makefile.am b/src/mime/Makefile.am
deleted file mode 100644 (file)
index f197c62..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-
-noinst_LIBRARIES = libmime.a
-
-x_includedir = $(pkgincludedir)/mime
-
-x_include_HEADERS = \
-decode_b64.h \
-decode_base.h \
-file_mime_config.h \
-file_mime_decode.h \
-file_mime_log.h \
-file_mime_paf.h \
-file_mime_process.h
-
-libmime_a_SOURCES = \
-decode_b64.cc \
-decode_base.cc \
-decode_bit.cc \
-decode_bit.h \
-decode_buffer.cc \
-decode_buffer.h \
-decode_qp.cc \
-decode_qp.h \
-decode_uu.cc \
-decode_uu.h \
-file_mime_config.cc \
-file_mime_decode.cc \
-file_mime_log.cc \
-file_mime_paf.cc \
-file_mime_process.cc
-
diff --git a/src/network_inspectors/Makefile.am b/src/network_inspectors/Makefile.am
deleted file mode 100644 (file)
index 2dca17d..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-noinst_LIBRARIES = libnetwork_inspectors.a
-
-libnetwork_inspectors_a_SOURCES = \
-network_inspectors.cc \
-network_inspectors.h
-
-# FIXIT LIBADD here causes undefineds
-#libnetwork_inspectors_a_LIBADD = \
-#arp_spoof/libarp_spoof.a \
-#binder/libbinder.a \
-#normalize/libnormalize.a \
-#perf_monitor/libperf_monitor.a \
-#port_scan/libport_scan.a
-
-SUBDIRS = \
-appid \
-arp_spoof \
-binder \
-normalize \
-packet_capture \
-perf_monitor \
-port_scan \
-reputation
diff --git a/src/network_inspectors/appid/Makefile.am b/src/network_inspectors/appid/Makefile.am
deleted file mode 100644 (file)
index 2bff4ec..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-AUTOMAKE_OPTIONS=foreign nostdinc subdir-objects
-
-x_includedir = $(pkgincludedir)/network_inspectors/appid
-
-x_include_HEADERS = \
-appid_api.h \
-appid_dns_session.h \
-appid_http_session.h \
-application_ids.h
-
-AM_CPPFLAGS+=-I$(top_srcdir)/src/network_inspectors/appid -fno-strict-aliasing
-
-cp_file_list = \
-client_plugins/client_app_aim.cc \
-client_plugins/client_app_aim.h \
-client_plugins/client_app_bit.cc \
-client_plugins/client_app_bit.h \
-client_plugins/client_app_bit_tracker.cc \
-client_plugins/client_app_bit_tracker.h \
-client_plugins/client_app_msn.cc \
-client_plugins/client_app_msn.h \
-client_plugins/client_app_rtp.cc \
-client_plugins/client_app_rtp.h \
-client_plugins/client_app_ssh.cc \
-client_plugins/client_app_ssh.h \
-client_plugins/client_app_timbuktu.cc \
-client_plugins/client_app_timbuktu.h \
-client_plugins/client_app_tns.cc \
-client_plugins/client_app_tns.h \
-client_plugins/client_app_vnc.cc \
-client_plugins/client_app_vnc.h \
-client_plugins/client_app_ym.cc \
-client_plugins/client_app_ym.h \
-client_plugins/client_detector.cc \
-client_plugins/client_detector.h \
-client_plugins/client_discovery.cc \
-client_plugins/client_discovery.h
-
-dp_file_list = \
-detector_plugins/detector_dns.cc \
-detector_plugins/detector_dns.h \
-detector_plugins/detector_http.cc \
-detector_plugins/detector_http.h \
-detector_plugins/detector_imap.cc \
-detector_plugins/detector_imap.h \
-detector_plugins/detector_kerberos.cc \
-detector_plugins/detector_kerberos.h \
-detector_plugins/detector_pattern.cc \
-detector_plugins/detector_pattern.h \
-detector_plugins/detector_pop3.cc \
-detector_plugins/detector_pop3.h \
-detector_plugins/detector_sip.cc \
-detector_plugins/detector_sip.h \
-detector_plugins/detector_smtp.cc \
-detector_plugins/detector_smtp.h \
-detector_plugins/http_url_patterns.cc \
-detector_plugins/http_url_patterns.h
-
-sp_file_list = \
-service_plugins/dcerpc.cc \
-service_plugins/dcerpc.h \
-service_plugins/service_battle_field.cc \
-service_plugins/service_battle_field.h \
-service_plugins/service_bgp.cc \
-service_plugins/service_bgp.h \
-service_plugins/service_bit.cc \
-service_plugins/service_bit.h \
-service_plugins/service_bootp.cc \
-service_plugins/service_bootp.h \
-service_plugins/service_dcerpc.cc \
-service_plugins/service_dcerpc.h \
-service_plugins/service_detector.cc \
-service_plugins/service_detector.h \
-service_plugins/service_direct_connect.cc \
-service_plugins/service_direct_connect.h \
-service_plugins/service_discovery.cc \
-service_plugins/service_discovery.h \
-service_plugins/service_flap.cc \
-service_plugins/service_flap.h \
-service_plugins/service_ftp.cc \
-service_plugins/service_ftp.h \
-service_plugins/service_irc.cc \
-service_plugins/service_irc.h \
-service_plugins/service_lpr.cc \
-service_plugins/service_lpr.h \
-service_plugins/service_mdns.cc \
-service_plugins/service_mdns.h \
-service_plugins/service_mysql.cc \
-service_plugins/service_mysql.h \
-service_plugins/service_netbios.cc \
-service_plugins/service_netbios.h \
-service_plugins/service_nntp.cc \
-service_plugins/service_nntp.h \
-service_plugins/service_ntp.cc \
-service_plugins/service_ntp.h \
-service_plugins/service_radius.cc \
-service_plugins/service_radius.h \
-service_plugins/service_regtest.cc \
-service_plugins/service_regtest.h \
-service_plugins/service_rexec.cc \
-service_plugins/service_rexec.h \
-service_plugins/service_rfb.cc \
-service_plugins/service_rfb.h \
-service_plugins/service_rlogin.cc \
-service_plugins/service_rlogin.h \
-service_plugins/service_rpc.cc \
-service_plugins/service_rpc.h \
-service_plugins/service_rshell.cc \
-service_plugins/service_rshell.h \
-service_plugins/service_rsync.cc \
-service_plugins/service_rsync.h \
-service_plugins/service_rtmp.cc \
-service_plugins/service_rtmp.h \
-service_plugins/service_snmp.cc \
-service_plugins/service_snmp.h \
-service_plugins/service_ssh.cc \
-service_plugins/service_ssh.h \
-service_plugins/service_ssl.cc \
-service_plugins/service_ssl.h \
-service_plugins/service_telnet.cc \
-service_plugins/service_telnet.h \
-service_plugins/service_tftp.cc \
-service_plugins/service_tftp.h \
-service_plugins/service_timbuktu.cc \
-service_plugins/service_timbuktu.h \
-service_plugins/service_tns.cc \
-service_plugins/service_tns.h
-
-util_file_list = \
-appid_utils/fw_avltree.cc \
-appid_utils/fw_avltree.h \
-appid_utils/ip_funcs.cc \
-appid_utils/ip_funcs.h \
-appid_utils/network_set.cc \
-appid_utils/network_set.h \
-appid_utils/sf_mlmp.cc \
-appid_utils/sf_mlmp.h \
-appid_utils/sf_multi_mpse.cc \
-appid_utils/sf_multi_mpse.h
-
-file_list = \
-app_forecast.cc \
-app_forecast.h \
-appid_api.cc \
-appid_api.h \
-appid_app_descriptor.h \
-appid_config.cc \
-appid_config.h \
-appid_detector.cc \
-appid_detector.h \
-appid_discovery.cc \
-appid_discovery.h \
-appid_dns_session.h \
-appid_http_session.cc \
-appid_http_session.h \
-appid_peg_counts.h \
-appid_peg_counts.cc \
-appid_session.cc \
-appid_session.h \
-appid_inspector.cc \
-appid_inspector.h \
-appid_module.cc \
-appid_module.h \
-appid_stats.cc \
-appid_stats.h \
-app_info_table.cc \
-app_info_table.h \
-application_ids.h \
-host_port_app_cache.cc \
-host_port_app_cache.h \
-appid_http_event_handler.cc \
-appid_http_event_handler.h \
-ips_appid_option.cc \
-length_app_cache.cc \
-length_app_cache.h \
-lua_detector_api.cc \
-lua_detector_api.h \
-lua_detector_flow_api.cc \
-lua_detector_flow_api.h \
-lua_detector_module.cc \
-lua_detector_module.h \
-lua_detector_util.h \
-service_state.cc \
-service_state.h \
-thirdparty_appid_api.h \
-thirdparty_appid_types.h \
-thirdparty_appid_utils.cc \
-thirdparty_appid_utils.h
-
-#if STATIC_INSPECTORS
-noinst_LIBRARIES = libappid.a
-libappid_a_SOURCES = $(file_list) \
-$(cp_file_list) \
-$(sp_file_list) \
-$(dp_file_list) \
-$(util_file_list)
-#else
-#shlibdir = $(pkglibdir)/inspectors
-#shlib_LTLIBRARIES = appid.la
-#appid_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#appid_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#appid_la_SOURCES = $(file_list) \
-#$(cp_file_list) \
-#$(sp_file_list) \
-#$(dp_file_list) \
-#$(util_file_list)
-#endif
-
-if ENABLE_UNIT_TESTS
-SUBDIRS=test\
-service_plugins/test \
-detector_plugins/test
-endif
-
index 1eb9e8f2393b786afeddafb58b77a19d5d3f57ca..2e8aec1c2354fd13f90ed322a41a2314154cf027 100644 (file)
@@ -759,7 +759,7 @@ static void replace_header_data(std::string& header, const uint8_t* content, int
         return;
 
     header.clear();
-    header.append((char*)content, clen);
+    header.append((const char*) content, clen);
 }
 
 void AppIdHttpSession::update_host(const uint8_t* new_host, int32_t len)
diff --git a/src/network_inspectors/appid/detector_plugins/test/Makefile.am b/src/network_inspectors/appid/detector_plugins/test/Makefile.am
deleted file mode 100644 (file)
index c2ef0f2..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-detector_smtp_test \
-http_url_patterns_test
-
-TESTS = $(check_PROGRAMS)
-
-detector_smtp_test_CPPFLAGS = -I$(top_srcdir)/src/network_inspectors/appid @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-
-detector_smtp_test_LDADD = \
-../../../../utils/libutils.a \
-@CPPUTEST_LDFLAGS@
-
-http_url_patterns_test_CPPFLAGS = -I$(top_srcdir)/src/network_inspectors/appid @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-
-http_url_patterns_test_LDADD = \
-../../../../utils/libutils.a \
-@CPPUTEST_LDFLAGS@
-
diff --git a/src/network_inspectors/appid/service_plugins/test/Makefile.am b/src/network_inspectors/appid/service_plugins/test/Makefile.am
deleted file mode 100644 (file)
index 84b9c9a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-service_rsync_test
-
-TESTS = $(check_PROGRAMS)
-
-service_rsync_test_CPPFLAGS = -I$(top_srcdir)/src/network_inspectors/appid @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
diff --git a/src/network_inspectors/appid/test/Makefile.am b/src/network_inspectors/appid/test/Makefile.am
deleted file mode 100644 (file)
index edb6555..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-appid_http_event_test \
-appid_api_test \
-appid_detector_test \
-appid_expected_flags_test
-##app_info_table_test
-
-TESTS = $(check_PROGRAMS)
-
-appid_http_event_test_CPPFLAGS = -I$(top_srcdir)/src/network_inspectors/appid @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-
-appid_http_event_test_LDADD = \
-../appid_peg_counts.o \
-../../../sfip/sf_ip.o \
-../../../utils/util_cstring.o \
-@CPPUTEST_LDFLAGS@
-
-appid_api_test_CPPFLAGS = -I$(top_srcdir)/src/network_inspectors/appid @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-
-appid_api_test_LDADD = \
-../appid_peg_counts.o \
-../../../sfip/sf_ip.o \
-../../../utils/util_cstring.o \
-@CPPUTEST_LDFLAGS@
-
-##app_info_table_test_CPPFLAGS = -I$(top_srcdir)/src/network_inspectors/appid @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-##app_info_table_test_LDADD = \
-##../../../utils/util_cstring.o \
-##@CPPUTEST_LDFLAGS@
-
-appid_detector_test_CPPFLAGS = -I$(top_srcdir)/src/network_inspectors/appid @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-appid_detector_test_LDADD = \
-../appid_peg_counts.o \
-../../../sfip/sf_ip.o \
-../../../utils/util_cstring.o \
-@CPPUTEST_LDFLAGS@
-
-appid_expected_flags_test_CPPFLAGS = -I$(top_srcdir)/src/network_inspectors/appid @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-appid_expected_flags_test_LDADD = \
-../appid_peg_counts.o \
-../../../sfip/sf_ip.o \
-@CPPUTEST_LDFLAGS@
index fb4bf6cbc5569ffa1ca9366f92f3293e2339e67d..b995973fa84d2b2b204a6f46f5055899c5b4d064 100644 (file)
@@ -315,7 +315,7 @@ static void ProcessThirdPartyResults(AppIdSession& asd, int confidence,  AppId*
                 url += "://";
                 url += attribute_data->spdyRequestHost;
                 url += attribute_data->spdyRequestPath;
-                hsession->set_url((char*)url.c_str());
+                hsession->set_url(url.c_str());
                 asd.scan_flags |= SCAN_HTTP_HOST_URL_FLAG;
 
                 snort_free(attribute_data->spdyRequestScheme);
@@ -677,12 +677,12 @@ static void ProcessThirdPartyResults(AppIdSession& asd, int confidence,  AppId*
             {
                 HttpPatternMatchers* http_matchers = HttpPatternMatchers::get_instance();
 
-                if ( ( ( http_matchers->get_appid_from_url(nullptr, (char*)hsession->get_url(),
-                    nullptr, (char*)hsession->get_referer(), &client_id, &serviceAppId,
+                if ( ( ( http_matchers->get_appid_from_url(nullptr, hsession->get_url(),
+                    nullptr, hsession->get_referer(), &client_id, &serviceAppId,
                     &payload_id, &referred_payload_app_id, 1) )
                     ||
-                    ( http_matchers->get_appid_from_url(nullptr, (char*)hsession->get_url(), nullptr,
-                        (char*)hsession->get_referer(), &client_id, &serviceAppId, &payload_id,
+                    ( http_matchers->get_appid_from_url(nullptr, hsession->get_url(), nullptr,
+                        hsession->get_referer(), &client_id, &serviceAppId, &payload_id,
                     &referred_payload_app_id, 0) ) ) == 1 )
                 {
                     // do not overwrite a previously-set client or service
diff --git a/src/network_inspectors/arp_spoof/Makefile.am b/src/network_inspectors/arp_spoof/Makefile.am
deleted file mode 100644 (file)
index 132b2bf..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-file_list = \
-arp_spoof.cc \
-arp_module.cc \
-arp_module.h
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = libarp_spoof.a
-libarp_spoof_a_SOURCES = $(file_list)
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = arp_spoof.la
-arp_spoof_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-arp_spoof_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-arp_spoof_la_SOURCES = $(file_list)
-endif
diff --git a/src/network_inspectors/binder/Makefile.am b/src/network_inspectors/binder/Makefile.am
deleted file mode 100644 (file)
index 46b5b71..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-
-file_list = \
-binder.cc \
-binder.h \
-binding.h \
-bind_module.cc \
-bind_module.h
-
-#if STATIC_INSPECTORS
-noinst_LIBRARIES = libbinder.a
-libbinder_a_SOURCES = $(file_list)
-#else
-# need to fix undefineds first :(
-#shlibdir = $(pkglibdir)/inspectors
-#shlib_LTLIBRARIES = binder.la
-#binder_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#binder_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#binder_la_SOURCES = $(file_list)
-#endif
-
diff --git a/src/network_inspectors/normalize/Makefile.am b/src/network_inspectors/normalize/Makefile.am
deleted file mode 100644 (file)
index e3e39ed..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-
-noinst_LIBRARIES = libnormalize.a
-
-libnormalize_a_SOURCES = \
-normalize.cc normalize.h \
-norm_module.cc norm_module.h \
-norm.cc norm.h
-
diff --git a/src/network_inspectors/packet_capture/Makefile.am b/src/network_inspectors/packet_capture/Makefile.am
deleted file mode 100644 (file)
index 731b143..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-file_list = \
-capture_module.cc capture_module.h \
-packet_capture.cc packet_capture.h 
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = libpacket_capture.a
-libpacket_capture_a_SOURCES = ${file_list}
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = packet_capture.la
-packet_capture_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-packet_capture_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-packet_capture_la_SOURCES = $(file_list)
-endif
-
diff --git a/src/network_inspectors/perf_monitor/Makefile.am b/src/network_inspectors/perf_monitor/Makefile.am
deleted file mode 100644 (file)
index 348fe7a..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-
-noinst_LIBRARIES = libperf_monitor.a
-
-libperf_monitor_a_SOURCES = \
-base_tracker.cc base_tracker.h \
-csv_formatter.cc csv_formatter.h \
-cpu_tracker.cc cpu_tracker.h \
-flow_tracker.cc flow_tracker.h \
-flow_ip_tracker.cc flow_ip_tracker.h \
-json_formatter.cc json_formatter.h \
-perf_formatter.cc perf_formatter.h \
-perf_monitor.cc perf_monitor.h \
-perf_module.cc perf_module.h \
-perf_tracker.cc perf_tracker.h \
-text_formatter.cc text_formatter.h
-
-if HAVE_FLATBUFFERS
-libperf_monitor_a_SOURCES += fbs_formatter.cc fbs_formatter.h
-endif
diff --git a/src/network_inspectors/port_scan/Makefile.am b/src/network_inspectors/port_scan/Makefile.am
deleted file mode 100644 (file)
index 35e566c..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-file_list = \
-port_scan.cc \
-ps_detect.cc \
-ps_detect.h \
-ps_inspect.h \
-ps_module.cc \
-ps_module.h \
-ipobj.cc \
-ipobj.h
-
-# static due to dependance on functions throughout Snort++
-#if STATIC_INSPECTORS
-
-noinst_LIBRARIES = libport_scan.a
-libport_scan_a_SOURCES = $(file_list)
-
-#else
-#shlibdir = $(pkglibdir)/inspectors
-#shlib_LTLIBRARIES = port_scan.la
-#port_scan_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#port_scan_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#port_scan_la_SOURCES = $(file_list)
-#endif
diff --git a/src/network_inspectors/reputation/Makefile.am b/src/network_inspectors/reputation/Makefile.am
deleted file mode 100644 (file)
index c0e1d7d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-noinst_LIBRARIES = libreputation.a
-
-libreputation_a_SOURCES = \
-reputation_config.h \
-reputation_inspect.h \
-reputation_inspect.cc \
-reputation_module.cc \
-reputation_module.h \
-reputation_parse.h \
-reputation_parse.cc 
diff --git a/src/packet_io/Makefile.am b/src/packet_io/Makefile.am
deleted file mode 100644 (file)
index 6a02e6d..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
-noinst_LIBRARIES = libpacket_io.a
-
-x_includedir = $(pkgincludedir)/packet_io
-
-x_include_HEADERS = \
-active.h \
-sfdaq.h
-
-libpacket_io_a_SOURCES = \
-active.cc \
-active.h \
-intf.cc \
-intf.h \
-sfdaq.cc \
-sfdaq.h \
-sfdaq_config.cc \
-sfdaq_config.h \
-sfdaq_module.cc \
-sfdaq_module.h \
-trough.cc \
-trough.h
-
-if ENABLE_UNIT_TESTS
-libpacket_io_a_SOURCES += test/sfdaq_module_test.cc
-endif
-
diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
deleted file mode 100644 (file)
index 7951e72..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-
-noinst_LIBRARIES = libparser.a
-
-libparser_a_SOURCES = \
-arg_list.cc arg_list.h \
-parser.cc parser.h \
-parse_conf.cc parse_conf.h \
-parse_ip.cc parse_ip.h \
-parse_ports.cc parse_ports.h \
-parse_rule.cc parse_rule.h \
-parse_stream.cc parse_stream.h \
-parse_utils.cc parse_utils.h \
-cmd_line.cc cmd_line.h \
-config_file.cc config_file.h \
-mstring.cc mstring.h \
-vars.cc vars.h
-
diff --git a/src/piglet/Makefile.am b/src/piglet/Makefile.am
deleted file mode 100644 (file)
index 063202d..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-noinst_LIBRARIES = libpiglet.a
-
-libpiglet_a_SOURCES = \
-piglet.cc \
-piglet.h \
-piglet_api.h \
-piglet_manager.cc \
-piglet_manager.h \
-piglet_output.cc \
-piglet_output.h \
-piglet_runner.cc \
-piglet_runner.h \
-piglet_utils.cc \
-piglet_utils.h
-
diff --git a/src/piglet_plugins/Makefile.am b/src/piglet_plugins/Makefile.am
deleted file mode 100644 (file)
index 721134e..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-
-noinst_LIBRARIES = libpiglet_plugins.a
-
-libpiglet_plugins_a_SOURCES = \
-piglet_plugins.cc \
-piglet_plugins.h
-
-interface_list = \
-pp_buffer_iface.cc \
-pp_buffer_iface.h \
-pp_codec_data_iface.cc \
-pp_codec_data_iface.h \
-pp_codec_iface.cc \
-pp_codec_iface.h \
-pp_cursor_iface.cc \
-pp_cursor_iface.h \
-pp_daq_pkthdr_iface.cc \
-pp_daq_pkthdr_iface.h \
-pp_decode_data_iface.cc \
-pp_decode_data_iface.h \
-pp_enc_state_iface.cc \
-pp_enc_state_iface.h \
-pp_event_iface.cc \
-pp_event_iface.h \
-pp_flow_iface.cc \
-pp_flow_iface.h \
-pp_inspector_iface.cc \
-pp_inspector_iface.h \
-pp_ip_api_iface.cc \
-pp_ip_api_iface.h \
-pp_ips_action_iface.cc \
-pp_ips_action_iface.h \
-pp_ips_option_iface.cc \
-pp_ips_option_iface.h \
-pp_logger_iface.cc \
-pp_logger_iface.h \
-pp_packet_iface.cc \
-pp_packet_iface.h \
-pp_raw_buffer_iface.cc \
-pp_raw_buffer_iface.h \
-pp_search_engine_iface.cc \
-pp_search_engine_iface.h \
-pp_so_rule_iface.cc \
-pp_so_rule_iface.h \
-pp_stream_splitter_iface.cc \
-pp_stream_splitter_iface.h
-
-plugin_list = \
-pp_codec.cc \
-pp_inspector.cc \
-pp_ips_action.cc \
-pp_ips_option.cc \
-pp_logger.cc \
-pp_search_engine.cc \
-pp_so_rule.cc \
-pp_test.cc
-
-libpiglet_plugins_a_SOURCES += $(plugin_list)
-libpiglet_plugins_a_SOURCES += $(interface_list)
-
diff --git a/src/ports/Makefile.am b/src/ports/Makefile.am
deleted file mode 100644 (file)
index 71f0093..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-noinst_LIBRARIES = libports.a
-
-libports_a_SOURCES = \
-port_group.cc \
-port_group.h \
-port_item.cc \
-port_item.h \
-port_object.cc \
-port_object.h \
-port_object2.cc \
-port_object2.h \
-port_table.cc \
-port_table.h \
-port_utils.cc \
-port_utils.h \
-port_var_table.cc \
-port_var_table.h \
-rule_port_tables.cc \
-rule_port_tables.h
-
diff --git a/src/profiler/Makefile.am b/src/profiler/Makefile.am
deleted file mode 100644 (file)
index 7ff717a..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-noinst_LIBRARIES = libprofiler.a
-
-x_includedir = $(pkgincludedir)/profiler
-
-x_include_HEADERS = \
-memory_defs.h \
-memory_context.h \
-memory_profiler_defs.h \
-profiler.h \
-profiler_defs.h \
-rule_profiler_defs.h \
-time_profiler_defs.h
-
-libprofiler_a_SOURCES = \
-active_context.h \
-memory_context.cc \
-memory_profiler.cc \
-memory_profiler.h \
-memory_profiler_active_context.h \
-profiler.cc \
-profiler_printer.h \
-profiler_stats_table.cc \
-profiler_stats_table.h \
-profiler_tree_builder.h \
-profiler_nodes.cc \
-profiler_nodes.h \
-rule_profiler.cc \
-rule_profiler.h \
-time_profiler.cc \
-time_profiler.h
-
diff --git a/src/protocols/Makefile.am b/src/protocols/Makefile.am
deleted file mode 100644 (file)
index 3274bfa..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-
-x_includedir = $(pkgincludedir)/protocols
-
-noinst_LIBRARIES = libprotocols.a
-
-x_include_HEADERS = \
-arp.h \
-eapol.h \
-eth.h \
-icmp4.h \
-icmp6.h \
-ip.h \
-ipv4.h \
-ipv4_options.h \
-ipv6.h \
-gre.h \
-layer.h \
-linux_sll.h \
-mpls.h \
-packet.h \
-packet_manager.h \
-protocol_ids.h \
-ssl.h \
-tcp.h \
-tcp_options.h \
-teredo.h \
-token_ring.h \
-udp.h \
-vlan.h \
-wlan.h
-
-libprotocols_a_SOURCES = \
-layer.cc \
-packet_manager.cc \
-packet.cc \
-ip.cc \
-ipv4_options.cc \
-tcp_options.cc \
-ssl.cc
-
diff --git a/src/pub_sub/Makefile.am b/src/pub_sub/Makefile.am
deleted file mode 100644 (file)
index 54d428c..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-
-x_includedir = $(pkgincludedir)/pub_sub
-
-noinst_LIBRARIES = libpub_sub.a
-
-x_include_HEADERS = \
-expect_events.h \
-http_events.h \
-sip_events.h
-
-libpub_sub_a_SOURCES = \
-http_events.cc \
-sip_events.cc
-
-#if ENABLE_UNIT_TESTS
-#SUBDIRS = test
-#endif
diff --git a/src/search_engines/Makefile.am b/src/search_engines/Makefile.am
deleted file mode 100644 (file)
index bc6fef1..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-
-noinst_LIBRARIES = libsearch_engines.a
-
-x_includedir = $(pkgincludedir)/search_engines
-
-x_include_HEADERS = \
-search_common.h \
-search_tool.h
-
-acsmx_sources = \
-ac_std.cc \
-acsmx.cc \
-acsmx.h
-
-acsmx2_sources = \
-ac_banded.cc \
-ac_full.cc \
-ac_sparse.cc \
-ac_sparse_bands.cc \
-acsmx2.cc \
-acsmx2.h \
-acsmx2_api.cc
-
-bnfa_sources = \
-ac_bnfa.cc \
-bnfa_search.cc \
-bnfa_search.h
-
-if HAVE_HYPERSCAN
-hyper_sources = \
-hyperscan.cc \
-hyperscan.h
-endif
-
-plugin_list = \
-$(acsmx_sources) \
-$(acsmx2_sources) \
-$(intel_sources)
-
-libsearch_engines_a_SOURCES = \
-pat_stats.h \
-search_engines.cc \
-search_engines.h \
-search_tool.cc \
-$(bnfa_sources) \
-$(hyper_sources)
-
-if STATIC_SEARCH_ENGINES
-libsearch_engines_a_SOURCES += $(plugin_list)
-else
-mpselibdir = $(pkglibdir)/search_engines
-
-mpselib_LTLIBRARIES = acsmx.la
-acsmx_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-acsmx_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-acsmx_la_SOURCES = $(acsmx_sources)
-
-mpselib_LTLIBRARIES += acsmx2.la
-acsmx2_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-acsmx2_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-acsmx2_la_SOURCES = $(acsmx2_sources)
-endif
-
-if BUILD_CPPUTESTS
-SUBDIRS = test
-endif
-
diff --git a/src/search_engines/test/Makefile.am b/src/search_engines/test/Makefile.am
deleted file mode 100644 (file)
index a676deb..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-search_tool_test
-
-TESTS = $(check_PROGRAMS)
-
-search_tool_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-search_tool_test_LDADD = \
-../libsearch_engines.a \
-../../catch/unit_test.o \
-@CPPUTEST_LDFLAGS@
-
-if HAVE_HYPERSCAN
-check_PROGRAMS += hyperscan_test
-
-hyperscan_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-
-hyperscan_test_LDADD = \
-../hyperscan.o \
-../../catch/unit_test.o \
-@CPPUTEST_LDFLAGS@
-endif
-
diff --git a/src/service_inspectors/Makefile.am b/src/service_inspectors/Makefile.am
deleted file mode 100644 (file)
index 5262912..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-
-noinst_LIBRARIES = libservice_inspectors.a
-
-libservice_inspectors_a_SOURCES = \
-service_inspectors.cc \
-service_inspectors.h
-
-# FIXIT LIBADD here causes undefineds
-#libservice_inspectors_a_LIBADD = \
-#back_orifice/libback_orifice.a \
-#ftp_telnet/libftp_telnet.a \
-#http_inspect/libhttp_inspect.a \
-#http_inspect2/libhttp2_inspect.a \
-#rpc_decode/librpc_decode.a
-#wizard/libwizard.a
-
-SUBDIRS = \
-back_orifice \
-dce_rpc \
-dnp3 \
-dns \
-ftp_telnet \
-gtp \
-imap \
-modbus \
-http_inspect \
-http2_inspect \
-pop \
-rpc_decode \
-sip \
-smtp \
-ssh \
-ssl \
-wizard
-
diff --git a/src/service_inspectors/back_orifice/Makefile.am b/src/service_inspectors/back_orifice/Makefile.am
deleted file mode 100644 (file)
index 2040312..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-
-file_list = \
-back_orifice.cc
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = libback_orifice.a
-libback_orifice_a_SOURCES = $(file_list)
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = back_orifice.la
-back_orifice_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-back_orifice_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-back_orifice_la_SOURCES = $(file_list)
-endif
-
diff --git a/src/service_inspectors/dce_rpc/Makefile.am b/src/service_inspectors/dce_rpc/Makefile.am
deleted file mode 100644 (file)
index 2ae13c2..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-file_list = \
-dce_co.cc \
-dce_co.h \
-dce_common.cc \
-dce_common.h \
-dce_http_common.cc \
-dce_http_common.h \
-dce_http_proxy.cc \
-dce_http_proxy_module.cc \
-dce_http_proxy_module.h \
-dce_http_proxy_splitter.cc \
-dce_http_proxy_splitter.h \
-dce_http_server.cc\
-dce_http_server_module.cc \
-dce_http_server_module.h \
-dce_http_server_splitter.cc \
-dce_http_server_splitter.h \
-dce_list.cc \
-dce_list.h \
-dce_smb.cc \
-dce_smb.h \
-dce_smb2.cc \
-dce_smb2.h \
-dce_smb_commands.cc \
-dce_smb_commands.h \
-dce_smb_module.cc \
-dce_smb_module.h \
-dce_smb_paf.cc \
-dce_smb_paf.h \
-dce_smb_transaction.cc \
-dce_smb_transaction.h \
-dce_smb_transaction_utils.cc \
-dce_smb_transaction_utils.h \
-dce_smb_utils.cc \
-dce_smb_utils.h \
-dce_tcp.cc\
-dce_tcp.h \
-dce_tcp_module.cc \
-dce_tcp_module.h \
-dce_tcp_paf.cc \
-dce_tcp_paf.h \
-dce_udp.cc\
-dce_udp.h \
-dce_udp_module.cc \
-dce_udp_module.h \
-dce_udp_processing.cc \
-dce_utils.cc \
-dce_utils.h \
-ips_dce_iface.cc \
-ips_dce_opnum.cc \
-ips_dce_stub_data.cc \
-smb_common.h \
-smb_message.cc \
-smb_message.h
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = libdce_rpc.a
-libdce_rpc_a_SOURCES = $(file_list)
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = dce_rpc.la
-dce_rpc_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-dce_rpc_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-dce_rpc_la_SOURCES = $(file_list)
-endif
diff --git a/src/service_inspectors/dnp3/Makefile.am b/src/service_inspectors/dnp3/Makefile.am
deleted file mode 100644 (file)
index 3231d5c..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-
-file_list = \
-dnp3.cc \
-dnp3.h \
-dnp3_map.cc \
-dnp3_map.h \
-dnp3_module.cc \
-dnp3_module.h \
-dnp3_reassembly.cc \
-dnp3_reassembly.h \
-dnp3_paf.cc\
-dnp3_paf.h \
-ips_dnp3_data.cc \
-ips_dnp3_func.cc \
-ips_dnp3_ind.cc \
-ips_dnp3_obj.cc
-
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = libdnp3.a
-libdnp3_a_SOURCES = $(file_list)
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = dnp3.la
-dnp3_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-dnp3_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-dnp3_la_SOURCES = $(file_list)
-endif
diff --git a/src/service_inspectors/dns/Makefile.am b/src/service_inspectors/dns/Makefile.am
deleted file mode 100644 (file)
index 3ef7c0a..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-
-file_list = \
-dns.cc \
-dns.h \
-dns_module.cc \
-dns_module.h
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = libdns.a
-libdns_a_SOURCES = $(file_list)
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = dns.la
-dns_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-dns_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-dns_la_SOURCES = $(file_list)
-endif
-
diff --git a/src/service_inspectors/ftp_telnet/Makefile.am b/src/service_inspectors/ftp_telnet/Makefile.am
deleted file mode 100644 (file)
index 677086d..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-
-file_list = \
-ft_main.cc ft_main.h \
-ftp.cc \
-ftp_module.cc ftp_module.h \
-ftp_parse.cc ftp_parse.h \
-ftp_print.cc ftp_print.h \
-ftp_data.cc ftp_data.h \
-ftp_bounce_lookup.cc ftp_bounce_lookup.h \
-ftp_client.h \
-ftp_cmd_lookup.cc ftp_cmd_lookup.h \
-ftpp_return_codes.h \
-ftpp_si.cc ftpp_si.h \
-ftpp_ui_config.cc ftpp_ui_config.h \
-ftp_server.h \
-ftp_splitter.cc ftp_splitter.h \
-ftpdata_splitter.cc ftpdata_splitter.h \
-pp_ftp.cc pp_ftp.h \
-pp_telnet.cc pp_telnet.h \
-telnet.cc telnet.h \
-telnet_module.cc telnet_module.h
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = libftp_telnet.a
-libftp_telnet_a_SOURCES = $(file_list)
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = ftp_telnet.la
-ftp_telnet_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ftp_telnet_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ftp_telnet_la_SOURCES = $(file_list)
-endif
-
diff --git a/src/service_inspectors/gtp/Makefile.am b/src/service_inspectors/gtp/Makefile.am
deleted file mode 100644 (file)
index ce2d42f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-file_list = \
-gtp.cc \
-gtp.h \
-gtp_inspect.cc \
-gtp_inspect.h \
-gtp_module.cc \
-gtp_module.h \
-gtp_parser.cc \
-gtp_parser.h \
-ips_gtp_info.cc \
-ips_gtp_type.cc \
-ips_gtp_version.cc
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = libgtp_inspect.a
-libgtp_inspect_a_SOURCES = $(file_list)
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = gtp_inspect.la
-gtp_inspect_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-gtp_inspect_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-gtp_inspect_la_SOURCES = $(file_list)
-endif
-
diff --git a/src/service_inspectors/http2_inspect/Makefile.am b/src/service_inspectors/http2_inspect/Makefile.am
deleted file mode 100644 (file)
index 982b0ed..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-file_list = \
-http2_api.cc http2_api.h \
-http2_enum.h \
-http2_flow_data.cc http2_flow_data.h \
-http2_inspect.cc http2_inspect_impl.cc http2_inspect.h \
-http2_module.cc http2_module.h \
-http2_stream_splitter.cc http2_stream_splitter_impl.cc http2_stream_splitter.h \
-http2_tables.cc \
-ips_http2.cc ips_http2.h
-
-noinst_LIBRARIES = libhttp2_inspect.a
-libhttp2_inspect_a_SOURCES = $(file_list)
-
diff --git a/src/service_inspectors/http_inspect/Makefile.am b/src/service_inspectors/http_inspect/Makefile.am
deleted file mode 100644 (file)
index 8635bac..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-file_list = \
-http_inspect.cc http_inspect.h \
-http_msg_section.cc http_msg_section.h \
-http_msg_start.cc http_msg_start.h \
-http_msg_request.cc http_msg_request.h \
-http_msg_status.cc http_msg_status.h \
-http_msg_head_shared.cc http_msg_head_shared_util.cc http_msg_head_shared.h \
-http_msg_header.cc http_msg_header.h \
-http_msg_body.cc http_msg_body.h \
-http_msg_body_cl.cc http_msg_body_cl.h \
-http_msg_body_chunk.cc http_msg_body_chunk.h \
-http_msg_body_old.cc http_msg_body_old.h \
-http_msg_trailer.cc http_msg_trailer.h \
-http_header_normalizer.cc http_header_normalizer.h \
-http_uri.cc http_uri.h \
-http_uri_norm.cc http_uri_norm.h \
-http_normalizers.cc http_normalizers.h \
-http_str_to_code.cc http_str_to_code.h \
-http_api.cc http_api.h \
-http_tables.cc \
-http_module.cc http_module.h \
-http_test_input.cc http_test_input.h \
-http_flow_data.cc http_flow_data.h \
-http_transaction.cc http_transaction.h \
-http_stream_splitter_finish.cc http_stream_splitter_reassemble.cc http_stream_splitter_scan.cc \
-http_stream_splitter.h \
-http_cutter.cc http_cutter.h \
-http_enum.h \
-http_test_manager.cc http_test_manager.h \
-http_field.cc http_field.h \
-http_infractions.h \
-http_event_gen.h \
-http_js_norm.cc http_js_norm.h \
-ips_http.cc ips_http.h
-
-#if STATIC_INSPECTORS
-noinst_LIBRARIES = libhttp_inspect.a
-libhttp_inspect_a_SOURCES = $(file_list)
-
-#else
-#shlibdir = $(pkglibdir)/inspectors
-#shlib_LTLIBRARIES = http_inspect.la
-#http_inspect_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#http_inspect_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#http_inspect_la_SOURCES = $(file_list)
-#
-#endif
-
-if BUILD_CPPUTESTS
-SUBDIRS = test
-endif
-
diff --git a/src/service_inspectors/http_inspect/test/Makefile.am b/src/service_inspectors/http_inspect/test/Makefile.am
deleted file mode 100644 (file)
index 41ce9b0..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-http_uri_norm_test \
-http_normalizers_test \
-http_module_test \
-http_transaction_test \
-http_msg_head_shared_util_test
-
-TESTS = $(check_PROGRAMS)
-
-http_uri_norm_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-http_uri_norm_test_LDADD = \
-../http_uri_norm.o \
-../http_module.o \
-../http_test_manager.o \
-../http_test_input.o \
-../http_normalizers.o \
-../http_str_to_code.o \
-../http_field.o \
-../http_tables.o \
-../../../framework/module.o \
-@CPPUTEST_LDFLAGS@
-
-http_normalizers_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-http_normalizers_test_LDADD = \
-../http_normalizers.o \
-../http_field.o \
-@CPPUTEST_LDFLAGS@
-
-http_module_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-http_module_test_LDADD = \
-../http_module.o \
-../http_tables.o \
-../http_normalizers.o \
-../http_uri_norm.o \
-../http_field.o \
-../../../framework/module.o \
-@CPPUTEST_LDFLAGS@
-
-http_transaction_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-http_transaction_test_LDADD = \
-../http_transaction.o \
-../http_flow_data.o \
-../http_test_manager.o \
-../http_test_input.o \
-@CPPUTEST_LDFLAGS@
-
-http_msg_head_shared_util_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-http_msg_head_shared_util_test_LDADD = \
-../http_msg_head_shared_util.o \
-../http_field.o \
-../http_str_to_code.o \
-@CPPUTEST_LDFLAGS@
-
-
diff --git a/src/service_inspectors/imap/Makefile.am b/src/service_inspectors/imap/Makefile.am
deleted file mode 100644 (file)
index 614823f..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-
-file_list = \
-imap_config.h \
-imap.cc \
-imap.h \
-imap_paf.cc \
-imap_paf.h \
-imap_module.cc \
-imap_module.h
-
-# can't be linked dynamically yet
-#if STATIC_INSPECTORS
-noinst_LIBRARIES = libimap.a
-libimap_a_SOURCES = $(file_list)
-#else
-#shlibdir = $(pkglibdir)/inspectors
-#shlib_LTLIBRARIES = imap.la
-#imap_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#imap_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#imap_la_SOURCES = $(file_list)
-#endif
-
diff --git a/src/service_inspectors/modbus/Makefile.am b/src/service_inspectors/modbus/Makefile.am
deleted file mode 100644 (file)
index 6465e4a..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-
-file_list = \
-ips_modbus_data.cc \
-ips_modbus_func.cc \
-ips_modbus_unit.cc \
-modbus.cc \
-modbus.h \
-modbus_decode.cc \
-modbus_decode.h \
-modbus_module.cc \
-modbus_module.h \
-modbus_paf.cc \
-modbus_paf.h
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = libmodbus.a
-libmodbus_a_SOURCES = $(file_list)
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = modbus.la
-modbus_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-modbus_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-modbus_la_SOURCES = $(file_list)
-endif
-
-EXTRA_DIST = dev_notes.txt
diff --git a/src/service_inspectors/pop/Makefile.am b/src/service_inspectors/pop/Makefile.am
deleted file mode 100644 (file)
index d105933..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-
-file_list = \
-pop_config.h \
-pop.cc \
-pop.h \
-pop_paf.cc \
-pop_paf.h \
-pop_module.cc \
-pop_module.h
-
-# can't be linked dynamically yet
-#if STATIC_INSPECTORS
-noinst_LIBRARIES = libpop.a
-libpop_a_SOURCES = $(file_list)
-#else
-#shlibdir = $(pkglibdir)/inspectors
-#shlib_LTLIBRARIES = pop.la
-#pop_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#pop_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#pop_la_SOURCES = $(file_list)
-#endif
-
diff --git a/src/service_inspectors/rpc_decode/Makefile.am b/src/service_inspectors/rpc_decode/Makefile.am
deleted file mode 100644 (file)
index dc23aa2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-
-file_list = \
-rpc_decode.cc \
-rpc_module.cc \
-rpc_module.h
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = librpc_decode.a
-librpc_decode_a_SOURCES = $(file_list)
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = rpc_decode.la
-rpc_decode_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-rpc_decode_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-rpc_decode_la_SOURCES = $(file_list)
-endif
-
diff --git a/src/service_inspectors/sip/Makefile.am b/src/service_inspectors/sip/Makefile.am
deleted file mode 100644 (file)
index 0d80373..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-
-file_list = \
-sip_common.h \
-sip_config.h \
-sip_config.cc \
-sip_utils.h \
-sip_utils.cc \
-sip_parser.h \
-sip_parser.cc \
-sip_dialog.h \
-sip_dialog.cc \
-sip.cc \
-sip.h \
-sip_roptions.h \
-sip_module.cc \
-sip_module.h \
-ips_sip.cc \
-ips_sip_stat_code.cc \
-ips_sip_method.cc
-
-#if STATIC_INSPECTORS
-noinst_LIBRARIES = libsip.a
-libsip_a_SOURCES = $(file_list)
-#else
-#shlibdir = $(pkglibdir)/inspectors
-#shlib_LTLIBRARIES = sip.la
-#sip_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#sip_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#sip_la_SOURCES = $(file_list)
-#endif
-
diff --git a/src/service_inspectors/smtp/Makefile.am b/src/service_inspectors/smtp/Makefile.am
deleted file mode 100644 (file)
index fdf7d5a..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-
-file_list = \
-smtp_config.h \
-smtp.cc \
-smtp.h \
-smtp_util.cc \
-smtp_util.h \
-smtp_xlink2state.cc \
-smtp_xlink2state.h \
-smtp_normalize.cc \
-smtp_normalize.h \
-smtp_paf.cc \
-smtp_paf.h \
-smtp_module.cc \
-smtp_module.h
-
-# can't be linked dynamically yet
-#if STATIC_INSPECTORS
-noinst_LIBRARIES = libsmtp.a
-libsmtp_a_SOURCES = $(file_list)
-#else
-#shlibdir = $(pkglibdir)/inspectors
-#shlib_LTLIBRARIES = smtp.la
-#smtp_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#smtp_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#smtp_la_SOURCES = $(file_list)
-#endif
-
diff --git a/src/service_inspectors/ssh/Makefile.am b/src/service_inspectors/ssh/Makefile.am
deleted file mode 100644 (file)
index de5b3ab..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-
-file_list = \
-ssh_config.h \
-ssh.cc \
-ssh.h \
-ssh_module.cc \
-ssh_module.h
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = libssh.a
-libssh_a_SOURCES = $(file_list)
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = ssh.la
-ssh_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-ssh_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-ssh_la_SOURCES = $(file_list)
-endif
-
diff --git a/src/service_inspectors/ssl/Makefile.am b/src/service_inspectors/ssl/Makefile.am
deleted file mode 100644 (file)
index b38c5da..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-file_list = \
-ips_ssl_state.cc \
-ips_ssl_version.cc \
-ssl_config.h \
-ssl_inspector.cc \
-ssl_inspector.h \
-ssl_module.cc \
-ssl_module.h \
-ssl_splitter.cc \
-ssl_splitter.h
-
-# can't be linked dynamically yet
-#if STATIC_INSPECTORS
-noinst_LIBRARIES = libssl.a
-libssl_a_SOURCES = $(file_list)
-#else
-#shlibdir = $(pkglibdir)/inspectors
-#shlib_LTLIBRARIES = libssl.la
-#libssl_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-#libssl_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-#libssl_la_SOURCES = $(file_list)
-#endif
-
diff --git a/src/service_inspectors/wizard/Makefile.am b/src/service_inspectors/wizard/Makefile.am
deleted file mode 100644 (file)
index be0fa5d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-file_list = \
-curses.cc \
-curses.h \
-magic.cc magic.h \
-hexes.cc \
-spells.cc \
-wizard.cc \
-wiz_module.cc wiz_module.h
-
-if STATIC_INSPECTORS
-noinst_LIBRARIES = libwizard.a
-libwizard_a_SOURCES = $(file_list)
-else
-shlibdir = $(pkglibdir)/inspectors
-shlib_LTLIBRARIES = wizard.la
-wizard_la_CXXFLAGS = $(AM_CXXFLAGS) -DBUILDING_SO
-wizard_la_LDFLAGS = $(AM_LDFLAGS) -module -export-dynamic -avoid-version -shared
-wizard_la_SOURCES = $(file_list)
-endif
-
diff --git a/src/sfip/Makefile.am b/src/sfip/Makefile.am
deleted file mode 100644 (file)
index 517d1ee..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-
-noinst_LIBRARIES = libsfip.a
-
-x_includedir = $(pkgincludedir)/sfip
-
-x_include_HEADERS = \
-sf_returns.h \
-sf_cidr.h \
-sf_ip.h
-
-libsfip_a_SOURCES = \
-sf_cidr.cc \
-sf_ip.cc \
-sf_ipvar.cc \
-sf_ipvar.h \
-sf_vartable.cc \
-sf_vartable.h
-
-if ENABLE_UNIT_TESTS
-libsfip_a_SOURCES += sfip_test.cc
-endif
-
diff --git a/src/sfrt/Makefile.am b/src/sfrt/Makefile.am
deleted file mode 100644 (file)
index a923936..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-
-noinst_LIBRARIES = libsfrt.a
-
-libsfrt_a_SOURCES = \
-sfrt.cc \
-sfrt.h \
-sfrt_dir.cc \
-sfrt_dir.h \
-sfrt_flat.cc \
-sfrt_flat.h \
-sfrt_flat_dir.cc \
-sfrt_flat_dir.h
-
-if ENABLE_UNIT_TESTS
-libsfrt_a_SOURCES += sfrt_test.cc
-endif
-
diff --git a/src/side_channel/Makefile.am b/src/side_channel/Makefile.am
deleted file mode 100644 (file)
index cca13e6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-noinst_LIBRARIES = libside_channel.a
-
-libside_channel_a_SOURCES = \
-side_channel.cc \
-side_channel.h \
-side_channel_module.cc \
-side_channel_module.h
-
-if ENABLE_UNIT_TESTS
-SUBDIRS = test
-endif
-
diff --git a/src/side_channel/test/Makefile.am b/src/side_channel/test/Makefile.am
deleted file mode 100644 (file)
index f1a74a7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-side_channel_test \
-side_channel_module_test
-
-TESTS = $(check_PROGRAMS)
-
-side_channel_test_CPPFLAGS = @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-side_channel_module_test_CPPFLAGS = @AM_CPPFLAGS@ @CPPUTEST_CPPFLAGS@
-
-side_channel_test_LDADD = \
-../side_channel.o \
-../../framework/libframework.a \
-../../sfip/libsfip.a \
-../../catch/libcatch_tests.a \
-@CPPUTEST_LDFLAGS@
-
-side_channel_module_test_LDADD = \
-../side_channel_module.o \
-../../framework/libframework.a \
-../../sfip/libsfip.a \
-../../catch/libcatch_tests.a \
-@CPPUTEST_LDFLAGS@
-
diff --git a/src/stream/Makefile.am b/src/stream/Makefile.am
deleted file mode 100644 (file)
index 77fdbfe..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-
-noinst_LIBRARIES = \
-libstream.a \
-libstream_paf.a
-
-x_includedir = $(pkgincludedir)/stream
-
-x_include_HEADERS = \
-paf.h \
-stream.h \
-stream_splitter.h
-
-libstream_a_SOURCES = \
-stream.cc \
-stream_inspectors.cc \
-stream_inspectors.h \
-stream_splitter.cc
-
-libstream_paf_a_SOURCES = \
-flush_bucket.cc \
-flush_bucket.h \
-paf.cc
-
-# FIXIT LIBADD here causes undefineds
-#libstream_a_LIBADD = \
-#libstream_paf_a_LIBADD = \
-#base/libstream_base.a
-#ip/libstream_ip.a
-#icmp/libstream_icmp.a
-#libtcp/libstream_libtcp.a
-#tcp/libstream_tcp.a
-#udp/libstream_udp.a
-#user/libstream_user.a
-#file/libstream_file.a
-
-SUBDIRS = \
-base \
-ip \
-icmp \
-libtcp \
-tcp \
-udp \
-user \
-file
-
-if BUILD_CPPUTESTS
-SUBDIRS += test
-endif
-
diff --git a/src/stream/base/Makefile.am b/src/stream/base/Makefile.am
deleted file mode 100644 (file)
index 1eb0a89..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-noinst_LIBRARIES = libstream_base.a
-
-libstream_base_a_SOURCES = \
-stream_base.cc \
-stream_ha.cc \
-stream_ha.h \
-stream_module.cc \
-stream_module.h
-
diff --git a/src/stream/file/Makefile.am b/src/stream/file/Makefile.am
deleted file mode 100644 (file)
index dd7fc60..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-noinst_LIBRARIES = libstream_file.a
-
-libstream_file_a_SOURCES = \
-file_module.cc \
-file_module.h \
-file_session.cc \
-file_session.h \
-stream_file.cc \
-stream_file.h
-
diff --git a/src/stream/icmp/Makefile.am b/src/stream/icmp/Makefile.am
deleted file mode 100644 (file)
index fba7ea3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-noinst_LIBRARIES = libstream_icmp.a
-
-libstream_icmp_a_SOURCES = \
-icmp_ha.cc \
-icmp_ha.h \
-icmp_module.cc \
-icmp_module.h \
-icmp_session.cc \
-icmp_session.h \
-stream_icmp.cc \
-stream_icmp.h
-
diff --git a/src/stream/ip/Makefile.am b/src/stream/ip/Makefile.am
deleted file mode 100644 (file)
index 9468cad..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-
-noinst_LIBRARIES = libstream_ip.a
-
-libstream_ip_a_SOURCES = \
-ip_defrag.cc \
-ip_defrag.h \
-ip_ha.cc \
-ip_ha.h \
-ip_module.cc \
-ip_module.h \
-ip_session.cc \
-ip_session.h \
-stream_ip.cc \
-stream_ip.h
-
diff --git a/src/stream/libtcp/Makefile.am b/src/stream/libtcp/Makefile.am
deleted file mode 100644 (file)
index a53a4eb..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-noinst_LIBRARIES = libstream_libtcp.a
-
-libstream_libtcp_a_SOURCES = \
-tcp_segment_descriptor.cc \
-tcp_segment_descriptor.h \
-tcp_stream_session.cc \
-tcp_stream_session.h \
-tcp_stream_tracker.cc \
-tcp_stream_tracker.h \
-tcp_state_handler.cc \
-tcp_state_handler.h \
-tcp_state_machine.cc \
-tcp_state_machine.h \
-tcp_segment_descriptor.cc \
-tcp_segment_descriptor.h
-
-if ENABLE_UNIT_TESTS
-libstream_libtcp_a_SOURCES += \
-stream_tcp_unit_test.cc \
-stream_tcp_unit_test.h
-endif
-
-
diff --git a/src/stream/tcp/Makefile.am b/src/stream/tcp/Makefile.am
deleted file mode 100644 (file)
index ef1b78c..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-
-noinst_LIBRARIES = libstream_tcp.a
-
-libstream_tcp_a_SOURCES = \
-ips_stream_reassemble.cc \
-ips_stream_size.cc \
-segment_overlap_editor.h \
-segment_overlap_editor.cc \
-stream_tcp.cc \
-stream_tcp.h \
-tcp_ha.cc \
-tcp_ha.h \
-tcp_module.cc \
-tcp_module.h \
-tcp_debug_trace.h \
-tcp_defs.h \
-tcp_event_logger.h \
-tcp_event_logger.cc \
-tcp_stream_config.h \
-tcp_stream_config.cc \
-tcp_normalizer.h \
-tcp_normalizer.cc \
-tcp_normalizers.h \
-tcp_normalizers.cc \
-tcp_segment_node.h \
-tcp_segment_node.cc \
-tcp_reassembler.h \
-tcp_reassembler.cc \
-tcp_reassemblers.h \
-tcp_reassemblers.cc \
-tcp_tracker.cc \
-tcp_tracker.h \
-tcp_session.cc \
-tcp_session.h \
-tcp_state_closed.cc \
-tcp_state_close_wait.cc \
-tcp_state_closing.cc \
-tcp_state_established.cc \
-tcp_state_fin_wait1.cc \
-tcp_state_fin_wait2.cc \
-tcp_state_last_ack.cc \
-tcp_state_listen.cc \
-tcp_state_none.cc \
-tcp_state_syn_recv.cc \
-tcp_state_syn_sent.cc \
-tcp_state_time_wait.cc \
-tcp_state_closed.h \
-tcp_state_close_wait.h \
-tcp_state_closing.h \
-tcp_state_established.h \
-tcp_state_fin_wait1.h \
-tcp_state_fin_wait2.h \
-tcp_state_last_ack.h \
-tcp_state_listen.h \
-tcp_state_none.h \
-tcp_state_syn_recv.h \
-tcp_state_syn_sent.h \
-tcp_state_time_wait.h \
-tcp_stream_state_machine.cc \
-tcp_stream_state_machine.h
-
-#if BUILD_CPPUTESTS
-#SUBDIRS = test
-#endif
diff --git a/src/stream/tcp/test/Makefile.am b/src/stream/tcp/test/Makefile.am
deleted file mode 100644 (file)
index da4b5a5..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-tcp_normalizer_test
-
-TESTS = $(check_PROGRAMS)
-
-tcp_normalizer_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-
-tcp_normalizer_test_LDADD = \
-../tcp_normalizer.o \
-../tcp_normalizers.o \
-../../../protocols/tcp_options.o \
-../../../main/snort_debug.o \
-@CPPUTEST_LDFLAGS@
-
diff --git a/src/stream/test/Makefile.am b/src/stream/test/Makefile.am
deleted file mode 100644 (file)
index 66bd0be..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-
-AM_DEFAULT_SOURCE_EXT = .cc
-
-check_PROGRAMS = \
-stream_splitter_test
-
-TESTS = $(check_PROGRAMS)
-
-stream_splitter_test_CPPFLAGS = $(AM_CPPFLAGS) @CPPUTEST_CPPFLAGS@
-
-stream_splitter_test_LDADD = \
-../stream_splitter.o \
-@CPPUTEST_LDFLAGS@
-
diff --git a/src/stream/udp/Makefile.am b/src/stream/udp/Makefile.am
deleted file mode 100644 (file)
index 2473082..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-noinst_LIBRARIES = libstream_udp.a
-
-libstream_udp_a_SOURCES = \
-stream_udp.cc \
-stream_udp.h \
-udp_ha.cc \
-udp_ha.h \
-udp_module.cc \
-udp_module.h \
-udp_session.cc \
-udp_session.h
-
diff --git a/src/stream/user/Makefile.am b/src/stream/user/Makefile.am
deleted file mode 100644 (file)
index e00b3fb..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-noinst_LIBRARIES = libstream_user.a
-
-libstream_user_a_SOURCES = \
-user_module.cc \
-user_module.h \
-user_session.cc \
-user_session.h \
-stream_user.cc \
-stream_user.h
-
diff --git a/src/target_based/Makefile.am b/src/target_based/Makefile.am
deleted file mode 100644 (file)
index 0b14a7f..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-x_includedir = $(pkgincludedir)/target_based
-
-noinst_LIBRARIES = libtarget_based.a
-
-x_include_HEADERS = \
-snort_protocols.h
-
-libtarget_based_a_SOURCES = \
-sftarget_reader.cc \
-sftarget_reader.h \
-sftarget_hostentry.cc \
-sftarget_hostentry.h \
-sftarget_data.h \
-snort_protocols.cc \
-snort_protocols.h
-
-
diff --git a/src/time/Makefile.am b/src/time/Makefile.am
deleted file mode 100644 (file)
index 143445c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-noinst_LIBRARIES = libtime.a
-
-x_includedir = $(pkgincludedir)/time
-
-x_include_HEADERS = \
-clock_defs.h \
-packet_time.h \
-stopwatch.h \
-tsc_clock.h
-
-libtime_a_SOURCES = \
-packet_time.cc \
-periodic.cc \
-periodic.h \
-timersub.h  \
-tsc_clock.cc
-
-if ENABLE_UNIT_TESTS
-libtime_a_SOURCES += stopwatch_test.cc
-endif
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
deleted file mode 100644 (file)
index 5aaf812..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-
-noinst_LIBRARIES = libutils.a
-
-x_includedir = $(pkgincludedir)/utils
-
-x_include_HEADERS = \
-bitop.h \
-cpp_macros.h \
-endian.h \
-kmap.h  \
-safec.h \
-segment_mem.h \
-sflsq.h \
-sfmemcap.h \
-stats.h \
-util.h \
-util_cstring.h \
-util_jsnorm.h \
-util_unfold.h \
-util_utf.h
-
-libutils_a_SOURCES = \
-boyer_moore.cc boyer_moore.h \
-dnet_header.h \
-dyn_array.cc dyn_array.h \
-kmap.cc \
-segment_mem.cc \
-sflsq.cc \
-sfmemcap.cc \
-snort_bounds.h \
-stats.cc \
-util.cc \
-util_cstring.cc \
-util_jsnorm.cc \
-util_net.cc util_net.h \
-util_unfold.cc \
-util_utf.cc
-
-if ENABLE_UNIT_TESTS
-libutils_a_SOURCES += bitop_test.cc
-endif
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644 (file)
index 4ff4804..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-
-SUBDIRS = \
-u2boat \
-u2spewfoo \
-snort2lua
-
-if HAVE_FLATBUFFERS
-    SUBDIRS += flatbuffers
-endif
diff --git a/tools/flatbuffers/Makefile.am b/tools/flatbuffers/Makefile.am
deleted file mode 100644 (file)
index 6137ddb..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-bin_PROGRAMS = fbstreamer
-
-fbstreamer_SOURCES = fbstreamer.cc
-
diff --git a/tools/snort2lua/Makefile.am b/tools/snort2lua/Makefile.am
deleted file mode 100644 (file)
index 4b48cce..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-
-bin_PROGRAMS = snort2lua
-
-snort2lua_SOURCES = \
-conversion_state.h \
-conversion_defines.h \
-init_state.h \
-snort2lua.cc \
-init_state.cc
-
-snort2lua_LDADD = \
-keyword_states/libkeyword_states.a \
-preprocessor_states/libpreprocessor_states.a \
-output_states/liboutput_states.a \
-config_states/libconfig_states.a \
-rule_states/librule_states.a \
-helpers/libsnort2lua_helpers.a \
-data/libdata.a \
-data/data_types/libdata_types.a
-
-SUBDIRS = \
-helpers \
-data \
-keyword_states \
-preprocessor_states \
-output_states \
-config_states \
-rule_states
-
-AM_CPPFLAGS = @snort2lua_CPPFLAGS@
-
diff --git a/tools/snort2lua/config_states/Makefile.am b/tools/snort2lua/config_states/Makefile.am
deleted file mode 100644 (file)
index aaddfad..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-
-noinst_LIBRARIES = libconfig_states.a
-
-libconfig_states_a_SOURCES = \
-config_alertfile.cc \
-config_binding.cc \
-config_checksums.cc \
-config_classification.cc \
-config_decode_esp.cc \
-config_default_rule_state.cc \
-config_deleted.cc \
-config_detection.cc \
-config_event_trace.cc \
-config_file.cc \
-config_event_queue.cc \
-config_ignore_ports.cc \
-config_ipv6_frag.cc \
-config_memcaps.cc \
-config_mpls_payload_type.cc \
-config_na_policy_mode.cc \
-config_no_option.cc \
-config_one_int_option.cc \
-config_one_string_option.cc \
-config_order.cc \
-config_paf_max.cc \
-config_ppm.cc \
-config_policy_id.cc \
-config_policy_mode.cc \
-config_policy_uuid.cc \
-config_profile.cc \
-config_reference.cc \
-config_response.cc \
-config_tunnel_verdicts.cc \
-config_api.h \
-config_api.cc
-
-AM_CPPFLAGS = @snort2lua_CPPFLAGS@
-
diff --git a/tools/snort2lua/data/Makefile.am b/tools/snort2lua/data/Makefile.am
deleted file mode 100644 (file)
index 9c1435e..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-noinst_LIBRARIES = libdata.a
-
-libdata_a_SOURCES = \
-dt_data.h \
-dt_data.cc \
-dt_rule_api.h \
-dt_rule_api.cc \
-dt_table_api.h \
-dt_table_api.cc
-
-SUBDIRS = \
-data_types
-
-AM_CPPFLAGS = @snort2lua_CPPFLAGS@
-
diff --git a/tools/snort2lua/data/data_types/Makefile.am b/tools/snort2lua/data/data_types/Makefile.am
deleted file mode 100644 (file)
index 299f8df..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-
-noinst_LIBRARIES = libdata_types.a
-
-libdata_types_a_SOURCES = \
-dt_comment.h \
-dt_comment.cc \
-dt_include.h \
-dt_include.cc \
-dt_option.h \
-dt_option.cc \
-dt_table.h \
-dt_table.cc \
-dt_rule.h \
-dt_rule.cc \
-dt_rule_option.h \
-dt_rule_option.cc \
-dt_rule_suboption.h \
-dt_rule_suboption.cc \
-dt_var.h \
-dt_var.cc
-
-AM_CPPFLAGS = @snort2lua_CPPFLAGS@
-
diff --git a/tools/snort2lua/helpers/Makefile.am b/tools/snort2lua/helpers/Makefile.am
deleted file mode 100644 (file)
index 1eab3b6..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-
-noinst_LIBRARIES = libsnort2lua_helpers.a
-
-libsnort2lua_helpers_a_SOURCES = \
-converter.h \
-converter.cc \
-parse_cmd_line.h \
-parse_cmd_line.cc \
-util_binder.h \
-util_binder.cc \
-s2l_markup.h \
-s2l_markup.cc \
-s2l_util.h \
-s2l_util.cc
-
-AM_CPPFLAGS = @snort2lua_CPPFLAGS@
-
diff --git a/tools/snort2lua/keyword_states/Makefile.am b/tools/snort2lua/keyword_states/Makefile.am
deleted file mode 100644 (file)
index 4738b7f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-noinst_LIBRARIES = libkeyword_states.a
-
-libkeyword_states_a_SOURCES = \
-kws_attribute_table.cc \
-kws_config.cc \
-kws_deleted.cc \
-kws_event_filter.cc \
-kws_file.cc \
-kws_include.cc \
-kws_output.cc \
-kws_paths.cc \
-kws_preprocessor.cc \
-kws_rule.cc \
-kws_rule_state.cc \
-kws_ruletype.cc \
-kws_rate_filter.cc \
-kws_var.cc \
-kws_suppress.cc \
-keywords_api.h \
-keywords_api.cc
-
-AM_CPPFLAGS = @snort2lua_CPPFLAGS@
-
diff --git a/tools/snort2lua/output_states/Makefile.am b/tools/snort2lua/output_states/Makefile.am
deleted file mode 100644 (file)
index 6da0fb8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-
-noinst_LIBRARIES = liboutput_states.a
-
-liboutput_states_a_SOURCES = \
-out_csv.cc \
-out_deleted.cc \
-out_fast.cc \
-out_full.cc \
-out_null.cc \
-out_tcpdump.cc \
-out_test.cc \
-out_syslog.cc \
-out_sfunified2.cc \
-out_unified2.cc \
-out_unixsock.cc \
-output_api.h \
-output_api.cc
-
-AM_CPPFLAGS = @snort2lua_CPPFLAGS@
-
diff --git a/tools/snort2lua/preprocessor_states/Makefile.am b/tools/snort2lua/preprocessor_states/Makefile.am
deleted file mode 100644 (file)
index adae2d0..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-
-noinst_LIBRARIES = libpreprocessor_states.a
-
-libpreprocessor_states_a_SOURCES = \
-pps_appid.cc \
-pps_arpspoof.cc \
-pps_bo.cc \
-pps_dcerpc.cc \
-pps_dcerpc_server.h \
-pps_dcerpc_server.cc \
-pps_dnp3.cc \
-pps_firewall.cc \
-pps_frag3_engine.cc \
-pps_frag3_global.cc \
-pps_ftp_telnet.cc \
-pps_ftp_telnet_protocol.cc \
-pps_gtp.cc \
-pps_http_inspect.cc \
-pps_http_inspect_server.cc \
-pps_nap_selector.cc \
-pps_normalizers.cc \
-pps_perfmonitor.cc \
-pps_reputation.cc \
-pps_rpc_decode.cc \
-pps_sip.cc \
-pps_ssh.cc \
-pps_ssl.cc \
-pps_dns.cc \
-pps_pop.cc \
-pps_imap.cc \
-pps_modbus.cc \
-pps_sdf.cc \
-pps_smtp.cc \
-pps_sfportscan.cc \
-pps_stream5_ip.cc \
-pps_stream5_global.cc \
-pps_stream5_tcp.cc \
-pps_stream5_udp.cc \
-preprocessor_api.h \
-preprocessor_api.cc
-
-AM_CPPFLAGS = @snort2lua_CPPFLAGS@
-
diff --git a/tools/snort2lua/rule_states/Makefile.am b/tools/snort2lua/rule_states/Makefile.am
deleted file mode 100644 (file)
index 4390220..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-
-noinst_LIBRARIES = librule_states.a
-
-librule_states_a_SOURCES = \
-rule_base64_decode.cc \
-rule_content.cc \
-rule_convert_comma_list.cc \
-rule_dce_iface.cc \
-rule_dnp3_obj.cc \
-rule_dsize.cc \
-rule_file_data.cc \
-rule_http_encode.cc \
-rule_isdataat.cc \
-rule_metadata.cc \
-rule_pcre.cc \
-rule_react.cc \
-rule_resp.cc \
-rule_sd_pattern.cc \
-rule_stream_reassemble.cc \
-rule_stream_size.cc \
-rule_tag.cc \
-rule_ttl.cc \
-rule_threshold.cc \
-rule_unchanged.cc \
-rule_unsupported.cc \
-rule_urilen.cc \
-rule_api.cc \
-rule_api.h
-
-AM_CPPFLAGS = @snort2lua_CPPFLAGS@
-
diff --git a/tools/u2boat/Makefile.am b/tools/u2boat/Makefile.am
deleted file mode 100644 (file)
index 0098d12..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-bin_PROGRAMS = u2boat
-
-u2boat_SOURCES = u2boat.cc
-u2boat_LDADD = -lpcap
-
-dist_doc_DATA = README.u2boat
-
diff --git a/tools/u2spewfoo/Makefile.am b/tools/u2spewfoo/Makefile.am
deleted file mode 100644 (file)
index 29fed5a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-bin_PROGRAMS = u2spewfoo
-
-u2spewfoo_SOURCES = u2spewfoo.cc u2_common.h
-