From: Russ Combs <rucombs@cisco.com>
Date: Tue, 20 Jan 2015 15:05:49 +0000 (-0500)
Subject: fixes for LFS
X-Git-Tag: 3.0.0-233~1076
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cda0a62dccbe023dba4fd305473bdc7dec584bca;p=thirdparty%2Fsnort3.git

fixes for LFS
---

diff --git a/ChangeLog b/ChangeLog
index 41d29136d..a40e1da3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 build 133
 
+-- fixes for large file support on 32-bit Linux systems
 -- changed u2 base file name to unified2.log
 -- updated doc based on tips/tricks blog
 -- fixed active rule actions (react, reject, rewrite)
diff --git a/cmake/configure_options.cmake b/cmake/configure_options.cmake
index 64176bfef..d13167475 100644
--- a/cmake/configure_options.cmake
+++ b/cmake/configure_options.cmake
@@ -12,7 +12,6 @@ set_project_compiler_defines_if_true (ENABLE_DEBUG_MSGS "DEBUG_MSGS")
 set_project_compiler_defines_if_true (ENABLE_DEBUG "DEBUG")
 set_project_compiler_defines_if_true (BUILD_HA "ENABLE_HA")
 set_project_compiler_defines_if_true (ENABLE_LARGE_PCAP "_LARGEFILE_SOURCE")
-set_project_compiler_defines_if_true (ENABLE_LARGE_PCAP "_LARGEFILE64_SOURCE")
 set_project_compiler_defines_if_true (ENABLE_LARGE_PCAP "_FILE_OFFSET_BITS=64")
 
 
diff --git a/configure.ac b/configure.ac
index 4fbbac285..6a1b1d31e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,7 +319,7 @@ if test "x$enable_ppm_test" = "xyes"; then
 fi
 
 AC_ARG_ENABLE(perf-profiling,
-    [  --enable-perf-profiling    enable module and rule performance profiling],
+    [  --enable-perf-profiling   enable module and rule performance profiling],
        enable_perf_profiling="$enableval", enable_perf_profiling="no")
 
 if test "x$enable_perf_profiling" = "xyes"; then
@@ -328,7 +328,7 @@ if test "x$enable_perf_profiling" = "xyes"; then
 fi
 
 AC_ARG_ENABLE(shell,
-    [  --enable-shell              enable command line shell support],
+    [  --enable-shell            enable command line shell support],
        enable_shell="$enableval", enable_shell="no")
 
 if test "x$enable_shell" = "xyes"; then
@@ -345,6 +345,14 @@ if test "x$enable_linux_smp_stats" = "xyes"; then
     AC_DEFINE(LINUX_SMP, [1], [enable proc stats])
 fi
 
+AC_ARG_ENABLE(large-pcap,
+    [  --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,
     [  --enable-debug-msgs       enable debug printing options (bugreports and developers only)],
        enable_debug_msgs="$enableval", enable_debug_msgs="no")
@@ -376,7 +384,7 @@ if test "x$enable_gdb" = "xyes"; then
 fi
 
 AC_ARG_ENABLE(gprof-profile,
-    [  --enable-gprof-profile          enable gprof profiling output (developers only)],
+    [  --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