tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get rid of redundant rclversion.h

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-01-30 12:40:55 +01:00
parent c0d87a3995
commit 2909eec062
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/rclversion.h.in
View File

@ -1 +0,0 @@
static const char *rclversionstr = "@RCLVERSION@";

1
src/configure.ac
View File

@ -548,7 +548,6 @@ AC_SUBST(XSLT_LINKADD)
# All object files depend on localdefs which has the cc flags. Avoid # All object files depend on localdefs which has the cc flags. Avoid
# changing it unless necessary # changing it unless necessary
AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(common/rclversion.h)
AC_CONFIG_FILES(python/recoll/setup.py) AC_CONFIG_FILES(python/recoll/setup.py)
AC_CONFIG_FILES(python/pychm/setup.py) AC_CONFIG_FILES(python/pychm/setup.py)

3
src/rcldb/rcldb.cpp
View File

@ -52,7 +52,6 @@ using namespace std;
#include "rclquery_p.h" #include "rclquery_p.h"
#include "rclvalues.h" #include "rclvalues.h"
#include "md5ut.h" #include "md5ut.h"
#include "rclversion.h"
#include "cancelcheck.h" #include "cancelcheck.h"
#include "termproc.h" #include "termproc.h"
#include "expansiondbs.h" #include "expansiondbs.h"
@ -116,7 +115,7 @@ static const string cstr_md5empty("d41d8cd98f00b204e9800998ecf8427e");
static const int MB = 1024 * 1024; static const int MB = 1024 * 1024;
string version_string(){ string version_string(){
return string("Recoll ") + string(rclversionstr) + string(" + Xapian ") + return string("Recoll ") + string(PACKAGE_VERSION) + string(" + Xapian ") +
string(Xapian::version_string()); string(Xapian::version_string());
} }