From 1e9bcd60722836c1371ba52a402a040a5eec9e82 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Tue, 5 Sep 2017 09:54:15 +0200
Subject: [PATCH] Fixed bug in --disable-libsearch and molfile_plugins
When using --disable-libsearch, external molfile_plugins were unconditionally
disabled. Fixed now.
---
configure | 19 ++++++++++++++-----
configure.ac | 12 +++++++-----
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index ec53f503e..31efc5356 100755
--- a/configure
+++ b/configure
@@ -5823,7 +5823,16 @@ $as_echo "#define __PLUMED_HAS_MOLFILE_PLUGINS 1" >>confdefs.h
found=ko
if test "$external_molfile_plugins" == true ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for molfile_dcdplugin_init in -lmolfile_plugin" >&5
+ ac_fn_cxx_check_header_mongrel "$LINENO" "libmolfile_plugin.h" "ac_cv_header_libmolfile_plugin_h" "$ac_includes_default"
+if test "x$ac_cv_header_libmolfile_plugin_h" = xyes; then :
+
+ ac_fn_cxx_check_func "$LINENO" "molfile_dcdplugin_init" "ac_cv_func_molfile_dcdplugin_init"
+if test "x$ac_cv_func_molfile_dcdplugin_init" = xyes; then :
+ found=ok
+else
+
+ if test "${libsearch}" == true ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for molfile_dcdplugin_init in -lmolfile_plugin" >&5
$as_echo_n "checking for molfile_dcdplugin_init in -lmolfile_plugin... " >&6; }
if ${ac_cv_lib_molfile_plugin_molfile_dcdplugin_init+:} false; then :
$as_echo_n "(cached) " >&6
@@ -5860,17 +5869,17 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_molfile_plugin_molfile_dcdplugin_init" >&5
$as_echo "$ac_cv_lib_molfile_plugin_molfile_dcdplugin_init" >&6; }
if test "x$ac_cv_lib_molfile_plugin_molfile_dcdplugin_init" = xyes; then :
- if test "${libsearch}" == true ; then
- ac_fn_cxx_check_header_mongrel "$LINENO" "libmolfile_plugin.h" "ac_cv_header_libmolfile_plugin_h" "$ac_includes_default"
-if test "x$ac_cv_header_libmolfile_plugin_h" = xyes; then :
LIBS="-lmolfile_plugin $LIBS" found=ok
fi
+ fi
+
+fi
- fi
fi
+
fi
if test $found == ko ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using internal molfile_plugins, which only support dcd/xtc/trr/trj/crd files" >&5
diff --git a/configure.ac b/configure.ac
index f7eef5724..2c6abc8ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,11 +436,13 @@ AC_DEFINE([__PLUMED_HAS_MOLFILE_PLUGINS])
found=ko
if test "$external_molfile_plugins" == true ; then
- AC_CHECK_LIB([molfile_plugin],[molfile_dcdplugin_init],
- if test "${libsearch}" == true ; then
- [ AC_CHECK_HEADER([libmolfile_plugin.h], [LIBS="-lmolfile_plugin $LIBS"] [found=ok] ) ]
- fi
-)
+ AC_CHECK_HEADER( [libmolfile_plugin.h], [
+ AC_CHECK_FUNC( [molfile_dcdplugin_init], [found=ok], [
+ if test "${libsearch}" == true ; then
+ AC_CHECK_LIB( [molfile_plugin],[molfile_dcdplugin_init], [LIBS="-lmolfile_plugin $LIBS"] [found=ok])
+ fi
+ ])
+ ])
fi
if test $found == ko ; then
AC_MSG_WARN([using internal molfile_plugins, which only support dcd/xtc/trr/trj/crd files])
--
GitLab