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

config: removed uses of a long obsolete $sys variable

Browse Source
This commit is contained in:
Jean-Francois Dockes 2018-12-03 15:05:07 +01:00
parent 1d9d9ec1fb
commit b2e510ea15
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/configure.ac
View File

@ -97,10 +97,8 @@ fi
AC_DEFINE_UNQUOTED(FILE_PROG, "$fileProg", [Path to the file program]) AC_DEFINE_UNQUOTED(FILE_PROG, "$fileProg", [Path to the file program])
# Can't use Solaris standard 'file' command, it doesn't support -i # Can't use Solaris standard 'file' command, it doesn't support -i
if test X$sys != XSunOS -o X$fileProg != X/usr/bin/file; then AC_DEFINE(USE_SYSTEM_FILE_COMMAND, 1,
AC_DEFINE(USE_SYSTEM_FILE_COMMAND, 1, [Enable using the system's 'file' command to id mime if we fail internally]) [Enable using the system's 'file' command to id mime if we fail internally])
fi
# Use aspell to provide spelling expansions ? # Use aspell to provide spelling expansions ?
# The default is yes. If we do find an aspell installation, we use it. Else # The default is yes. If we do find an aspell installation, we use it. Else
@ -241,14 +239,10 @@ if test X$camelcaseEnabled = Xyes ; then
fi fi
# Disable building the python module. # Disable building the python module.
if test X$sys != XDarwin ; then AC_ARG_ENABLE(python-module,
AC_ARG_ENABLE(python-module,
AC_HELP_STRING([--disable-python-module], AC_HELP_STRING([--disable-python-module],
[Do not build the Python module.]), [Do not build the Python module.]),
pythonEnabled=$enableval, pythonEnabled=yes) pythonEnabled=$enableval, pythonEnabled=yes)
else
pythonEnabled=no
fi
AM_CONDITIONAL(MAKEPYTHON, [test X$pythonEnabled = Xyes]) AM_CONDITIONAL(MAKEPYTHON, [test X$pythonEnabled = Xyes])
@ -402,15 +396,6 @@ if test X$enableQT = Xyes ; then
fi fi
QMAKE=$QMAKEPATH QMAKE=$QMAKEPATH
# MAC OS X: we don't support this (the native search tool is more than
# good enough), but we make things work just enough so that the program can
# be compiled and roughly installed (not as a .app, but to /usr/local),
# basically to enable using a Macbook for development
if test X$sys = XDarwin ; then
# The default is xcode
QMAKE="${QMAKE} -spec macx-g++"
fi
# Check Qt version # Check Qt version
qmakevers="`${QMAKE} --version 2>&1`" qmakevers="`${QMAKE} --version 2>&1`"
#echo "qmake version: $qmakevers" #echo "qmake version: $qmakevers"