Switch to unified view

a/src/configure.ac b/src/configure.ac
...
...
50
    AC_MSG_NOTICE([aspell support enabled but aspell package not found. Compiling with internal aspell interface file])
50
    AC_MSG_NOTICE([aspell support enabled but aspell package not found. Compiling with internal aspell interface file])
51
    AC_DEFINE(ASPELL_INCLUDE, ["aspell-local.h"])
51
    AC_DEFINE(ASPELL_INCLUDE, ["aspell-local.h"])
52
   fi
52
   fi
53
fi
53
fi
54
54
55
# Real time monitoring with FAM
56
AC_ARG_WITH(fam, 
57
    AC_HELP_STRING([--with-fam],
58
   [Use File Alteration Monitor for almost real time indexing of modified files. Give directory where fam library lives as argument if this is not found by configure.]),
59
        withFam=$withval, withFam=no)
60
case $withFam in
61
     no);;
62
     yes)
63
  for dir in /usr/local/lib /usr/lib;do 
64
   if test -f $dir/libfam.so ; then famLibDir=$dir;break;fi
65
  done
66
     ;;
67
     *) # The argument should be the path to the fam library
68
     famLibDir=$withFam
69
     ;;
70
esac
71
72
if test X$withFam != Xno ; then
73
   AC_DEFINE(RCL_MONITOR, 1, [Real time monitoring option])
74
   AC_DEFINE(RCL_USE_FAM, 1, [Compile the fam interface])
75
   if test X$famLibDir != X ; then
76
      famBase=`dirname $famLibDir`
77
      if test ! -f $famBase/include/fam.h ; then
78
   AC_MSG_ERROR([fam.h not found in $famBase/include. Specify --with-fam=no to disable fam support])
79
      fi
80
      LIBFAM="-L$famLibDir -lfam"
81
      AC_DEFINE_UNQUOTED(FAM_INCLUDE, "$famBase/include/fam.h",
82
  [Path to the fam api include file])
83
   else
84
  AC_MSG_ERROR([fam library not found])
85
   fi
86
fi
55
87
56
##### Look for iconv. We first look for libiconv in /usr/local/lib:/usr/lib
88
##### Look for iconv. We first look for libiconv in /usr/local/lib:/usr/lib
57
##    then in libc (Linux, solaris)
89
##    then in libc (Linux, solaris)
58
AC_LANG(C)
90
AC_LANG(C)
59
LIBICONV=""
91
LIBICONV=""
...
...
183
m_prefix=$prefix
215
m_prefix=$prefix
184
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
216
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
185
m_datadir=${m_prefix}/share
217
m_datadir=${m_prefix}/share
186
QTRECOLL_DATADIR=${m_datadir}/recoll
218
QTRECOLL_DATADIR=${m_datadir}/recoll
187
219
220
AC_SUBST(INCICONV)
221
AC_SUBST(LIBICONV)
188
AC_SUBST(LIBXAPIAN)
222
AC_SUBST(LIBXAPIAN)
189
AC_SUBST(XAPIANCXXFLAGS)
190
AC_SUBST(LIBICONV)
223
AC_SUBST(LIBFAM)
191
AC_SUBST(INCICONV)
192
AC_SUBST(QTRECOLL_DATADIR)
193
AC_SUBST(QMAKE)
224
AC_SUBST(QMAKE)
194
AC_SUBST(QTGUI)
225
AC_SUBST(QTGUI)
226
AC_SUBST(QTRECOLL_DATADIR)
227
AC_SUBST(XAPIANCXXFLAGS)
195
228
196
AC_CONFIG_FILES(mk/localdefs)
229
AC_CONFIG_FILES(mk/localdefs)
197
AC_CONFIG_FILES(recollinstall)
230
AC_CONFIG_FILES(recollinstall)
198
AC_CONFIG_FILES(Makefile)
231
AC_CONFIG_FILES(Makefile)
199
AC_CONFIG_FILES(sampleconf/recoll.conf)
232
AC_CONFIG_FILES(sampleconf/recoll.conf)