separate checks for ASL and BonminAmpl lib

- for coin-or/Bonmin#41
coin-or · Apr 4, 2023 · 9db75fa · 9db75fa
1 parent 7b7837b
commit 9db75fa
Show file tree

Hide file tree

Showing 28 changed files with 791 additions and 76 deletions.
diff --git a/Couenne/Makefile.am b/Couenne/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = src/util \
 	  src/cut/crossconv \
 	  src
 
-if COIN_HAS_ASL
+if COIN_HAS_BONMINAMPL
 SUBDIRS += src/readnl
 endif
 

diff --git a/Couenne/Makefile.in b/Couenne/Makefile.in
@@ -52,7 +52,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@COIN_HAS_ASL_TRUE@am__append_1 = src/readnl
+@COIN_HAS_BONMINAMPL_TRUE@am__append_1 = src/readnl
 
 #	  src/cut/ellipcuts
 
@@ -139,6 +139,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -157,6 +164,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
@@ -393,7 +402,7 @@ addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Couenne
 
 # Files that are generated and should be cleaned with make distclean
 DISTCLEANFILES = $(am__append_4) $(VPATH_DISTCLEANFILES)
-DocFiles = README AUTHORS LICENSE 
+DocFiles = README README.md AUTHORS AUTHORS.md LICENSE LICENSE.md 
 DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
 COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
 COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
@@ -977,7 +986,7 @@ uninstall-all-doxygen-docs:
 	  fi ; \
 	done ; 
 
-install-doc: $(DocFiles) 
+install-doc: 
 	test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
 	for file in $(DocFiles); do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \

diff --git a/Couenne/configure b/Couenne/configure
diff --git a/Couenne/configure.ac b/Couenne/configure.ac
@@ -76,7 +76,8 @@ fi
 
 # Bonmin AMPL interface
 # bad bad: if AMPL stuff is available, then libCouenne will depend on it, so we add it to CouenneLib
-AC_COIN_CHECK_PACKAGE(ASL, [bonminamplinterface], [CouenneLib])
+AC_COIN_CHECK_PACKAGE(BonminAmpl, [bonminamplinterface], [CouenneLib])
+AC_COIN_CHECK_PACKAGE(ASL, [coinasl], [CouenneLib])
 
 # more workaround for having ASL deep inside Couenne
 if test $coin_has_asl = yes ; then

diff --git a/Couenne/src/Makefile.in b/Couenne/src/Makefile.in
@@ -198,6 +198,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -216,6 +223,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

diff --git a/Couenne/src/bound_tightening/Makefile.in b/Couenne/src/bound_tightening/Makefile.in
@@ -105,6 +105,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -123,6 +130,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

diff --git a/Couenne/src/bound_tightening/twoImpliedBT/Makefile.in b/Couenne/src/bound_tightening/twoImpliedBT/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.am 765 2011-08-14 11:12:19Z stefan $
+# $Id$
 #
 # Copyright (C) 2006 International Business Machines and others.
 # All Rights Reserved.
@@ -99,6 +99,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -117,6 +124,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

diff --git a/Couenne/src/branch/Makefile.in b/Couenne/src/branch/Makefile.in
@@ -116,6 +116,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -134,6 +141,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

diff --git a/Couenne/src/config.h.in b/Couenne/src/config.h.in
@@ -12,6 +12,9 @@
 /* Define to 1 if the Bonmin package is available */
 #undef COIN_HAS_BONMIN
 
+/* Define to 1 if the BonminAmpl package is available */
+#undef COIN_HAS_BONMINAMPL
+
 /* Define to 1 if the Cpx package is available */
 #undef COIN_HAS_CPX
 

diff --git a/Couenne/src/convex/Makefile.in b/Couenne/src/convex/Makefile.in
@@ -100,6 +100,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -118,6 +125,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

diff --git a/Couenne/src/cut/crossconv/Makefile.in b/Couenne/src/cut/crossconv/Makefile.in
@@ -96,6 +96,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -114,6 +121,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

diff --git a/Couenne/src/cut/sdpcuts/Makefile.in b/Couenne/src/cut/sdpcuts/Makefile.in
@@ -97,6 +97,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -115,6 +122,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

diff --git a/Couenne/src/disjunctive/Makefile.in b/Couenne/src/disjunctive/Makefile.in
@@ -99,6 +99,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -117,6 +124,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

diff --git a/Couenne/src/expression/Makefile.in b/Couenne/src/expression/Makefile.in
@@ -115,6 +115,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -133,6 +140,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

diff --git a/Couenne/src/heuristics/Makefile.in b/Couenne/src/heuristics/Makefile.in
@@ -112,6 +112,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -130,6 +137,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@

