Commit 379a91d2 authored by John Ellson's avatar John Ellson

undo failed experiment. disable ann if no ann.pc available

parent 74bcaf0a
Pipeline #36502551 passed with stages
in 35 minutes and 49 seconds
......@@ -21,8 +21,6 @@ man_MANS = mingle.1
pdf_DATA = mingle.1.pdf
mingle_SOURCES = minglemain.c
# Dummy C++ source to cause C++ linking.
nodist_EXTRA_mingle_SOURCES = dummy.cxx
mingle_CPPFLAGS = $(AM_CPPFLAGS)
mingle_LDADD = \
$(top_builddir)/lib/mingle/libmingle_C.la \
......
......@@ -2252,41 +2252,41 @@ else
],[
use_ann="No (no ann.pc found)"
])
if test "$use_ann" != "Yes"; then
if test -f /usr/lib$LIBPOSTFIX/libANN.so; then
AC_DEFINE_UNQUOTED(HAVE_ANN,1,
[Define if you have the ann library])
ANN_LIBS=-lANN
AC_SUBST([ANN_LIBS])
use_ann="Yes (but no ann.pc found)"
else
if test -f /usr/lib$LIBPOSTFIX/libann.so; then
AC_DEFINE_UNQUOTED(HAVE_ANN,1,
[Define if you have the ann library])
ANN_LIBS=-lann
AC_SUBST([ANN_LIBS])
use_ann="Yes (but no ann.pc found)"
else
if test -f /usr/lib/x86_64-linux-gnu/libann.so; then
AC_DEFINE_UNQUOTED(HAVE_ANN,1,
[Define if you have the ann library])
ANN_LIBS=-L/usr/lib/x86_64-linux-gnu -lann
AC_SUBST([ANN_LIBS])
use_ann="Yes (but no ann.pc found so taking a wild guess its ubuntu-18.10)"
else
if test -f /usr/lib/libann.so; then
AC_DEFINE_UNQUOTED(HAVE_ANN,1,
[Define if you have the ann library])
ANN_LIBS=-L/usr/lib -lann
AC_SUBST([ANN_LIBS])
use_ann="Yes (but no ann.pc found so taking a wild guess its ubuntu-18.04)"
else
use_ann="No (ANN library not available)"
fi
fi
fi
fi
fi
# if test "$use_ann" != "Yes"; then
# if test -f /usr/lib$LIBPOSTFIX/libANN.so; then
# AC_DEFINE_UNQUOTED(HAVE_ANN,1,
# [Define if you have the ann library])
# ANN_LIBS=-lANN
# AC_SUBST([ANN_LIBS])
# use_ann="Yes (but no ann.pc found)"
# else
# if test -f /usr/lib$LIBPOSTFIX/libann.so; then
# AC_DEFINE_UNQUOTED(HAVE_ANN,1,
# [Define if you have the ann library])
# ANN_LIBS=-lann
# AC_SUBST([ANN_LIBS])
# use_ann="Yes (but no ann.pc found)"
# else
# if test -f /usr/lib/x86_64-linux-gnu/libann.so; then
# AC_DEFINE_UNQUOTED(HAVE_ANN,1,
# [Define if you have the ann library])
# ANN_LIBS=-L/usr/lib/x86_64-linux-gnu -lann
# AC_SUBST([ANN_LIBS])
# use_ann="Yes (but no ann.pc found so taking a wild guess its ubuntu-18.10)"
# else
# if test -f /usr/lib/libann.so; then
# AC_DEFINE_UNQUOTED(HAVE_ANN,1,
# [Define if you have the ann library])
# ANN_LIBS=-L/usr/lib -lann
# AC_SUBST([ANN_LIBS])
# use_ann="Yes (but no ann.pc found so taking a wild guess its ubuntu-18.04)"
# else
# use_ann="No (ANN library not available)"
# fi
# fi
# fi
# fi
# fi
fi
AM_CONDITIONAL(WITH_ANN, [test x"${use_ann%% *}" = "xYes"])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment