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.69 for Recoll 1.19.5.
3
# Generated by GNU Autoconf 2.69 for Recoll 1.20.0.
4
#
4
#
5
#
5
#
6
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
6
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
7
#
7
#
8
#
8
#
...
...
575
MAKEFLAGS=
575
MAKEFLAGS=
576
576
577
# Identity of this package.
577
# Identity of this package.
578
PACKAGE_NAME='Recoll'
578
PACKAGE_NAME='Recoll'
579
PACKAGE_TARNAME='recoll'
579
PACKAGE_TARNAME='recoll'
580
PACKAGE_VERSION='1.19.5'
580
PACKAGE_VERSION='1.20.0'
581
PACKAGE_STRING='Recoll 1.19.5'
581
PACKAGE_STRING='Recoll 1.20.0'
582
PACKAGE_BUGREPORT=''
582
PACKAGE_BUGREPORT=''
583
PACKAGE_URL=''
583
PACKAGE_URL=''
584
584
585
ac_unique_file="index/recollindex.cpp"
585
ac_unique_file="index/recollindex.cpp"
586
# Factoring default headers for most tests.
586
# Factoring default headers for most tests.
...
...
621
621
622
ac_subst_vars='LTLIBOBJS
622
ac_subst_vars='LTLIBOBJS
623
LIBOBJS
623
LIBOBJS
624
RCLLIBVERSION
624
RCLLIBVERSION
625
RCLVERSION
625
RCLVERSION
626
NODYNLIB
626
NOPYTHON
627
NOPYTHON
627
NOTHREADS
628
NOTHREADS
628
NOPIC
629
NOPIC
629
LIBQZEITGEIST
630
LIBQZEITGEIST
630
QMAKE_DISABLE_ZEITGEIST
631
QMAKE_DISABLE_ZEITGEIST
...
...
1279
#
1280
#
1280
if test "$ac_init_help" = "long"; then
1281
if test "$ac_init_help" = "long"; then
1281
  # Omit some internal or obsolete options to make the list less imposing.
1282
  # Omit some internal or obsolete options to make the list less imposing.
1282
  # This message is too long to be a string in the A/UX 3.1 sh.
1283
  # This message is too long to be a string in the A/UX 3.1 sh.
1283
  cat <<_ACEOF
1284
  cat <<_ACEOF
