1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
Description: Make build-system spot OpenBabel 3.x
Author: Stuart Prescott <stuart@debian.org>
--- a/configure
+++ b/configure
@@ -25832,12 +25832,12 @@
pkg_cv_OPENBABEL_CFLAGS="$OPENBABEL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openbabel-2.0 >= 2.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "openbabel-2.0 >= 2.0.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openbabel-3 >= 3.0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "openbabel-3 >= 3.0.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_OPENBABEL_CFLAGS=`$PKG_CONFIG --cflags "openbabel-2.0 >= 2.0.0" 2>/dev/null`
+ pkg_cv_OPENBABEL_CFLAGS=`$PKG_CONFIG --cflags "openbabel-3 >= 3.0.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -25849,12 +25849,12 @@
pkg_cv_OPENBABEL_LIBS="$OPENBABEL_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openbabel-2.0 >= 2.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "openbabel-2.0 >= 2.0.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openbabel-3 >= 3.0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "openbabel-3 >= 3.0.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_OPENBABEL_LIBS=`$PKG_CONFIG --libs "openbabel-2.0 >= 2.0.0" 2>/dev/null`
+ pkg_cv_OPENBABEL_LIBS=`$PKG_CONFIG --libs "openbabel-3 >= 3.0.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -25875,9 +25875,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- OPENBABEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openbabel-2.0 >= 2.0.0" 2>&1`
+ OPENBABEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openbabel-3 >= 3.0.0" 2>&1`
else
- OPENBABEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openbabel-2.0 >= 2.0.0" 2>&1`
+ OPENBABEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openbabel-3 >= 3.0.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$OPENBABEL_PKG_ERRORS" >&5
--- a/configure.ac
+++ b/configure.ac
@@ -330,13 +330,13 @@
AC_ARG_WITH(openbabel, AS_HELP_STRING([--with-openbabel], [compile plug-in support for a wrapper around the OpenBabel library (default=no).]), [have_openbabel=yes], [have_openbabel=no])
AC_MSG_RESULT([$have_openbabel])
if test "$have_openbabel" = "yes" ; then
- PKG_CHECK_MODULES([OPENBABEL], [openbabel-2.0 >= 2.0.0], [ob=yes], [ob=no])
+ PKG_CHECK_MODULES([OPENBABEL], [openbabel-3 >= 3.0.0], [ob=yes], [ob=no])
if test "$ob" = "yes" ; then
have_openbabel="yes"
need_cpp_compiler="yes"
else
AC_MSG_WARN(["No OpenBabel lib/header file found, libobloader.so will not be built."])
- AC_MSG_WARN(["Maybe OpenBabel is not installed or version is to old (>=2.0 required)."])
+ AC_MSG_WARN(["Maybe OpenBabel is not installed or version is to old (>=3.0 required)."])
have_openbabel="no"
fi
fi
|
