Switch to unified view

a/src/configure b/src/configure
...
...
600
#endif"
600
#endif"
601
601
602
ac_subst_vars='LTLIBOBJS
602
ac_subst_vars='LTLIBOBJS
603
LIBOBJS
603
LIBOBJS
604
RCLVERSION
604
RCLVERSION
605
NOPYTHON
605
NOPIC
606
NOPIC
606
LIBQZEITGEIST
607
LIBQZEITGEIST
607
QMAKE_DISABLE_ZEITGEIST
608
QMAKE_DISABLE_ZEITGEIST
608
QMAKE_ENABLE_ZEITGEIST
609
QMAKE_ENABLE_ZEITGEIST
609
QMAKE_DISABLE_WEBKIT
610
QMAKE_DISABLE_WEBKIT
...
...
690
with_aspell
691
with_aspell
691
with_inotify
692
with_inotify
692
with_fam
693
with_fam
693
enable_xattr
694
enable_xattr
694
enable_camelcase
695
enable_camelcase
696
enable_python_module
695
enable_pic
697
enable_pic
696
enable_qtgui
698
enable_qtgui
697
enable_webkit
699
enable_webkit
698
with_qzeitgeist
700
with_qzeitgeist
699
enable_x11mon
701
enable_x11mon
...
...
1339
                          difficult: you need to use matching case in the
1341
                          difficult: you need to use matching case in the
1340
                          phrase query to get a match. Ie querying for "MySQL
1342
                          phrase query to get a match. Ie querying for "MySQL
1341
                          manual" and "my sql manual" are the same, but not
1343
                          manual" and "my sql manual" are the same, but not
1342
                          the same as "mysql manual" (in phrases only and you
1344
                          the same as "mysql manual" (in phrases only and you
1343
                          could raise the phrase slack to get a match).
1345
                          could raise the phrase slack to get a match).
1346
  --disable-python-module Do not build the Python module.
1344
  --enable-pic            Compile library objects as position independant
1347
  --enable-pic            Do not compile library objects as position
1345
                          code. This is necessary for building the php
1348
                          independant code. This is incompatible with the php
1346
                          extension.
1349
                          or python extensions.
1347
  --disable-qtgui         Disable the QT-based graphical user interface.
1350
  --disable-qtgui         Disable the QT-based graphical user interface.
1348
  --disable-webkit        Disable use of qt-webkit.
1351
  --disable-webkit        Disable use of qt-webkit.
1349
  --disable-x11mon        Disable recollindex support for X11 session
1352
  --disable-x11mon        Disable recollindex support for X11 session
1350
                          monitoring.
1353
                          monitoring.
1351
1354
...
...
4341
4344
4342
$as_echo "#define RCL_SPLIT_CAMELCASE 1" >>confdefs.h
4345
$as_echo "#define RCL_SPLIT_CAMELCASE 1" >>confdefs.h
4343
4346
4344
fi
4347
fi
4345
4348
4346
# Build PIC objects for the library. This is necessary when building the
4349
# Disable building the python module. This is built by default, because
4347
# php extension, would be useful for the others, and costs little. I wonder
4350
# it's really the easiest way to interface and extend recoll. It forces PIC
4348
# if this should be made the default.
4351
# objects for everything (indexing performance impact: 1%), because it's
4349
# Not by default as these are little used for now.
4352
# just not worth building the lib twice
4353
# You can still have a non-pic recoll with:
4354
#   configure --disable-python-module; make; make install;make clean
4355
#   configure; make; cd python/recoll; make install
4356
#
4357
# Check whether --enable-python-module was given.
4358
if test "${enable_python_module+set}" = set; then :
4359
  enableval=$enable_python_module; pythonEnabled=$enableval
4360
else
4361
  pythonEnabled=yes
4362
fi
4363
4364
if test X$pythonEnabled = Xyes ; then
4365
  NOPYTHON=""
4366
else
4367
  NOPYTHON="#"
