Switch to unified view

a/src/configure b/src/configure
...
...
601
601
602
ac_subst_vars='LTLIBOBJS
602
ac_subst_vars='LTLIBOBJS
603
LIBOBJS
603
LIBOBJS
604
RCLVERSION
604
RCLVERSION
605
NOPIC
605
NOPIC
606
LIBQZEITGEIST
607
QMAKE_DISABLE_ZEITGEIST
608
QMAKE_ENABLE_ZEITGEIST
606
QMAKE_DISABLE_WEBKIT
609
QMAKE_DISABLE_WEBKIT
607
QMAKE_ENABLE_WEBKIT
610
QMAKE_ENABLE_WEBKIT
608
NOCMDLINE
611
NOCMDLINE
609
NOQTMAKE
612
NOQTMAKE
610
HAVE_MKDTEMP
613
HAVE_MKDTEMP
...
...
690
enable_xattr
693
enable_xattr
691
enable_camelcase
694
enable_camelcase
692
enable_pic
695
enable_pic
693
enable_qtgui
696
enable_qtgui
694
enable_webkit
697
enable_webkit
698
with_qzeitgeist
695
enable_x11mon
699
enable_x11mon
696
with_x
700
with_x
697
'
701
'
698
      ac_precious_vars='build_alias
702
      ac_precious_vars='build_alias
699
host_alias
703
host_alias
...
...
1356
                          modified files.
1360
                          modified files.
1357
  --with-fam              Use File Alteration Monitor for almost real time
1361
  --with-fam              Use File Alteration Monitor for almost real time
1358
                          indexing of modified files. Give the fam/gamin
1362
                          indexing of modified files. Give the fam/gamin
1359
                          library as argument (ie: /usr/lib/libfam.so) if
1363
                          library as argument (ie: /usr/lib/libfam.so) if
1360
                          configure does not find the right one.
1364
                          configure does not find the right one.
1365
  --with-qzeitgeist       Enable the use of the qzeitgeist library to send
1366
                          zeitgeist events.
1361
  --with-x                use the X Window System
1367
  --with-x                use the X Window System
1362
1368
1363
Some influential environment variables:
1369
Some influential environment variables:
1364
  CXX         C++ compiler command
1370
  CXX         C++ compiler command
1365
  CXXFLAGS    C++ compiler flags
1371
  CXXFLAGS    C++ compiler flags
...
...
4729
  else
4735
  else
4730
   QMAKE_ENABLE_WEBKIT="#"
4736
   QMAKE_ENABLE_WEBKIT="#"
4731
   QMAKE_DISABLE_WEBKIT=""
4737
   QMAKE_DISABLE_WEBKIT=""
4732
  fi
4738
  fi
4733
4739
4740
 ##### Using QZeitGeist lib ? Default no for now
4741
4742
# Check whether --with-qzeitgeist was given.
4743
if test "${with_qzeitgeist+set}" = set; then :
4744
  withval=$with_qzeitgeist; withQZeitgeist=$withval
4745
else
4746
  withQZeitgeist="no"
4747
fi
4748
4749
4750
  case "$withQZeitgeist" in
4751
    no)  LIBQZEITGEIST=;;
4752
    yes) LIBQZEITGEIST=-lqzeitgeist;;
4753
    *)   LIBQZEITGEIST=$withQZeitgeist;;
4754
  esac
4755
4756
  if test "$withQZeitgeist" != "no" ; then
4757
   QMAKE_ENABLE_ZEITGEIST=""
4758
   QMAKE_DISABLE_ZEITGEIST="#"
4759
  else
4760
   QMAKE_ENABLE_ZEITGEIST="#"
4761
   QMAKE_DISABLE_ZEITGEIST=""
4762
  fi
4763
4734
  ac_config_files="$ac_config_files $QTGUI/recoll.pro"
4764
  ac_config_files="$ac_config_files $QTGUI/recoll.pro"
4735
4765
4736
4766
4737
  ##################### End QT detection
4767
  ##################### End QT stuff
4738
fi
4768
fi
4739
4769
4740
4770
4741
### X11: this is needed for the session monitoring code (in recollindex -m)
4771
### X11: this is needed for the session monitoring code (in recollindex -m)
4742
# Check whether --enable-x11mon was given.
4772
# Check whether --enable-x11mon was given.
...
...
5588
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
5618
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
5589
m_datadir=${m_prefix}/share
5619
m_datadir=${m_prefix}/share
5590
QTRECOLL_DATADIR=${m_datadir}/recoll
5620
QTRECOLL_DATADIR=${m_datadir}/recoll
5591
5621
5592
RCLVERSION='1.17.0'
5622
RCLVERSION='1.17.0'
5623
5624
5625
5593
5626
5594
5627
5595
5628
5596
5629
5597
5630