From ffecbe59c6ec2ea0e622e4ab282e50deaecace30 Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Sat, 3 Dec 2011 21:31:05 +0000 Subject: [PATCH] Use pkg-config to test whether IPOpt is installed at all, rather than checking for some IPOpt header [[Imported from SVN: r4962]] --- m4/ipopt.m4 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/m4/ipopt.m4 b/m4/ipopt.m4 index 9cd7bd40..2e8b7987 100644 --- a/m4/ipopt.m4 +++ b/m4/ipopt.m4 @@ -34,13 +34,16 @@ IPOPT_INCLUDE_PATH="$IPOPTROOT/include" LDFLAGS="$LDFLAGS -L$IPOPT_LIB_PATH" CPPFLAGS="$CPPFLAGS -I$IPOPT_INCLUDE_PATH" -AC_LANG_PUSH([C++]) +# Check whether UG is installed at all +if PKG_CONFIG_PATH=$PKG_CONFIG_PATH $PKG_CONFIG --exists ipopt; then + IPOPT_CPPFLAGS="-I$IPOPT_INCLUDE_PATH" + HAVE_IPOPT="1" +else + AC_MSG_WARN([IPOpt not found in $IPOPT_ROOT]) +fi -# check for header -AC_CHECK_HEADER([coin/IpIpoptApplication.hpp], - [IPOPT_CPPFLAGS="-I$IPOPT_INCLUDE_PATH" - HAVE_IPOPT="1"], - AC_MSG_WARN([IpIpoptApplication.hpp not found in $IPOPT_INCLUDE_PATH/coin])) + +AC_LANG_PUSH([C++]) CPPFLAGS="$IPOPT_CPPFLAGS" -- GitLab