Switch to unified view

a/src/configure.ac b/src/configure.ac
1
AC_INIT(Recoll, 1.6)
1
AC_INIT([Recoll], m4_esyscmd_s(cat VERSION))
2
AC_CONFIG_HEADERS([common/autoconfig.h])
2
AC_CONFIG_HEADERS([common/autoconfig.h])
3
AC_PREREQ(2.53)
3
AC_PREREQ(2.53)
4
AC_CONFIG_SRCDIR(index/recollindex.cpp)
4
AC_CONFIG_SRCDIR(index/recollindex.cpp)
5
5
6
AC_PROG_CXX
6
AC_PROG_CXX
...
...
424
m_prefix=$prefix
424
m_prefix=$prefix
425
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
425
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
426
m_datadir=${m_prefix}/share
426
m_datadir=${m_prefix}/share
427
QTRECOLL_DATADIR=${m_datadir}/recoll
427
QTRECOLL_DATADIR=${m_datadir}/recoll
428
428
429
RCLVERSION='m4_esyscmd_s(cat VERSION)'
430
429
AC_SUBST(X_CFLAGS)
431
AC_SUBST(X_CFLAGS)
430
AC_SUBST(X_PRE_LIBS)
432
AC_SUBST(X_PRE_LIBS)
431
AC_SUBST(X_LIBS)
433
AC_SUBST(X_LIBS)
432
AC_SUBST(X_LIBX11)
434
AC_SUBST(X_LIBX11)
433
AC_SUBST(X_EXTRA_LIBS)
435
AC_SUBST(X_EXTRA_LIBS)
...
...
442
AC_SUBST(XAPIANCXXFLAGS)
444
AC_SUBST(XAPIANCXXFLAGS)
443
AC_SUBST(HAVE_MKDTEMP)
445
AC_SUBST(HAVE_MKDTEMP)
444
AC_SUBST(NOQTMAKE)
446
AC_SUBST(NOQTMAKE)
445
AC_SUBST(NOCMDLINE)
447
AC_SUBST(NOCMDLINE)
446
AC_SUBST(NOPIC)
448
AC_SUBST(NOPIC)
449
AC_SUBST(RCLVERSION)
447
450
451
# All object files depend on localdefs which has the cc flags. Avoid
452
# changing it unless necessary
448
AC_CONFIG_FILES(mk/localdefs)
453
AC_CONFIG_FILES(mk/localdefs.new:mk/localdefs.in)
449
AC_CONFIG_FILES(recollinstall)
454
AC_CONFIG_FILES(recollinstall)
450
AC_CONFIG_FILES(Makefile)
455
AC_CONFIG_FILES(Makefile)
451
AC_CONFIG_FILES(sampleconf/recoll.conf)
456
AC_CONFIG_FILES(sampleconf/recoll.conf)
457
AC_CONFIG_FILES(common/rclversion.h)
452
458
453
for d in bincimapmime index lib query
459
for d in bincimapmime index lib query
454
do 
460
do 
455
    rm -f $d/alldeps.stamp
461
    rm -f $d/alldeps.stamp
456
    cp -f /dev/null $d/alldeps
462
    cp -f /dev/null $d/alldeps
457
done
463
done
458
464
459
(cd lib;test -f Makefile && chmod +w Makefile;sh mkMake)
465
(cd lib;test -f Makefile && chmod +w Makefile;sh mkMake)
460
466
461
AC_OUTPUT
467
AC_OUTPUT
468
469
if cmp -s mk/localdefs mk/localdefs.new ; then
470
  rm -f mk/localdefs.new
471
else
472
  mv -f mk/localdefs.new mk/localdefs
473
fi
474