fix #8 configure --disable-7zip

Genivia · Jan 5, 2024 · 24a24d0 · 24a24d0
1 parent eb1f17a
commit 24a24d0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -266,6 +266,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
 HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@

diff --git a/configure b/configure
@@ -652,6 +652,7 @@ LTLIBOBJS
 LIBOBJS
 PTHREAD_LIBS
 PTHREAD_CFLAGS
+EXTRA_CFLAGS
 PLATFORM
 host_os
 host_vendor
@@ -7808,6 +7809,7 @@ fi
 
 fi
 
+
 PTHREAD_CFLAGS=""
 
 PTHREAD_LIBS="-lpthread"

diff --git a/configure.ac b/configure.ac
@@ -77,6 +77,7 @@ fi
 
 fi
 
+AC_SUBST(EXTRA_CFLAGS)
 AC_SUBST([PTHREAD_CFLAGS], [""])
 AC_SUBST([PTHREAD_LIBS], ["-lpthread"])
 

diff --git a/lzma/C/Makefile.in b/lzma/C/Makefile.in
@@ -227,6 +227,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
 HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,4 +1,4 @@
 bin_PROGRAMS   = ugrep-indexer
-ugrep_indexer_CPPFLAGS = -DPLATFORM=\"$(PLATFORM)\"
+ugrep_indexer_CPPFLAGS = $(EXTRA_CFLAGS) -DPLATFORM=\"$(PLATFORM)\"
 ugrep_indexer_SOURCES  = ugrep-indexer.cpp glob.hpp glob.cpp input.h input.cpp utf8.h zopen.h zopen.c zstream.hpp
 ugrep_indexer_LDADD    = $(PTHREAD_LIBS)
diff --git a/src/Makefile.in b/src/Makefile.in
@@ -216,6 +216,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
 HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -299,7 +300,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-ugrep_indexer_CPPFLAGS = -DPLATFORM=\"$(PLATFORM)\"
+ugrep_indexer_CPPFLAGS = $(EXTRA_CFLAGS) -DPLATFORM=\"$(PLATFORM)\"
 ugrep_indexer_SOURCES = ugrep-indexer.cpp glob.hpp glob.cpp input.h input.cpp utf8.h zopen.h zopen.c zstream.hpp
 ugrep_indexer_LDADD = $(PTHREAD_LIBS)
 all: all-am

diff --git a/src/ugrep-indexer.cpp b/src/ugrep-indexer.cpp
@@ -551,7 +551,7 @@ void help()
             storage overhead at the cost of a higher rate of false positive\n\
             pattern matches (more noise).  A high accuracy reduces the rate of\n\
             false positive regex pattern matches (less noise) at the cost of an\n\
-            increased indexing storage overhead.  An accuracy between 3 and 7\n\
+            increased indexing storage overhead.  An accuracy between 2 and 7\n\
             is recommended.  The default accuracy is 5.\n\
     -., --hidden\n\
             Index hidden files and directories.\n\
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,6 +77,7 @@ fi @@
     fi
+    AC_SUBST(EXTRA_CFLAGS)
     AC_SUBST([PTHREAD_CFLAGS], [""])
     AC_SUBST([PTHREAD_LIBS], ["-lpthread"])
@@ Expand Down @@