From 45578ed66c9788e6c100d44f141bcd60a88c79e8 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 30 Dec 2011 23:01:10 +0000
Subject: [PATCH] Kill IPOPT_INCLUDE_PATH, clean up other variables
[[Imported from SVN: r5144]]
---
m4/ipopt.m4 | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/m4/ipopt.m4 b/m4/ipopt.m4
index c10c23ef..5a5fe335 100644
--- a/m4/ipopt.m4
+++ b/m4/ipopt.m4
@@ -29,15 +29,10 @@ AS_IF([test x$with_ipopt != xno], [
])
IPOPT_LIB_PATH="$IPOPTROOT/lib"
- IPOPT_INCLUDE_PATH="$IPOPTROOT/include"
-
- LDFLAGS="$LDFLAGS -L$IPOPT_LIB_PATH"
- CPPFLAGS="$CPPFLAGS -I$IPOPT_INCLUDE_PATH"
# Check whether ipopt is installed at all
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$IPOPT_LIB_PATH/pkgconfig"
PKG_CHECK_EXISTS([ipopt], [
- IPOPT_CPPFLAGS="-I$IPOPT_INCLUDE_PATH"
HAVE_IPOPT="1"
], [ dnl default rule would fail
AC_MSG_WARN([IPOpt not found in $IPOPTROOT])
@@ -45,7 +40,9 @@ AS_IF([test x$with_ipopt != xno], [
AC_LANG_PUSH([C++])
- CPPFLAGS="$IPOPT_CPPFLAGS"
+ LDFLAGS="$LDFLAGS -L$IPOPT_LIB_PATH"
+ IPOPT_CPPFLAGS="-I$IPOPTROOT/include"
+ CPPFLAGS="$CPPFLAGS $IPOPT_CPPFLAGS"
# if header is found...
AS_IF([test x$HAVE_IPOPT = x1], [
@@ -81,6 +78,7 @@ AS_IF([test x$HAVE_IPOPT = x1], [
], [
AC_SUBST(IPOPT_LIBS, "")
AC_SUBST(IPOPT_LDFLAGS, "")
+ unset IPOPT_CPPFLAGS
AC_SUBST(IPOPT_CPPFLAGS, "")
])
--
GitLab