1284
\`configure' configures Recoll 1.19.5 to adapt to many kinds of systems.
1285
\`configure' configures Recoll 1.20.0 to adapt to many kinds of systems.
1285
1286
1286
Usage: $0 [OPTION]... [VAR=VALUE]...
1287
Usage: $0 [OPTION]... [VAR=VALUE]...
1287
1288
1288
To assign environment variables (e.g., CC, CFLAGS...), specify them as
1289
To assign environment variables (e.g., CC, CFLAGS...), specify them as
1289
VAR=VALUE.  See below for descriptions of some of the useful variables.
1290
VAR=VALUE.  See below for descriptions of some of the useful variables.
...
...
1344
_ACEOF
1345
_ACEOF
1345
fi
1346
fi
1346
1347
1347
if test -n "$ac_init_help"; then
1348
if test -n "$ac_init_help"; then
1348
  case $ac_init_help in
1349
  case $ac_init_help in
1349
     short | recursive ) echo "Configuration of Recoll 1.19.5:";;
1350
     short | recursive ) echo "Configuration of Recoll 1.20.0:";;
1350
   esac
1351
   esac
1351
  cat <<\_ACEOF
1352
  cat <<\_ACEOF
1352
1353
1353
Optional Features:
1354
Optional Features:
1354
  --disable-option-checking  ignore unrecognized --enable/--with options
1355
  --disable-option-checking  ignore unrecognized --enable/--with options
...
...
1473
fi
1474
fi
1474
1475
1475
test -n "$ac_init_help" && exit $ac_status
1476
test -n "$ac_init_help" && exit $ac_status
1476
if $ac_init_version; then
1477
if $ac_init_version; then
1477
  cat <<\_ACEOF
1478
  cat <<\_ACEOF
1478
Recoll configure 1.19.5
1479
Recoll configure 1.20.0
1479
generated by GNU Autoconf 2.69
1480
generated by GNU Autoconf 2.69
1480
1481
1481
Copyright (C) 2012 Free Software Foundation, Inc.
1482
Copyright (C) 2012 Free Software Foundation, Inc.
1482
This configure script is free software; the Free Software Foundation
1483
This configure script is free software; the Free Software Foundation
1483
gives unlimited permission to copy, distribute and modify it.
1484
gives unlimited permission to copy, distribute and modify it.
...
...
2026
} # ac_fn_cxx_check_func
2027
} # ac_fn_cxx_check_func
2027
cat >config.log <<_ACEOF
2028
cat >config.log <<_ACEOF
2028
This file contains any messages produced by compilers while
2029
This file contains any messages produced by compilers while
2029
running configure, to aid debugging if configure makes a mistake.
2030
running configure, to aid debugging if configure makes a mistake.
2030
2031
2031
It was created by Recoll $as_me 1.19.5, which was
2032
It was created by Recoll $as_me 1.20.0, which was
2032
generated by GNU Autoconf 2.69.  Invocation command line was
2033
generated by GNU Autoconf 2.69.  Invocation command line was
2033
2034
2034
  $ $0 $@
2035
  $ $0 $@
2035
2036
2036
_ACEOF
2037
_ACEOF
...
...
2908
2909
2909
    sys=Default
2910
    sys=Default
2910
fi
2911
fi
2911
(cd mk; rm -f sysconf; ln -s $sys sysconf)
2912
(cd mk; rm -f sysconf; ln -s $sys sysconf)
2912
2913
2914
# There a few Recoll users on Mac OS X and a few things are just not worth
2915
# supporting
2916
if test X$sys = XDarwin ; then
2917
   NODYNLIB=#
2918
fi
2919
2913
ac_ext=c
2920
ac_ext=c
2914
ac_cpp='$CPP $CPPFLAGS'
2921
ac_cpp='$CPP $CPPFLAGS'
2915
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2922
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2916
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2923
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2917
ac_compiler_gnu=$ac_cv_c_compiler_gnu
2924
ac_compiler_gnu=$ac_cv_c_compiler_gnu
...
...
4400
# just not worth building the lib twice
4407
# just not worth building the lib twice
4401
# You can still have a non-pic recoll with:
4408
# You can still have a non-pic recoll with:
4402
#   configure --disable-python-module; make; make install;make clean
4409
#   configure --disable-python-module; make; make install;make clean
4403
#   configure; make; cd python/recoll; make install
4410
#   configure; make; cd python/recoll; make install
4404
#
4411
#
4412
if test X$sys != XDarwin ; then
4405
# Check whether --enable-python-module was given.
4413
# Check whether --enable-python-module was given.
4406
if test "${enable_python_module+set}" = set; then :
4414
if test "${enable_python_module+set}" = set; then :
4407
  enableval=$enable_python_module; pythonEnabled=$enableval
4415
  enableval=$enable_python_module; pythonEnabled=$enableval
4408
else
4416
else
4409
  pythonEnabled=yes
4417
  pythonEnabled=yes
4410
fi
4418
fi
4411
4419
4412
if test X$pythonEnabled = Xyes ; then
4420
if test X$pythonEnabled = Xyes ; then
4413
  NOPYTHON=""
4421
  NOPYTHON=""
4422
else
4423
  NOPYTHON="#"
4424
fi
4414
else
4425
else
4415
  NOPYTHON="#"
4426
  NOPYTHON="#"
4416
fi
4427
fi
4417
4428
4418
# Build PIC objects for the library ?
4429
# Build PIC objects for the library ?
...
...
5794
m_datadir=${m_prefix}/share
5805
m_datadir=${m_prefix}/share
5795
QTRECOLL_DATADIR=${m_datadir}/recoll
5806
QTRECOLL_DATADIR=${m_datadir}/recoll
5796
5807
5797
RCLVERSION=`cat VERSION`
5808
RCLVERSION=`cat VERSION`
5798
RCLLIBVERSION=$RCLVERSION
5809
RCLLIBVERSION=$RCLVERSION
5810
5799
5811
5800
5812
5801
5813
5802
5814
5803
5815
...
...
6353
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
6365
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
6354
# Save the log message, to keep $0 and so on meaningful, and to
6366
# Save the log message, to keep $0 and so on meaningful, and to
6355
# report actual input values of CONFIG_FILES etc. instead of their
6367
# report actual input values of CONFIG_FILES etc. instead of their
6356
# values after options handling.
6368
# values after options handling.
6357
ac_log="
6369
ac_log="
6358
This file was extended by Recoll $as_me 1.19.5, which was
6370
This file was extended by Recoll $as_me 1.20.0, which was
6359
generated by GNU Autoconf 2.69.  Invocation command line was
6371
generated by GNU Autoconf 2.69.  Invocation command line was
6360
6372
6361
  CONFIG_FILES    = $CONFIG_FILES
6373
  CONFIG_FILES    = $CONFIG_FILES
6362
  CONFIG_HEADERS  = $CONFIG_HEADERS
6374
  CONFIG_HEADERS  = $CONFIG_HEADERS
6363
  CONFIG_LINKS    = $CONFIG_LINKS
6375
  CONFIG_LINKS    = $CONFIG_LINKS
...
...
6415
6427
6416
_ACEOF
6428
_ACEOF
6417
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
6429
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
6418
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
6430
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
6419
ac_cs_version="\\
6431
ac_cs_version="\\
6420
Recoll config.status 1.19.5
6432
Recoll config.status 1.20.0
6421
configured by $0, generated by GNU Autoconf 2.69,
6433
configured by $0, generated by GNU Autoconf 2.69,
6422
  with options \\"\$ac_cs_config\\"
6434
  with options \\"\$ac_cs_config\\"
6423
6435
6424
Copyright (C) 2012 Free Software Foundation, Inc.
6436
Copyright (C) 2012 Free Software Foundation, Inc.
6425
This config.status script is free software; the Free Software Foundation
6437
This config.status script is free software; the Free Software Foundation