autoconfig out things that dont work currently on mac os x
This commit is contained in:
parent
34047fd2dd
commit
5d34a62f66
30
src/configure
vendored
30
src/configure
vendored
@ -1,6 +1,6 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.69 for Recoll 1.19.5.
|
# Generated by GNU Autoconf 2.69 for Recoll 1.20.0.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||||
@ -577,8 +577,8 @@ MAKEFLAGS=
|
|||||||
# Identity of this package.
|
# Identity of this package.
|
||||||
PACKAGE_NAME='Recoll'
|
PACKAGE_NAME='Recoll'
|
||||||
PACKAGE_TARNAME='recoll'
|
PACKAGE_TARNAME='recoll'
|
||||||
PACKAGE_VERSION='1.19.5'
|
PACKAGE_VERSION='1.20.0'
|
||||||
PACKAGE_STRING='Recoll 1.19.5'
|
PACKAGE_STRING='Recoll 1.20.0'
|
||||||
PACKAGE_BUGREPORT=''
|
PACKAGE_BUGREPORT=''
|
||||||
PACKAGE_URL=''
|
PACKAGE_URL=''
|
||||||
|
|
||||||
@ -623,6 +623,7 @@ ac_subst_vars='LTLIBOBJS
|
|||||||
LIBOBJS
|
LIBOBJS
|
||||||
RCLLIBVERSION
|
RCLLIBVERSION
|
||||||
RCLVERSION
|
RCLVERSION
|
||||||
|
NODYNLIB
|
||||||
NOPYTHON
|
NOPYTHON
|
||||||
NOTHREADS
|
NOTHREADS
|
||||||
NOPIC
|
NOPIC
|
||||||
@ -1281,7 +1282,7 @@ if test "$ac_init_help" = "long"; then
|
|||||||
# Omit some internal or obsolete options to make the list less imposing.
|
# Omit some internal or obsolete options to make the list less imposing.
|
||||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||||
cat <<_ACEOF
|
cat <<_ACEOF
|
||||||
\`configure' configures Recoll 1.19.5 to adapt to many kinds of systems.
|
\`configure' configures Recoll 1.20.0 to adapt to many kinds of systems.
|
||||||
|
|
||||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||||
|
|
||||||
@ -1346,7 +1347,7 @@ fi
|
|||||||
|
|
||||||
if test -n "$ac_init_help"; then
|
if test -n "$ac_init_help"; then
|
||||||
case $ac_init_help in
|
case $ac_init_help in
|
||||||
short | recursive ) echo "Configuration of Recoll 1.19.5:";;
|
short | recursive ) echo "Configuration of Recoll 1.20.0:";;
|
||||||
esac
|
esac
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
|
|
||||||
@ -1475,7 +1476,7 @@ fi
|
|||||||
test -n "$ac_init_help" && exit $ac_status
|
test -n "$ac_init_help" && exit $ac_status
|
||||||
if $ac_init_version; then
|
if $ac_init_version; then
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
Recoll configure 1.19.5
|
Recoll configure 1.20.0
|
||||||
generated by GNU Autoconf 2.69
|
generated by GNU Autoconf 2.69
|
||||||
|
|
||||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||||
@ -2028,7 +2029,7 @@ cat >config.log <<_ACEOF
|
|||||||
This file contains any messages produced by compilers while
|
This file contains any messages produced by compilers while
|
||||||
running configure, to aid debugging if configure makes a mistake.
|
running configure, to aid debugging if configure makes a mistake.
|
||||||
|
|
||||||
It was created by Recoll $as_me 1.19.5, which was
|
It was created by Recoll $as_me 1.20.0, which was
|
||||||
generated by GNU Autoconf 2.69. Invocation command line was
|
generated by GNU Autoconf 2.69. Invocation command line was
|
||||||
|
|
||||||
$ $0 $@
|
$ $0 $@
|
||||||
@ -2910,6 +2911,12 @@ $as_echo "$as_me:
|
|||||||
fi
|
fi
|
||||||
(cd mk; rm -f sysconf; ln -s $sys sysconf)
|
(cd mk; rm -f sysconf; ln -s $sys sysconf)
|
||||||
|
|
||||||
|
# There a few Recoll users on Mac OS X and a few things are just not worth
|
||||||
|
# supporting
|
||||||
|
if test X$sys = XDarwin ; then
|
||||||
|
NODYNLIB=#
|
||||||
|
fi
|
||||||
|
|
||||||
ac_ext=c
|
ac_ext=c
|
||||||
ac_cpp='$CPP $CPPFLAGS'
|
ac_cpp='$CPP $CPPFLAGS'
|
||||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||||
@ -4402,6 +4409,7 @@ fi
|
|||||||
# configure --disable-python-module; make; make install;make clean
|
# configure --disable-python-module; make; make install;make clean
|
||||||
# configure; make; cd python/recoll; make install
|
# configure; make; cd python/recoll; make install
|
||||||
#
|
#
|
||||||
|
if test X$sys != XDarwin ; then
|
||||||
# Check whether --enable-python-module was given.
|
# Check whether --enable-python-module was given.
|
||||||
if test "${enable_python_module+set}" = set; then :
|
if test "${enable_python_module+set}" = set; then :
|
||||||
enableval=$enable_python_module; pythonEnabled=$enableval
|
enableval=$enable_python_module; pythonEnabled=$enableval
|
||||||
@ -4414,6 +4422,9 @@ if test X$pythonEnabled = Xyes ; then
|
|||||||
else
|
else
|
||||||
NOPYTHON="#"
|
NOPYTHON="#"
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
NOPYTHON="#"
|
||||||
|
fi
|
||||||
|
|
||||||
# Build PIC objects for the library ?
|
# Build PIC objects for the library ?
|
||||||
# Check whether --enable-pic was given.
|
# Check whether --enable-pic was given.
|
||||||
@ -5824,6 +5835,7 @@ RCLLIBVERSION=$RCLVERSION
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# All object files depend on localdefs which has the cc flags. Avoid
|
# All object files depend on localdefs which has the cc flags. Avoid
|
||||||
@ -6355,7 +6367,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||||||
# report actual input values of CONFIG_FILES etc. instead of their
|
# report actual input values of CONFIG_FILES etc. instead of their
|
||||||
# values after options handling.
|
# values after options handling.
|
||||||
ac_log="
|
ac_log="
|
||||||
This file was extended by Recoll $as_me 1.19.5, which was
|
This file was extended by Recoll $as_me 1.20.0, which was
|
||||||
generated by GNU Autoconf 2.69. Invocation command line was
|
generated by GNU Autoconf 2.69. Invocation command line was
|
||||||
|
|
||||||
CONFIG_FILES = $CONFIG_FILES
|
CONFIG_FILES = $CONFIG_FILES
|
||||||
@ -6417,7 +6429,7 @@ _ACEOF
|
|||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||||
ac_cs_version="\\
|
ac_cs_version="\\
|
||||||
Recoll config.status 1.19.5
|
Recoll config.status 1.20.0
|
||||||
configured by $0, generated by GNU Autoconf 2.69,
|
configured by $0, generated by GNU Autoconf 2.69,
|
||||||
with options \\"\$ac_cs_config\\"
|
with options \\"\$ac_cs_config\\"
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user