Switch to unified view

a/src/configure b/src/configure
1
#! /bin/sh
1
#! /bin/sh
2
# Guess values for system-dependent variables and create Makefiles.
2
# Guess values for system-dependent variables and create Makefiles.
3
# Generated by GNU Autoconf 2.68 for Recoll 1.16.2.
3
# Generated by GNU Autoconf 2.68 for Recoll 1.17.0.
4
#
4
#
5
#
5
#
6
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
6
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
7
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
7
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
8
# Foundation, Inc.
8
# Foundation, Inc.
...
...
555
MAKEFLAGS=
555
MAKEFLAGS=
556
556
557
# Identity of this package.
557
# Identity of this package.
558
PACKAGE_NAME='Recoll'
558
PACKAGE_NAME='Recoll'
559
PACKAGE_TARNAME='recoll'
559
PACKAGE_TARNAME='recoll'
560
PACKAGE_VERSION='1.16.2'
560
PACKAGE_VERSION='1.17.0'
561
PACKAGE_STRING='Recoll 1.16.2'
561
PACKAGE_STRING='Recoll 1.17.0'
562
PACKAGE_BUGREPORT=''
562
PACKAGE_BUGREPORT=''
563
PACKAGE_URL=''
563
PACKAGE_URL=''
564
564
565
ac_unique_file="index/recollindex.cpp"
565
ac_unique_file="index/recollindex.cpp"
566
# Factoring default headers for most tests.
566
# Factoring default headers for most tests.
...
...
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
QMAKE_DISABLE_WEBKIT
607
QMAKE_ENABLE_WEBKIT
606
NOCMDLINE
608
NOCMDLINE
607
NOQTMAKE
609
NOQTMAKE
608
HAVE_MKDTEMP
610
HAVE_MKDTEMP
609
XAPIANCXXFLAGS
611
XAPIANCXXFLAGS
610
QTRECOLL_DATADIR
612
QTRECOLL_DATADIR
...
...
687
with_fam
689
with_fam
688
enable_xattr
690
enable_xattr
689
enable_camelcase
691
enable_camelcase
690
enable_pic
692
enable_pic
691
enable_qtgui
693
enable_qtgui
694
enable_webkit
692
enable_x11mon
695
enable_x11mon
693
with_x
696
with_x
694
'
697
'
695
      ac_precious_vars='build_alias
698
      ac_precious_vars='build_alias
696
host_alias
699
host_alias
...
...
1246
#
1249
#
1247
if test "$ac_init_help" = "long"; then
1250
if test "$ac_init_help" = "long"; then
1248
  # Omit some internal or obsolete options to make the list less imposing.
1251
  # Omit some internal or obsolete options to make the list less imposing.
1249
  # This message is too long to be a string in the A/UX 3.1 sh.
1252
  # This message is too long to be a string in the A/UX 3.1 sh.
1250
  cat <<_ACEOF
1253
  cat <<_ACEOF
