Switch to unified view

a/src/configure.ac b/src/configure.ac
...
...
107
   AC_DEFINE(RCL_MONITOR, 1, [Real time monitoring option])
107
   AC_DEFINE(RCL_MONITOR, 1, [Real time monitoring option])
108
   AC_DEFINE(RCL_USE_INOTIFY, 1, [Compile the inotify interface])
108
   AC_DEFINE(RCL_USE_INOTIFY, 1, [Compile the inotify interface])
109
else
109
else
110
   AC_MSG_NOTICE([inotify monitoring disabled])
110
   AC_MSG_NOTICE([inotify monitoring disabled])
111
fi
111
fi
112
113
AC_CHECK_FUNCS(mkdtemp)
112
114
113
##### Look for iconv. We first look for libiconv in /usr/local/lib:/usr/lib
115
##### Look for iconv. We first look for libiconv in /usr/local/lib:/usr/lib
114
##    then in libc (Linux, solaris)
116
##    then in libc (Linux, solaris)
115
AC_LANG(C++)
117
AC_LANG(C++)
116
LIBICONV=""
118
LIBICONV=""
...
...
304
AC_SUBST(LIBFAM)
306
AC_SUBST(LIBFAM)
305
AC_SUBST(QMAKE)
307
AC_SUBST(QMAKE)
306
AC_SUBST(QTGUI)
308
AC_SUBST(QTGUI)
307
AC_SUBST(QTRECOLL_DATADIR)
309
AC_SUBST(QTRECOLL_DATADIR)
308
AC_SUBST(XAPIANCXXFLAGS)
310
AC_SUBST(XAPIANCXXFLAGS)
309
311
AC_SUBST(HAVE_MKDTEMP)
310
AC_CONFIG_FILES(mk/localdefs)
312
AC_CONFIG_FILES(mk/localdefs)
311
AC_CONFIG_FILES(recollinstall)
313
AC_CONFIG_FILES(recollinstall)
312
AC_CONFIG_FILES(Makefile)
314
AC_CONFIG_FILES(Makefile)
313
AC_CONFIG_FILES(sampleconf/recoll.conf)
315
AC_CONFIG_FILES(sampleconf/recoll.conf)
314
AC_CONFIG_FILES($QTGUI/recoll.pro)
316
AC_CONFIG_FILES($QTGUI/recoll.pro)