diff --git a/src/configure.ac b/src/configure.ac index c055bd01..f29ebb5f 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1,7 +1,7 @@ -AC_INIT([Recoll], m4_esyscmd_s(cat RECOLL-VERSION.txt)) +AC_INIT([Recoll],[m4_esyscmd_s(cat RECOLL-VERSION.txt)]) AC_CONFIG_HEADERS([common/autoconfig.h]) AH_BOTTOM([#include "conf_post.h"]) -AC_PREREQ(2.53) +AC_PREREQ([2.69]) AC_CONFIG_SRCDIR(index/recollindex.cpp) AM_INIT_AUTOMAKE([1.10 no-define subdir-objects foreign]) @@ -21,7 +21,7 @@ if test C$CXX = C ; then AC_MSG_ERROR([C++ compiler needed. Please install one (ie: gnu g++)]) fi AC_LANG_PUSH([C++]) -AC_TRY_LINK([],[], rcl_link_ok=yes, rcl_link_ok=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[rcl_link_ok=yes],[rcl_link_ok=no]) if test "$rcl_link_ok" = "no" ; then AC_MSG_ERROR([No working C++ compiler was found]) fi @@ -42,7 +42,7 @@ esac AC_PROG_YACC -AC_PROG_LIBTOOL +LT_INIT AC_C_BIGENDIAN AC_SYS_LARGEFILE @@ -53,8 +53,7 @@ AC_CHECK_HEADERS([sys/param.h, spawn.h]) if test "x$ac_cv_func_posix_spawn" = xyes; then : AC_ARG_ENABLE(posix_spawn, - AC_HELP_STRING([--enable-posix_spawn], - [Enable the use of posix_spawn().]), + AS_HELP_STRING([--enable-posix_spawn],[Enable the use of posix_spawn().]), posixSpawnEnabled=$enableval, posixSpawnEnabled=no) fi if test X$posixSpawnEnabled = Xyes ; then @@ -72,8 +71,7 @@ AC_CHECK_FUNCS([posix_spawn setrlimit kqueue vsnprintf malloc_trim posix_fadvise # Use specific 'file' command ? (Useful on solaris to specify # /usr/local/bin/file instead of the system's which doesn't understand '-i' AC_ARG_WITH(file-command, - AC_HELP_STRING([--with-file-command], - [Specify version of 'file' command (ie: --with-file-command=/usr/local/bin/file)]), + AS_HELP_STRING([--with-file-command],[Specify version of 'file' command (ie: --with-file-command=/usr/local/bin/file)]), withFileCommand=$withval, withFileCommand=file) case $withFileCommand in file) @@ -96,8 +94,7 @@ AC_DEFINE(USE_SYSTEM_FILE_COMMAND, 1, # we do compile the aspell module using an internal copy of aspell.h # Only --with-aspell=no will completely disable aspell support AC_ARG_WITH(aspell, - AC_HELP_STRING([--without-aspell], - [Disable use of aspell spelling package to provide term expansion to other spellings]), + AS_HELP_STRING([--without-aspell],[Disable use of aspell spelling package to provide term expansion to other spellings]), withAspell=$withval, withAspell=yes) case $withAspell in no);; @@ -126,8 +123,7 @@ fi # Real time monitoring with inotify AC_ARG_WITH(inotify, - AC_HELP_STRING([--with-inotify], - [Use inotify for almost real time indexing of modified files (the default + AS_HELP_STRING([--with-inotify],[Use inotify for almost real time indexing of modified files (the default is yes on Linux).]), withInotify=$withval, withInotify=$inot_default) @@ -141,8 +137,7 @@ fi # Real time monitoring with FAM AC_ARG_WITH(fam, - AC_HELP_STRING([--with-fam], - [Use File Alteration Monitor for almost real time indexing of modified files. Give the fam/gamin library as argument (ie: /usr/lib/libfam.so) if configure does not find the right one.]), + AS_HELP_STRING([--with-fam],[Use File Alteration Monitor for almost real time indexing of modified files. Give the fam/gamin library as argument (ie: /usr/lib/libfam.so) if configure does not find the right one.]), withFam=$withval, withFam=yes) if test X$withFam != Xno -a X$withInotify != Xno ; then @@ -207,8 +202,7 @@ if test X$idxthreadsEnabled = Xyes ; then fi AC_ARG_ENABLE(testmains, - AC_HELP_STRING([--enable-testmains], - [Enable building small test drivers. These are not unit tests.]), + AS_HELP_STRING([--enable-testmains],[Enable building small test drivers. These are not unit tests.]), buildtestmains=$enableval, buildtestmains=no) AM_CONDITIONAL([COND_TESTMAINS], [test "$buildtestmains" = yes]) @@ -218,8 +212,7 @@ AM_CONDITIONAL([COND_TESTMAINS], [test "$buildtestmains" = yes]) # "mysql manual" (which would need increased slack as manual is now at pos # 2 instead of 1 AC_ARG_ENABLE(camelcase, - AC_HELP_STRING([--enable-camelcase], - [Enable splitting camelCase words. This is not enabled by default as + AS_HELP_STRING([--enable-camelcase],[Enable splitting camelCase words. This is not enabled by default as this makes phrase matches more difficult: you need to use matching case in the phrase query to get a match. Ie querying for "MySQL manual" and "my sql manual" are the same, but not the same as @@ -232,15 +225,13 @@ fi # Disable building the python module. AC_ARG_ENABLE(python-module, - AC_HELP_STRING([--disable-python-module], - [Do not build the Python module.]), + AS_HELP_STRING([--disable-python-module],[Do not build the Python module.]), pythonEnabled=$enableval, pythonEnabled=yes) AM_CONDITIONAL(MAKEPYTHON, [test X$pythonEnabled = Xyes]) # Disable building the libchm python wrapper -AC_ARG_ENABLE(python-chm, AC_HELP_STRING([--disable-python-chm], - [Do not build the libchm Python wrapper.]), +AC_ARG_ENABLE(python-chm, AS_HELP_STRING([--disable-python-chm],[Do not build the libchm Python wrapper.]), pythonChmEnabled=$enableval, pythonChmEnabled=yes) if test X$pythonChmEnabled = Xyes; then @@ -262,11 +253,11 @@ AC_CHECK_LIB([z], [zlibVersion], [], []) ############# Putenv AC_MSG_CHECKING(for type of string parameter to putenv) AC_LANG_PUSH([C++]) -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include - ],[ + ]], [[ putenv((const char *)0); - ], rcl_putenv_string_const="1", rcl_putenv_string_const="0") + ]])],[rcl_putenv_string_const="1"],[rcl_putenv_string_const="0"]) if test X$rcl_putenv_string_const = X1 ; then AC_DEFINE(PUTENV_ARG_CONST, 1, [putenv parameter is const]) fi @@ -325,14 +316,12 @@ XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags` PKG_CHECK_MODULES([XSLT], [libxslt], [], AC_MSG_ERROR([libxslt])) AC_ARG_ENABLE(xadump, - AC_HELP_STRING([--enable-xadump], - [Enable building the xadump low level Xapian access program.]), + AS_HELP_STRING([--enable-xadump],[Enable building the xadump low level Xapian access program.]), enableXADUMP=$enableval, enableXADUMP="no") AM_CONDITIONAL(MAKEXADUMP, [test X$enableXADUMP = Xyes]) AC_ARG_ENABLE(userdoc, - AC_HELP_STRING([--disable-userdoc], - [Disable building the user manual. (Avoids the need for docbook xml/xsl files and TeX tools.]), + AS_HELP_STRING([--disable-userdoc],[Disable building the user manual. (Avoids the need for docbook xml/xsl files and TeX tools.]), enableUserdoc=$enableval, enableUserdoc="yes") AM_CONDITIONAL(MAKEUSERDOC, [test X$enableUserdoc = Xyes]) @@ -360,14 +349,12 @@ AM_CONDITIONAL(MAKEUSERDOC, [test X$enableUserdoc = Xyes]) # will have failed, and we tell the user to check his environment. # AC_ARG_ENABLE(qtgui, - AC_HELP_STRING([--disable-qtgui], - [Disable the QT-based graphical user interface.]), + AS_HELP_STRING([--disable-qtgui],[Disable the QT-based graphical user interface.]), enableQT=$enableval, enableQT="yes") AM_CONDITIONAL(MAKEQT, [test X$enableQT = Xyes]) AC_ARG_ENABLE(recollq, - AC_HELP_STRING([--enable-recollq], - [Enable building the recollq command line query tool (recoll -t without + AS_HELP_STRING([--enable-recollq],[Enable building the recollq command line query tool (recoll -t without need for Qt). This is done by default if --disable-qtgui is set but this option enables forcing it.]), enableRECOLLQ=$enableval, enableRECOLLQ="no") @@ -398,28 +385,11 @@ if test X$enableQT = Xyes ; then qt development files and tools and/or set the QTDIR environment variable?]) fi QMAKE=$QMAKEPATH - - # Check Qt version - qmakevers="`${QMAKE} --version 2>&1`" - #echo "qmake version: $qmakevers" - v4=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*4.*'` - v5=`expr "$qmakevers" : '.*Qt[ ][ ]*version[ ][ ]*5.*'` - if test X$v4 = X0 -a X$v5 = X0; then - AC_MSG_ERROR([Bad qt/qmake version string (not 4 or 5?): $qmakevers]) - else - if test X$v4 != X0 ; then - AC_MSG_ERROR([Qt version (from qmake found with QMAKE/QTDIR/PATH) is 4 but Recoll now needs version 5]) - else - AC_MSG_NOTICE([using qt version 5 user interface]) - fi - QTGUI=qtgui - fi - + QTGUI=qtgui ##### Using Qt webkit for reslist display? Else Qt textbrowser AC_ARG_ENABLE(webkit, - AC_HELP_STRING([--disable-webkit], - [Disable use of qt-webkit (only meaningful if qtgui is enabled).]), + AS_HELP_STRING([--disable-webkit],[Disable use of qt-webkit (only meaningful if qtgui is enabled).]), enableWebkit=$enableval, enableWebkit="yes") if test "$enableWebkit" = "yes" ; then @@ -431,8 +401,7 @@ if test X$enableQT = Xyes ; then fi AC_ARG_ENABLE(webengine, - AC_HELP_STRING([--enable-webengine], - [Enable use of qt-webengine (only meaningful if qtgui is enabled), in + AS_HELP_STRING([--enable-webengine],[Enable use of qt-webengine (only meaningful if qtgui is enabled), in place or qt-webkit.]), enableWebengine=$enableval, enableWebengine="no") @@ -448,8 +417,7 @@ if test X$enableQT = Xyes ; then ##### Using QZeitGeist lib ? Default no for now AC_ARG_WITH(qzeitgeist, - AC_HELP_STRING([--with-qzeitgeist], - [Enable the use of the qzeitgeist library to send zeitgeist events.]), + AS_HELP_STRING([--with-qzeitgeist],[Enable the use of the qzeitgeist library to send zeitgeist events.]), withQZeitgeist=$withval, withQZeitgeist="no") case "$withQZeitgeist" in @@ -468,8 +436,7 @@ if test X$enableQT = Xyes ; then # Retain debugging symbols in GUI recoll ? This makes it enormous (~50MB) AC_ARG_ENABLE(guidebug, - AC_HELP_STRING([--enable-guidebug], - [Generate and retain debug symbols in GUI program (makes the file very big).]), + AS_HELP_STRING([--enable-guidebug],[Generate and retain debug symbols in GUI program (makes the file very big).]), enableGuiDebug=$enableval, enableGuiDebug="no") if test "$enableGuiDebug" = "yes" ; then @@ -503,16 +470,13 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ### Systemd AC_ARG_WITH([systemd], - AC_HELP_STRING([--without-systemd], - [Disable installation of the systemd unit files.])) + AS_HELP_STRING([--without-systemd],[Disable installation of the systemd unit files.])) AC_ARG_WITH([system-unit-dir], - AC_HELP_STRING([--with-system-unit-dir=DIR], - [Install location for systemd system unit files]), + AS_HELP_STRING([--with-system-unit-dir=DIR],[Install location for systemd system unit files]), [SYSTEMD_SYSTEM_UNIT_DIR="$withval"], [PKG_CHECK_VAR([SYSTEMD_SYSTEM_UNIT_DIR], [systemd], [systemdsystemunitdir])]) AC_ARG_WITH([user-unit-dir], - AC_HELP_STRING([--with-user-unit-dir=DIR], - [Install location for systemd user unit files]), + AS_HELP_STRING([--with-user-unit-dir=DIR],[Install location for systemd user unit files]), [SYSTEMD_USER_UNIT_DIR="$withval"], [PKG_CHECK_VAR([SYSTEMD_USER_UNIT_DIR], [systemd], [systemduserunitdir])]) @@ -525,8 +489,7 @@ AM_CONDITIONAL([INSTALL_SYSTEMD_UNITS], [test "X$with_systemd" != "Xno"]) ### X11: this is needed for the session monitoring code (in recollindex -m) AC_ARG_ENABLE(x11mon, - AC_HELP_STRING([--disable-x11mon], - [Disable recollindex support for X11 session monitoring.]), + AS_HELP_STRING([--disable-x11mon],[Disable recollindex support for X11 session monitoring.]), enableX11mon=$enableval, enableX11mon="yes") if test X$withInotify = Xno -a X$withFam = Xno ; then