summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2013-02-27 18:42:48 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-02-27 18:43:46 +0100
commit932676d4339368279ca64255d4761deda4526480 (patch)
treea7906051ac289161466c45be9f8b1d81ddb1c242
parent5974c6ec2bd6a724bb5501cc58c63c010b419d02 (diff)
downloadbibletime-932676d4.tar.gz
bibletime-932676d4.zip
Fix sword and clucene detection
This resolves Bug 1145
-rw-r--r--clucene.m42
-rw-r--r--sword.m44
2 files changed, 3 insertions, 3 deletions
diff --git a/clucene.m4 b/clucene.m4
index 02a2966..db04292 100644
--- a/clucene.m4
+++ b/clucene.m4
@@ -133,7 +133,7 @@ int main(int argc, char* argv[[]]) {
EOF
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
if test -x conftest; then
eval ac_cv_installed_clucene_version=`./conftest 2>&5`
diff --git a/sword.m4 b/sword.m4
index 3c12bbd..2f19b3f 100644
--- a/sword.m4
+++ b/sword.m4
@@ -119,7 +119,7 @@ int main(int argc, char** argv) {
EOF
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
if test -x conftest; then
eval ac_cv_installed_sword_version=`./conftest 2>&5`
@@ -192,7 +192,7 @@ int main(int argc, char** argv) {
}
EOF
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
if test -x conftest; then
eval ac_cv_sword_recent_version=`./conftest $1 2>&5`