4368
fi
4369
4370
# Build PIC objects for the library ?
4350
# Check whether --enable-pic was given.
4371
# Check whether --enable-pic was given.
4351
if test "${enable_pic+set}" = set; then :
4372
if test "${enable_pic+set}" = set; then :
4352
  enableval=$enable_pic; picEnabled=$enableval
4373
  enableval=$enable_pic; picEnabled=$enableval
4353
else
4374
else
4354
  picEnabled=no
4375
  picEnabled=forpython
4355
fi
4376
fi
4356
4377
4357
if test X$picEnabled = Xyes ; then
4378
case $picEnabled in
4358
  NOPIC=""
4379
forpython) picEnabled=$pythonEnabled; NOPIC=$NOPYTHON;;
4359
else
4380
yes) NOPIC="";;
4360
  NOPIC="#"
4381
*) NOPIC="#";;
4382
esac
4383
4384
if test X$pythonEnabled = Xyes -a X$picEnabled != Xyes; then
4385
   as_fn_error $? "Python build needs PIC library" "$LINENO" 5
4361
fi
4386
fi
4362
4387
4363
for ac_func in mkdtemp
4388
for ac_func in mkdtemp
4364
do :
4389
do :
4365
  ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp"
4390
  ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp"
...
...
5644
5669
5645
5670
5646
5671
5647
5672
5648
5673
5674
5649
# All object files depend on localdefs which has the cc flags. Avoid
5675
# All object files depend on localdefs which has the cc flags. Avoid
5650
# changing it unless necessary
5676
# changing it unless necessary
5651
ac_config_files="$ac_config_files mk/localdefs.new:mk/localdefs.in"
5677
ac_config_files="$ac_config_files mk/localdefs.new:mk/localdefs.in"
5652
5678
5653
ac_config_files="$ac_config_files recollinstall"
5679
ac_config_files="$ac_config_files recollinstall"
...
...
5655
ac_config_files="$ac_config_files Makefile"
5681
ac_config_files="$ac_config_files Makefile"
5656
5682
5657
ac_config_files="$ac_config_files sampleconf/recoll.conf"
5683
ac_config_files="$ac_config_files sampleconf/recoll.conf"
5658
5684
5659
ac_config_files="$ac_config_files common/rclversion.h"
5685
ac_config_files="$ac_config_files common/rclversion.h"
5686
5687
ac_config_files="$ac_config_files python/recoll/setup.py"
5660
5688
5661
5689
5662
for d in bincimapmime index lib query
5690
for d in bincimapmime index lib query
5663
do
5691
do
5664
    rm -f $d/alldeps.stamp
5692
    rm -f $d/alldeps.stamp
...
...
6373
    "mk/localdefs.new") CONFIG_FILES="$CONFIG_FILES mk/localdefs.new:mk/localdefs.in" ;;
6401
    "mk/localdefs.new") CONFIG_FILES="$CONFIG_FILES mk/localdefs.new:mk/localdefs.in" ;;
6374
    "recollinstall") CONFIG_FILES="$CONFIG_FILES recollinstall" ;;
6402
    "recollinstall") CONFIG_FILES="$CONFIG_FILES recollinstall" ;;
6375
    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
6403
    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
6376
    "sampleconf/recoll.conf") CONFIG_FILES="$CONFIG_FILES sampleconf/recoll.conf" ;;
6404
    "sampleconf/recoll.conf") CONFIG_FILES="$CONFIG_FILES sampleconf/recoll.conf" ;;
6377
    "common/rclversion.h") CONFIG_FILES="$CONFIG_FILES common/rclversion.h" ;;
6405
    "common/rclversion.h") CONFIG_FILES="$CONFIG_FILES common/rclversion.h" ;;
6406
    "python/recoll/setup.py") CONFIG_FILES="$CONFIG_FILES python/recoll/setup.py" ;;
6378
6407
6379
  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
6408
  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
6380
  esac
6409
  esac
6381
done
6410
done
6382
6411