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

autoconfig out things that dont work currently on mac os x

Browse Source
This commit is contained in:
Jean-Francois Dockes 2013-10-08 13:46:16 +02:00
parent b97816bdcb
commit 34047fd2dd
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/configure.ac
View File

@ -21,6 +21,12 @@ if test ! -f mk/$sys ; then
fi fi
(cd mk; rm -f sysconf; ln -s $sys sysconf) (cd mk; rm -f sysconf; ln -s $sys sysconf)
# There a few Recoll users on Mac OS X and a few things are just not worth
# supporting
if test X$sys = XDarwin ; then
NODYNLIB=#
fi
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
# OpenBSD needs sys/param.h for mount.h to compile # OpenBSD needs sys/param.h for mount.h to compile
@ -219,6 +225,7 @@ fi
# configure --disable-python-module; make; make install;make clean # configure --disable-python-module; make; make install;make clean
# configure; make; cd python/recoll; make install # configure; make; cd python/recoll; make install
# #
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.]),
@ -228,6 +235,9 @@ if test X$pythonEnabled = Xyes ; then
else else
NOPYTHON="#" NOPYTHON="#"
fi fi
else
NOPYTHON="#"
fi
# Build PIC objects for the library ? # Build PIC objects for the library ?
AC_ARG_ENABLE(pic, AC_ARG_ENABLE(pic,
@ -562,6 +572,7 @@ AC_SUBST(LIBQZEITGEIST)
AC_SUBST(NOPIC) AC_SUBST(NOPIC)
AC_SUBST(NOTHREADS) AC_SUBST(NOTHREADS)
AC_SUBST(NOPYTHON) AC_SUBST(NOPYTHON)
AC_SUBST(NODYNLIB)
AC_SUBST(RCLVERSION) AC_SUBST(RCLVERSION)
AC_SUBST(RCLLIBVERSION) AC_SUBST(RCLLIBVERSION)

3
src/recollinstall.in
View File

@ -117,7 +117,8 @@ ${INSTALL} -m 0444 doc/man/recoll.conf.5 ${mandir}/man5/
${INSTALL} -m 0755 index/recollindex ${bindir} || exit 1 ${INSTALL} -m 0755 index/recollindex ${bindir} || exit 1
${STRIP} ${bindir}/recollindex ${STRIP} ${bindir}/recollindex
${INSTALL} -m 0644 lib/librecoll.so.${RCLLIBVERSION} ${libdir}/recoll/ || exit 1 @NODYNLIB@${INSTALL} -m 0644 lib/librecoll.so.${RCLLIBVERSION} \
@NODYNLIB@ ${libdir}/recoll/ || exit 1
${INSTALL} -m 0755 filters/rcl* ${datadir}/recoll/filters/ || exit 1 ${INSTALL} -m 0755 filters/rcl* ${datadir}/recoll/filters/ || exit 1
for f in rclexecm.py rcllatinstops.zip;do for f in rclexecm.py rcllatinstops.zip;do