1251
\`configure' configures Recoll 1.16.2 to adapt to many kinds of systems.
1254
\`configure' configures Recoll 1.17.0 to adapt to many kinds of systems.
1252
1255
1253
Usage: $0 [OPTION]... [VAR=VALUE]...
1256
Usage: $0 [OPTION]... [VAR=VALUE]...
1254
1257
1255
To assign environment variables (e.g., CC, CFLAGS...), specify them as
1258
To assign environment variables (e.g., CC, CFLAGS...), specify them as
1256
VAR=VALUE.  See below for descriptions of some of the useful variables.
1259
VAR=VALUE.  See below for descriptions of some of the useful variables.
...
...
1311
_ACEOF
1314
_ACEOF
1312
fi
1315
fi
1313
1316
1314
if test -n "$ac_init_help"; then
1317
if test -n "$ac_init_help"; then
1315
  case $ac_init_help in
1318
  case $ac_init_help in
1316
     short | recursive ) echo "Configuration of Recoll 1.16.2:";;
1319
     short | recursive ) echo "Configuration of Recoll 1.17.0:";;
1317
   esac
1320
   esac
1318
  cat <<\_ACEOF
1321
  cat <<\_ACEOF
1319
1322
1320
Optional Features:
1323
Optional Features:
1321
  --disable-option-checking  ignore unrecognized --enable/--with options
1324
  --disable-option-checking  ignore unrecognized --enable/--with options
...
...
1336
                          could raise the phrase slack to get a match).
1339
                          could raise the phrase slack to get a match).
1337
  --enable-pic            Compile library objects as position independant
1340
  --enable-pic            Compile library objects as position independant
1338
                          code. This is necessary for building the php
1341
                          code. This is necessary for building the php
1339
                          extension.
1342
                          extension.
1340
  --disable-qtgui         Disable the QT-based graphical user interface.
1343
  --disable-qtgui         Disable the QT-based graphical user interface.
1344
  --disable-webkit        Disable use of qt-webkit.
1341
  --disable-x11mon        Disable recollindex support for X11 session
1345
  --disable-x11mon        Disable recollindex support for X11 session
1342
                          monitoring.
1346
                          monitoring.
1343
1347
1344
Optional Packages:
1348
Optional Packages:
1345
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
1349
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
...
...
1434
fi
1438
fi
1435
1439
1436
test -n "$ac_init_help" && exit $ac_status
1440
test -n "$ac_init_help" && exit $ac_status
1437
if $ac_init_version; then
1441
if $ac_init_version; then
1438
  cat <<\_ACEOF
1442
  cat <<\_ACEOF
1439
Recoll configure 1.16.2
1443
Recoll configure 1.17.0
1440
generated by GNU Autoconf 2.68
1444
generated by GNU Autoconf 2.68
1441
1445
1442
Copyright (C) 2010 Free Software Foundation, Inc.
1446
Copyright (C) 2010 Free Software Foundation, Inc.
1443
This configure script is free software; the Free Software Foundation
1447
This configure script is free software; the Free Software Foundation
1444
gives unlimited permission to copy, distribute and modify it.
1448
gives unlimited permission to copy, distribute and modify it.
...
...
1987
} # ac_fn_cxx_check_func
1991
} # ac_fn_cxx_check_func
1988
cat >config.log <<_ACEOF
1992
cat >config.log <<_ACEOF
1989
This file contains any messages produced by compilers while
1993
This file contains any messages produced by compilers while
1990
running configure, to aid debugging if configure makes a mistake.
1994
running configure, to aid debugging if configure makes a mistake.
1991
1995
1992
It was created by Recoll $as_me 1.16.2, which was
1996
It was created by Recoll $as_me 1.17.0, which was
1993
generated by GNU Autoconf 2.68.  Invocation command line was
1997
generated by GNU Autoconf 2.68.  Invocation command line was
1994
1998
1995
  $ $0 $@
1999
  $ $0 $@
1996
2000
1997
_ACEOF
2001
_ACEOF
...
...
4707
  installation. If there is no default mkspecs, you should also set QMAKESPEC" "$LINENO" 5
4711
  installation. If there is no default mkspecs, you should also set QMAKESPEC" "$LINENO" 5
4708
     fi
4712
     fi
4709
  fi
4713
  fi
4710
  cd ..
4714
  cd ..
4711
4715
4716
4717
 ##### Using Qt webkit for reslist display? Else Qt textbrowser
4718
  # Check whether --enable-webkit was given.
4719
if test "${enable_webkit+set}" = set; then :
4720
  enableval=$enable_webkit; enableWebkit=$enableval
4721
else
4722
  enableWebkit="yes"
4723
fi
4724
4725
4726
  if test "$enableWebkit" = "yes" ; then
4727
   QMAKE_ENABLE_WEBKIT=""
4728
   QMAKE_DISABLE_WEBKIT="#"
4729
  else
4730
   QMAKE_ENABLE_WEBKIT="#"
4731
   QMAKE_DISABLE_WEBKIT=""
4732
  fi
4733
4712
  ac_config_files="$ac_config_files $QTGUI/recoll.pro"
4734
  ac_config_files="$ac_config_files $QTGUI/recoll.pro"
4735
4713
4736
4714
  ##################### End QT detection
4737
  ##################### End QT detection
4715
fi
4738
fi
4716
4739
4717
4740
...
...
5564
m_prefix=$prefix
5587
m_prefix=$prefix
5565
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
5588
test "X$m_prefix" = "XNONE" && m_prefix=/usr/local
5566
m_datadir=${m_prefix}/share
5589
m_datadir=${m_prefix}/share
5567
QTRECOLL_DATADIR=${m_datadir}/recoll
5590
QTRECOLL_DATADIR=${m_datadir}/recoll
5568
5591
5569
RCLVERSION='1.16.2'
5592
RCLVERSION='1.17.0'
5593
5594
5570
5595
5571
5596
5572
5597
5573
5598
5574
5599
...
...
6125
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
6150
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
6126
# Save the log message, to keep $0 and so on meaningful, and to
6151
# Save the log message, to keep $0 and so on meaningful, and to
6127
# report actual input values of CONFIG_FILES etc. instead of their
6152
# report actual input values of CONFIG_FILES etc. instead of their
6128
# values after options handling.
6153
# values after options handling.
6129
ac_log="
6154
ac_log="
6130
This file was extended by Recoll $as_me 1.16.2, which was
6155
This file was extended by Recoll $as_me 1.17.0, which was
6131
generated by GNU Autoconf 2.68.  Invocation command line was
6156
generated by GNU Autoconf 2.68.  Invocation command line was
6132
6157
6133
  CONFIG_FILES    = $CONFIG_FILES
6158
  CONFIG_FILES    = $CONFIG_FILES
6134
  CONFIG_HEADERS  = $CONFIG_HEADERS
6159
  CONFIG_HEADERS  = $CONFIG_HEADERS
6135
  CONFIG_LINKS    = $CONFIG_LINKS
6160
  CONFIG_LINKS    = $CONFIG_LINKS
...
...
6187
6212
6188
_ACEOF
6213
_ACEOF
6189
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
6214
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
6190
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
6215
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
6191
ac_cs_version="\\
6216
ac_cs_version="\\
6192
Recoll config.status 1.16.2
6217
Recoll config.status 1.17.0
6193
configured by $0, generated by GNU Autoconf 2.68,
6218
configured by $0, generated by GNU Autoconf 2.68,
6194
  with options \\"\$ac_cs_config\\"
6219
  with options \\"\$ac_cs_config\\"
6195
6220
6196
Copyright (C) 2010 Free Software Foundation, Inc.
6221
Copyright (C) 2010 Free Software Foundation, Inc.
6197
This config.status script is free software; the Free Software Foundation
6222
This config.status script is free software; the Free Software Foundation