diff --git a/Couenne/src/interfaces/Makefile.am b/Couenne/src/interfaces/Makefile.am
@@ -28,7 +28,7 @@ AM_CPPFLAGS = \
 	-I`$(CYGPATH_W) $(srcdir)/../branch` \
 	-I`$(CYGPATH_W) $(srcdir)/../util` \
 	-I`$(CYGPATH_W) $(srcdir)/../problem` \
-	$(COUENNELIB_CFLAGS) $(ASL_CFLAGS)
+	$(COUENNELIB_CFLAGS) $(BONMINAMPL_CFLAGS)
 
 # This line is necessary to allow VPATH compilation
 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
diff --git a/Couenne/src/interfaces/Makefile.in b/Couenne/src/interfaces/Makefile.in
@@ -97,6 +97,13 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUX_DIR = @AUX_DIR@
 AWK = @AWK@
+BONMINAMPL_CFLAGS = @BONMINAMPL_CFLAGS@
+BONMINAMPL_CFLAGS_INSTALLED = @BONMINAMPL_CFLAGS_INSTALLED@
+BONMINAMPL_DATA = @BONMINAMPL_DATA@
+BONMINAMPL_DATA_INSTALLED = @BONMINAMPL_DATA_INSTALLED@
+BONMINAMPL_DEPENDENCIES = @BONMINAMPL_DEPENDENCIES@
+BONMINAMPL_LIBS = @BONMINAMPL_LIBS@
+BONMINAMPL_LIBS_INSTALLED = @BONMINAMPL_LIBS_INSTALLED@
 BONMIN_CFLAGS = @BONMIN_CFLAGS@
 BONMIN_CFLAGS_INSTALLED = @BONMIN_CFLAGS_INSTALLED@
 BONMIN_DATA = @BONMIN_DATA@
@@ -115,6 +122,8 @@ COIN_CXX_IS_CL_FALSE = @COIN_CXX_IS_CL_FALSE@
 COIN_CXX_IS_CL_TRUE = @COIN_CXX_IS_CL_TRUE@
 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
+COIN_HAS_BONMINAMPL_FALSE = @COIN_HAS_BONMINAMPL_FALSE@
+COIN_HAS_BONMINAMPL_TRUE = @COIN_HAS_BONMINAMPL_TRUE@
 COIN_HAS_BONMIN_FALSE = @COIN_HAS_BONMIN_FALSE@
 COIN_HAS_BONMIN_TRUE = @COIN_HAS_BONMIN_TRUE@
 COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
@@ -344,7 +353,7 @@ AM_CPPFLAGS = \
 	-I`$(CYGPATH_W) $(srcdir)/../branch` \
 	-I`$(CYGPATH_W) $(srcdir)/../util` \
 	-I`$(CYGPATH_W) $(srcdir)/../problem` \
-	$(COUENNELIB_CFLAGS) $(ASL_CFLAGS)
+	$(COUENNELIB_CFLAGS) $(BONMINAMPL_CFLAGS)
 
 
 # This line is necessary to allow VPATH compilation

diff --git a/Couenne/src/main/Couenne.cpp b/Couenne/src/main/Couenne.cpp
@@ -19,7 +19,7 @@
 #include "CoinTime.hpp"
 
 #include "CouenneUserInterface.hpp"
-#ifdef COIN_HAS_ASL
+#ifdef COIN_HAS_BONMINAMPL
 #include "CouenneAmplInterface.hpp"
 #endif
 #ifdef COIN_HAS_OS
@@ -91,7 +91,7 @@ int main (int argc, char *argv[]) {
   // register options to prepare for parsing the command line
   SmartPtr<Bonmin::RegisteredOptions> roptions = new Bonmin::RegisteredOptions();
   Couenne::CouenneSetup::registerAllOptions(roptions);
-#ifdef COIN_HAS_ASL
+#ifdef COIN_HAS_BONMINAMPL
   CouenneAmplInterface::registerOptions(roptions);
 #endif
 #ifdef COIN_HAS_OS
@@ -110,7 +110,7 @@ int main (int argc, char *argv[]) {
   CouenneUserInterface* userinterface = NULL;
 
   std::string dummy;
-#ifdef COIN_HAS_ASL
+#ifdef COIN_HAS_BONMINAMPL
   if (!userinterface && options->GetStringValue("nlfile", dummy, "")) {
     userinterface = new CouenneAmplInterface(options, jnlst);
     ((CouenneAmplInterface*)userinterface) -> setRegisteredOptions(roptions); // for some reason the TMINLP constructor needs the registered options